metropolis/proto: EnrolmentConfig -> NodeParameters
This starts off the move to a node configuration API conforming to
the lifecycle management design document.
Instead of an Enrolment Config used only to join an existing cluster, we
move to a NodeParameters proto that must always be given to a node if
it's supposed to either bootstrap a new cluster or join an existing one.
This links the existing cluster management code (and its state machine)
to work with this file. However, that state machine will be removed very
soon, anyway.
We also remove everything related to golden tickets.
This breaks multi-node tests.
X-Origin-Diff: phab/D710
GitOrigin-RevId: f22615fbccab975f2d5e6928bdc7387ab3aa5714
diff --git a/metropolis/node/build/mkimage/main.go b/metropolis/node/build/mkimage/main.go
index c2f7d5a..5546055 100644
--- a/metropolis/node/build/mkimage/main.go
+++ b/metropolis/node/build/mkimage/main.go
@@ -18,7 +18,7 @@
// mkimage is a tool to generate a Metropolis node disk image containing the
// given EFI payload, and optionally, a given external initramfs image and
-// enrolment credentials.
+// node parameters
import (
"flag"
@@ -38,13 +38,13 @@
var NodeSystemPartition gpt.Type = gpt.Type("ee96055b-f6d0-4267-8bbb-724b2afea74c")
var (
- flagEFI string
- flagOut string
- flagSystemPath string
- flagEnrolmentCredentials string
- flagDataPartitionSize uint64
- flagESPPartitionSize uint64
- flagSystemPartitionSize uint64
+ flagEFI string
+ flagOut string
+ flagSystemPath string
+ flagNodeParameters string
+ flagDataPartitionSize uint64
+ flagESPPartitionSize uint64
+ flagSystemPartitionSize uint64
)
func mibToSectors(size uint64) uint64 {
@@ -67,7 +67,7 @@
flag.StringVar(&flagEFI, "efi", "", "UEFI payload")
flag.StringVar(&flagOut, "out", "", "Output disk image")
flag.StringVar(&flagSystemPath, "system", "", "System partition [optional]")
- flag.StringVar(&flagEnrolmentCredentials, "enrolment_credentials", "", "Enrolment credentials [optional]")
+ flag.StringVar(&flagNodeParameters, "node_parameters", "", "Node parameters [optional]")
flag.Uint64Var(&flagDataPartitionSize, "data_partition_size", 2048, "Override the data partition size (default 2048 MiB)")
flag.Uint64Var(&flagESPPartitionSize, "esp_partition_size", 128, "Override the ESP partition size (default: 128MiB)")
flag.Uint64Var(&flagSystemPartitionSize, "system_partition_size", 1024, "Override the System partition size (default: 1024MiB)")
@@ -144,8 +144,8 @@
put(fs, flagEFI, "/EFI/BOOT/BOOTX64.EFI")
- if flagEnrolmentCredentials != "" {
- put(fs, flagEnrolmentCredentials, "/EFI/metropolis/enrolment.pb")
+ if flagNodeParameters != "" {
+ put(fs, flagNodeParameters, "/EFI/metropolis/parameters.pb")
}
if err := diskImg.File.Close(); err != nil {