From 1312163eddffb521b3086e0d9ff4ceb79ad9b78d Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 26 Jun 2021 12:27:20 -0700 Subject: [PATCH 1/7] Update nodes with an APIServer when APIServer spec changes --- nodeup/pkg/model/containerd_test.go | 17 +++- nodeup/pkg/model/context.go | 2 +- nodeup/pkg/model/docker_test.go | 16 ++- nodeup/pkg/model/kube_apiserver.go | 34 ++++--- nodeup/pkg/model/kubelet_test.go | 99 ++++++++++++------- .../containerdbuilder/flatcar/cluster.yaml | 2 + .../from_docker_19.03.11/cluster.yaml | 2 + .../from_docker_19.03.14/cluster.yaml | 2 + .../containerdbuilder/simple/cluster.yaml | 2 + .../skipinstall/cluster.yaml | 2 + .../dockerbuilder/docker_18.06.3/cluster.yaml | 2 + .../docker_19.03.11/cluster.yaml | 2 + .../dockerbuilder/healthcheck/cluster.yaml | 2 + .../tests/dockerbuilder/logflags/cluster.yaml | 2 + .../tests/dockerbuilder/simple/cluster.yaml | 2 + .../dockerbuilder/skipinstall/cluster.yaml | 2 + pkg/apis/nodeup/config.go | 15 +++ 17 files changed, 149 insertions(+), 56 deletions(-) diff --git a/nodeup/pkg/model/containerd_test.go b/nodeup/pkg/model/containerd_test.go index d5470c7155..3b02f662f2 100644 --- a/nodeup/pkg/model/containerd_test.go +++ b/nodeup/pkg/model/containerd_test.go @@ -128,9 +128,20 @@ func TestContainerdBuilder_BuildFlags(t *testing.T) { } func runContainerdBuilderTest(t *testing.T, key string, distro distributions.Distribution) { + h := testutils.NewIntegrationTestHarness(t) + defer h.Close() + + h.MockKopsVersion("1.18.0") + h.SetupMockAWS() + basedir := path.Join("tests/containerdbuilder/", key) - nodeUpModelContext, err := BuildNodeupModelContext(basedir) + model, err := testutils.LoadModel(basedir) + if err != nil { + t.Fatal(err) + } + + nodeUpModelContext, err := BuildNodeupModelContext(model) if err != nil { t.Fatalf("error parsing cluster yaml %q: %v", basedir, err) return @@ -148,6 +159,10 @@ func runContainerdBuilderTest(t *testing.T, key string, distro distributions.Dis nodeUpModelContext.Assets.AddForTest("ctr", "usr/local/bin/ctr", "testing containerd content") nodeUpModelContext.Assets.AddForTest("runc", "usr/local/sbin/runc", "testing containerd content") + if err := nodeUpModelContext.Init(); err != nil { + t.Fatalf("error from nodeupModelContext.Init(): %v", err) + return + } context := &fi.ModelBuilderContext{ Tasks: make(map[string]fi.Task), } diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go index 1ae93ea8e4..997ff397d7 100644 --- a/nodeup/pkg/model/context.go +++ b/nodeup/pkg/model/context.go @@ -388,7 +388,7 @@ func (c *NodeupModelContext) UsesSecondaryIP() bool { // UseBootstrapTokens checks if we are using bootstrap tokens func (c *NodeupModelContext) UseBootstrapTokens() bool { if c.HasAPIServer { - return fi.BoolValue(c.Cluster.Spec.KubeAPIServer.EnableBootstrapAuthToken) + return fi.BoolValue(c.NodeupConfig.APIServerConfig.KubeAPIServer.EnableBootstrapAuthToken) } return c.Cluster.Spec.Kubelet != nil && c.Cluster.Spec.Kubelet.BootstrapKubeconfig != "" diff --git a/nodeup/pkg/model/docker_test.go b/nodeup/pkg/model/docker_test.go index c3f311cdfe..b3a770cb06 100644 --- a/nodeup/pkg/model/docker_test.go +++ b/nodeup/pkg/model/docker_test.go @@ -120,9 +120,20 @@ func TestDockerBuilder_BuildFlags(t *testing.T) { } func runDockerBuilderTest(t *testing.T, key string) { + h := testutils.NewIntegrationTestHarness(t) + defer h.Close() + + h.MockKopsVersion("1.18.0") + h.SetupMockAWS() + basedir := path.Join("tests/dockerbuilder/", key) - nodeUpModelContext, err := BuildNodeupModelContext(basedir) + model, err := testutils.LoadModel(basedir) + if err != nil { + t.Fatal(err) + } + + nodeUpModelContext, err := BuildNodeupModelContext(model) if err != nil { t.Fatalf("error parsing cluster yaml %q: %v", basedir, err) return @@ -163,6 +174,9 @@ func runDockerBuilderTest(t *testing.T, key string) { } } + if err := nodeUpModelContext.Init(); err != nil { + t.Fatalf("error from nodeUpModelContext.Init(): %v", err) + } context := &fi.ModelBuilderContext{ Tasks: make(map[string]fi.Task), } diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index 284b6b3878..820fada9c8 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -55,7 +55,12 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { return nil } - if err := b.writeAuthenticationConfig(c); err != nil { + var kubeAPIServer kops.KubeAPIServerConfig + if b.NodeupConfig.APIServerConfig.KubeAPIServer != nil { + kubeAPIServer = *b.NodeupConfig.APIServerConfig.KubeAPIServer + } + + if err := b.writeAuthenticationConfig(c, &kubeAPIServer); err != nil { return err } @@ -63,7 +68,7 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { if *b.Cluster.Spec.EncryptionConfig { encryptionConfigPath := fi.String(filepath.Join(b.PathSrvKubernetes(), "encryptionconfig.yaml")) - b.Cluster.Spec.KubeAPIServer.EncryptionProviderConfig = encryptionConfigPath + kubeAPIServer.EncryptionProviderConfig = encryptionConfigPath key := "encryptionconfig" encryptioncfg, err := b.SecretStore.Secret(key) @@ -104,7 +109,7 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { }) } { - pod, err := b.buildPod() + pod, err := b.buildPod(&kubeAPIServer) if err != nil { return fmt.Errorf("error building kube-apiserver manifest: %v", err) } @@ -151,7 +156,7 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { return nil } -func (b *KubeAPIServerBuilder) writeAuthenticationConfig(c *fi.ModelBuilderContext) error { +func (b *KubeAPIServerBuilder) writeAuthenticationConfig(c *fi.ModelBuilderContext, kubeAPIServer *kops.KubeAPIServerConfig) error { if b.Cluster.Spec.Authentication == nil || b.Cluster.Spec.Authentication.IsEmpty() { return nil } @@ -198,7 +203,7 @@ func (b *KubeAPIServerBuilder) writeAuthenticationConfig(c *fi.ModelBuilderConte if b.Cluster.Spec.Authentication.Aws != nil { id := "aws-iam-authenticator" - b.Cluster.Spec.KubeAPIServer.AuthenticationTokenWebhookConfigFile = fi.String(PathAuthnConfig) + kubeAPIServer.AuthenticationTokenWebhookConfigFile = fi.String(PathAuthnConfig) { caCertificate, _, err := b.NodeupModelContext.KeyStore.FindPrimaryKeypair(fi.CertificateIDCA) @@ -302,9 +307,7 @@ func (b *KubeAPIServerBuilder) writeAuthenticationConfig(c *fi.ModelBuilderConte } // buildPod is responsible for generating the kube-apiserver pod and thus manifest file -func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) { - kubeAPIServer := b.Cluster.Spec.KubeAPIServer - +func (b *KubeAPIServerBuilder) buildPod(kubeAPIServer *kops.KubeAPIServerConfig) (*v1.Pod, error) { kubeAPIServer.ServiceAccountKeyFile = append(kubeAPIServer.ServiceAccountKeyFile, filepath.Join(b.PathSrvKubernetes(), "service-account.pub")) // Set the signing key if we're using Service Account Token VolumeProjection @@ -393,15 +396,14 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) { // @note: note sure if this is the best place to put it, I could place into the validation.go which has the benefit of // fixing up the manifests itself, but that feels VERY hacky // @note: it's fine to use AdmissionControl here and it's not populated by the model, thus the only data could have come from the cluster spec - c := b.Cluster.Spec.KubeAPIServer - if len(c.AdmissionControl) > 0 { - c.EnableAdmissionPlugins = append([]string(nil), c.AdmissionControl...) - c.AdmissionControl = []string{} + if len(kubeAPIServer.AdmissionControl) > 0 { + kubeAPIServer.EnableAdmissionPlugins = append([]string(nil), kubeAPIServer.AdmissionControl...) + kubeAPIServer.AdmissionControl = []string{} } } // build the kube-apiserver flags for the service - flags, err := flagbuilder.BuildFlagsList(b.Cluster.Spec.KubeAPIServer) + flags, err := flagbuilder.BuildFlagsList(kubeAPIServer) if err != nil { return nil, fmt.Errorf("error building kube-apiserver flags: %v", err) } @@ -501,8 +503,8 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) { Ports: []v1.ContainerPort{ { Name: "https", - ContainerPort: b.Cluster.Spec.KubeAPIServer.SecurePort, - HostPort: b.Cluster.Spec.KubeAPIServer.SecurePort, + ContainerPort: kubeAPIServer.SecurePort, + HostPort: kubeAPIServer.SecurePort, }, }, Resources: v1.ResourceRequirements{ @@ -563,7 +565,7 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) { addHostPathMapping(pod, container, "srvsshproxy", pathSrvSshproxy) } - auditLogPath := b.Cluster.Spec.KubeAPIServer.AuditLogPath + auditLogPath := kubeAPIServer.AuditLogPath // Don't mount a volume if the mount path is set to '-' for stdout logging // See https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-backends if auditLogPath != nil && *auditLogPath != "-" { diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go index 0dc8199c49..459e5ccfe4 100644 --- a/nodeup/pkg/model/kubelet_test.go +++ b/nodeup/pkg/model/kubelet_test.go @@ -149,12 +149,24 @@ func stringSlicesEqual(exp, other []string) bool { } func Test_RunKubeletBuilder(t *testing.T) { + h := testutils.NewIntegrationTestHarness(t) + defer h.Close() + + h.MockKopsVersion("1.18.0") + h.SetupMockAWS() + basedir := "tests/kubelet/featuregates" context := &fi.ModelBuilderContext{ Tasks: make(map[string]fi.Task), } - nodeUpModelContext, err := BuildNodeupModelContext(basedir) + + model, err := testutils.LoadModel(basedir) + if err != nil { + t.Fatal(err) + } + + nodeUpModelContext, err := BuildNodeupModelContext(model) if err != nil { t.Fatalf("error loading model %q: %v", basedir, err) return @@ -166,12 +178,24 @@ func Test_RunKubeletBuilder(t *testing.T) { } func Test_RunKubeletBuilderWarmPool(t *testing.T) { + h := testutils.NewIntegrationTestHarness(t) + defer h.Close() + + h.MockKopsVersion("1.18.0") + h.SetupMockAWS() + basedir := "tests/kubelet/warmpool" context := &fi.ModelBuilderContext{ Tasks: make(map[string]fi.Task), } - nodeUpModelContext, err := BuildNodeupModelContext(basedir) + + model, err := testutils.LoadModel(basedir) + if err != nil { + t.Fatal(err) + } + + nodeUpModelContext, err := BuildNodeupModelContext(model) if err != nil { t.Fatalf("error loading model %q: %v", basedir, err) return @@ -186,6 +210,10 @@ func Test_RunKubeletBuilderWarmPool(t *testing.T) { } func runKubeletBuilder(t *testing.T, context *fi.ModelBuilderContext, nodeupModelContext *NodeupModelContext) { + if err := nodeupModelContext.Init(); err != nil { + t.Fatalf("error from nodeupModelContext.Init(): %v", err) + } + builder := KubeletBuilder{NodeupModelContext: nodeupModelContext} kubeletConfig, err := builder.buildKubeletConfig() @@ -221,18 +249,12 @@ func runKubeletBuilder(t *testing.T, context *fi.ModelBuilderContext, nodeupMode } -func BuildNodeupModelContext(basedir string) (*NodeupModelContext, error) { - model, err := testutils.LoadModel(basedir) - if err != nil { - return nil, err - } - +func BuildNodeupModelContext(model *testutils.Model) (*NodeupModelContext, error) { if model.Cluster == nil { - return nil, fmt.Errorf("no cluster found in %s", basedir) + return nil, fmt.Errorf("no cluster found in model") } - nodeUpModelContext := &NodeupModelContext{ - Cluster: model.Cluster, + nodeupModelContext := &NodeupModelContext{ Architecture: "amd64", BootConfig: &nodeup.BootConfig{}, NodeupConfig: &nodeup.Config{ @@ -241,22 +263,34 @@ func BuildNodeupModelContext(basedir string) (*NodeupModelContext, error) { }, } + // Populate the cluster + cloud, err := cloudup.BuildCloud(model.Cluster) + if err != nil { + return nil, fmt.Errorf("error from BuildCloud: %v", err) + } + + err = cloudup.PerformAssignments(model.Cluster, cloud) + if err != nil { + return nil, fmt.Errorf("error from PerformAssignments: %v", err) + } + + nodeupModelContext.Cluster, err = mockedPopulateClusterSpec(model.Cluster, cloud) + if err != nil { + return nil, fmt.Errorf("unexpected error from mockedPopulateClusterSpec: %v", err) + } + if len(model.InstanceGroups) == 0 { // We tolerate this - not all tests need an instance group } else if len(model.InstanceGroups) == 1 { - nodeUpModelContext.NodeupConfig, nodeUpModelContext.BootConfig = nodeup.NewConfig(model.Cluster, model.InstanceGroups[0]) + nodeupModelContext.NodeupConfig, nodeupModelContext.BootConfig = nodeup.NewConfig(nodeupModelContext.Cluster, model.InstanceGroups[0]) } else { - return nil, fmt.Errorf("unexpected number of instance groups in %s, found %d", basedir, len(model.InstanceGroups)) + return nil, fmt.Errorf("unexpected number of instance groups: found %d", len(model.InstanceGroups)) } - nodeUpModelContext.NodeupConfig.CAs["ca"] = dummyCertificate + nextCertificate - nodeUpModelContext.NodeupConfig.KeypairIDs["ca"] = "3" + nodeupModelContext.NodeupConfig.CAs["ca"] = dummyCertificate + nextCertificate + nodeupModelContext.NodeupConfig.KeypairIDs["ca"] = "3" - if err := nodeUpModelContext.Init(); err != nil { - return nil, err - } - - return nodeUpModelContext, nil + return nodeupModelContext, nil } func mockedPopulateClusterSpec(c *kops.Cluster, cloud fi.Cloud) (*kops.Cluster, error) { @@ -339,9 +373,10 @@ func RunGoldenTest(t *testing.T, basedir string, key string, builder func(*Nodeu context := &fi.ModelBuilderContext{ Tasks: make(map[string]fi.Task), } - nodeupModelContext, err := BuildNodeupModelContext(basedir) + + model, err := testutils.LoadModel(basedir) if err != nil { - t.Fatalf("error loading model %q: %v", basedir, err) + t.Fatal(err) } keystore := &fakeCAStore{} @@ -362,25 +397,15 @@ func RunGoldenTest(t *testing.T, basedir string, key string, builder func(*Nodeu "kube-scheduler": mustParseCertificate(dummyCertificate), } - nodeupModelContext.KeyStore = keystore - - // Populate the cluster - cloud, err := cloudup.BuildCloud(nodeupModelContext.Cluster) + nodeupModelContext, err := BuildNodeupModelContext(model) if err != nil { - t.Fatalf("error from BuildCloud: %v", err) + t.Fatalf("error loading model %q: %v", basedir, err) } - { - err := cloudup.PerformAssignments(nodeupModelContext.Cluster, cloud) - if err != nil { - t.Fatalf("error from PerformAssignments: %v", err) - } + nodeupModelContext.KeyStore = keystore - full, err := mockedPopulateClusterSpec(nodeupModelContext.Cluster, cloud) - if err != nil { - t.Fatalf("unexpected error from mockedPopulateClusterSpec: %v", err) - } - nodeupModelContext.Cluster = full + if err := nodeupModelContext.Init(); err != nil { + t.Fatalf("error from nodeupModelContext.Init(): %v", err) } if err := builder(nodeupModelContext, context); err != nil { diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml index d33ef31e25..f535c7bc22 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.19.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml index 65dc280db6..3ade32e0fa 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.19.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml index 6beea40950..10426810a8 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.19.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml index d33ef31e25..f535c7bc22 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.19.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml index 776585e64a..4ba2b488f9 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.16.3 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/cluster.yaml index 9cc70c79a5..7a462b82bc 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.13.6 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml index b0d91e6f09..fc9bc5cb5d 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml @@ -21,6 +21,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.19.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml index 0f6458f882..1f37342bd7 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml @@ -21,6 +21,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.4.6 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml index d16b4e61a7..bde9d11467 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.17.0 masterInternalName: api.internal.logflags.example.com masterPublicName: api.logflags.example.com diff --git a/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml index 6452b20bc0..0d6b58d819 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.14.6 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml index e0a25bce81..c47efc6810 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml @@ -20,6 +20,8 @@ spec: - instanceGroup: master-us-test-1a name: master-us-test-1a name: events + iam: + legacy: false kubernetesVersion: v1.14.6 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go index 74973e9a4b..7c81c6b123 100644 --- a/pkg/apis/nodeup/config.go +++ b/pkg/apis/nodeup/config.go @@ -73,6 +73,9 @@ type Config struct { Hooks [][]kops.HookSpec // ContainerdConfig config holds the configuration for containerd ContainerdConfig string `json:"containerdConfig,omitempty"` + + // APIServerConfig is additional configuration for nodes running an APIServer. + APIServerConfig *APIServerConfig `json:",omitempty"` } // BootConfig is the configuration for the nodeup binary that might be too big to fit in userdata. @@ -116,6 +119,12 @@ type StaticManifest struct { Path string `json:"path,omitempty"` } +// APIServerConfig is additional configuration for nodes running an APIServer. +type APIServerConfig struct { + // KubeAPIServer is a copy of the KubeAPIServerConfig from the cluster spec. + KubeAPIServer *kops.KubeAPIServerConfig +} + func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Config, *BootConfig) { role := instanceGroup.Spec.Role isMaster := role == kops.InstanceGroupRoleMaster @@ -155,6 +164,12 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Confi reflectutils.JSONMergeStruct(&config.KubeletConfig, cluster.Spec.Kubelet) } + if isMaster || role == kops.InstanceGroupRoleAPIServer { + config.APIServerConfig = &APIServerConfig{ + KubeAPIServer: cluster.Spec.KubeAPIServer, + } + } + if instanceGroup.Spec.Kubelet != nil { useSecureKubelet := config.KubeletConfig.AnonymousAuth != nil && !*config.KubeletConfig.AnonymousAuth From fdf034058db4017acf94007fb74364371fe5ff37 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 26 Jun 2021 12:38:55 -0700 Subject: [PATCH 2/7] hack/update-expected.sh --- .../tests/containerdbuilder/from_docker_19.03.11/tasks.yaml | 2 +- .../tests/containerdbuilder/from_docker_19.03.14/tasks.yaml | 2 +- nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml | 2 +- .../pkg/model/tests/dockerbuilder/docker_18.06.3/tasks.yaml | 2 +- .../model/tests/dockerbuilder/docker_19.03.11/tasks.yaml | 2 +- nodeup/pkg/model/tests/dockerbuilder/healthcheck/tasks.yaml | 2 +- nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml | 2 +- nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml | 2 +- nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml | 2 +- nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml | 2 +- pkg/model/tests/data/bootstrapscript_0.txt | 2 +- pkg/model/tests/data/bootstrapscript_1.txt | 2 +- pkg/model/tests/data/bootstrapscript_2.txt | 2 +- pkg/model/tests/data/nodeupconfig_0.txt | 3 +++ pkg/model/tests/data/nodeupconfig_1.txt | 3 +++ pkg/model/tests/data/nodeupconfig_2.txt | 3 +++ .../apiservernodes/cloudformation.json.extracted.yaml | 4 ++-- ..._master-us-test-1a.masters.minimal.example.com_user_data | 2 +- ...us-test-1a.masters.bastionuserdata.example.com_user_data | 2 +- .../complex/cloudformation.json.extracted.yaml | 2 +- ..._master-us-test-1a.masters.complex.example.com_user_data | 2 +- ...master-us-test-1a.masters.compress.example.com_user_data | 2 +- .../containerd-custom/cloudformation.json.extracted.yaml | 2 +- .../containerd/cloudformation.json.extracted.yaml | 2 +- .../docker-custom/cloudformation.json.extracted.yaml | 2 +- ...er-us-test-1a.masters.existing-iam.example.com_user_data | 2 +- ...er-us-test-1b.masters.existing-iam.example.com_user_data | 2 +- ...er-us-test-1c.masters.existing-iam.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...ster-us-test-1a.masters.existingsg.example.com_user_data | 2 +- ...ster-us-test-1b.masters.existingsg.example.com_user_data | 2 +- ...ster-us-test-1c.masters.existingsg.example.com_user_data | 2 +- .../externallb/cloudformation.json.extracted.yaml | 2 +- ...ster-us-test-1a.masters.externallb.example.com_user_data | 2 +- ...s-test-1a.masters.externalpolicies.example.com_user_data | 2 +- ...plate_master-us-test-1a.masters.ha.example.com_user_data | 2 +- ...plate_master-us-test-1b.masters.ha.example.com_user_data | 2 +- ...plate_master-us-test-1c.masters.ha.example.com_user_data | 2 +- ...er-us-test1-a-ha-gce-example-com_metadata_startup-script | 2 +- ...er-us-test1-b-ha-gce-example-com_metadata_startup-script | 2 +- ...er-us-test1-c-ha-gce-example-com_metadata_startup-script | 2 +- ..._master-us-test-1a.masters.minimal.example.com_user_data | 2 +- ..._master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../minimal-etcd/cloudformation.json.extracted.yaml | 2 +- .../minimal-gp3/cloudformation.json.extracted.yaml | 2 +- ..._master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../minimal-ipv6/cloudformation.json.extracted.yaml | 2 +- ...er-us-test-1a.masters.minimal-ipv6.example.com_user_data | 2 +- ...er-us-test-1a.masters.minimal-json.example.com_user_data | 2 +- ...s-test-1a.masters.minimal-warmpool.example.com_user_data | 2 +- .../minimal/cloudformation.json.extracted.yaml | 2 +- ..._master-us-test-1a.masters.minimal.example.com_user_data | 2 +- ...-test1-a-minimal-gce-example-com_metadata_startup-script | 2 +- ...-minimal-gce-private-example-com_metadata_startup-script | 2 +- ...te_master-us-test-1a.masters.minimal.k8s.local_user_data | 2 +- .../mixed_instances/cloudformation.json.extracted.yaml | 6 +++--- ...-us-test-1a.masters.mixedinstances.example.com_user_data | 2 +- ...-us-test-1b.masters.mixedinstances.example.com_user_data | 2 +- ...-us-test-1c.masters.mixedinstances.example.com_user_data | 2 +- .../mixed_instances_spot/cloudformation.json.extracted.yaml | 6 +++--- ...-us-test-1a.masters.mixedinstances.example.com_user_data | 2 +- ...-us-test-1b.masters.mixedinstances.example.com_user_data | 2 +- ...-us-test-1c.masters.mixedinstances.example.com_user_data | 2 +- .../nth_sqs_resources/cloudformation.json.extracted.yaml | 2 +- ...us-test-1a.masters.nthsqsresources.example.com_user_data | 2 +- .../private-shared-ip/cloudformation.json.extracted.yaml | 2 +- ...-test-1a.masters.private-shared-ip.example.com_user_data | 2 +- ...t-1a.masters.private-shared-subnet.example.com_user_data | 2 +- .../privatecalico/cloudformation.json.extracted.yaml | 2 +- ...r-us-test-1a.masters.privatecalico.example.com_user_data | 2 +- ...er-us-test-1a.masters.privatecanal.example.com_user_data | 2 +- .../privatecilium/cloudformation.json.extracted.yaml | 2 +- ...r-us-test-1a.masters.privatecilium.example.com_user_data | 2 +- .../privatecilium2/cloudformation.json.extracted.yaml | 2 +- ...r-us-test-1a.masters.privatecilium.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...t-1a.masters.privateciliumadvanced.example.com_user_data | 2 +- ...ter-us-test-1a.masters.privatedns1.example.com_user_data | 2 +- ...ter-us-test-1a.masters.privatedns2.example.com_user_data | 2 +- ...-us-test-1a.masters.privateflannel.example.com_user_data | 2 +- ...r-us-test-1a.masters.privatekopeio.example.com_user_data | 2 +- ...er-us-test-1a.masters.privateweave.example.com_user_data | 2 +- ..._master-us-test-1a.masters.minimal.example.com_user_data | 2 +- ...er-us-test-1a.masters.sharedsubnet.example.com_user_data | 2 +- ...aster-us-test-1a.masters.sharedvpc.example.com_user_data | 2 +- ...aster-us-test-1a.masters.unmanaged.example.com_user_data | 2 +- ..._master-us-test-1a.masters.minimal.example.com_user_data | 2 +- 87 files changed, 98 insertions(+), 89 deletions(-) diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml index 296f91c578..01fe685790 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml @@ -2,7 +2,7 @@ contents: "" path: /etc/containerd/config-kops.toml type: file --- -contents: CONTAINERD_OPTS= +contents: CONTAINERD_OPTS=--log-level=info path: /etc/sysconfig/containerd type: file --- diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml index b7b05d06a8..529a79fbd8 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml @@ -2,7 +2,7 @@ contents: "" path: /etc/containerd/config-kops.toml type: file --- -contents: CONTAINERD_OPTS= +contents: CONTAINERD_OPTS=--log-level=info path: /etc/sysconfig/containerd type: file --- diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml index 70f30e517c..9d8d2a9a9a 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml @@ -30,7 +30,7 @@ contents: |2 path: /etc/crictl.yaml type: file --- -contents: CONTAINERD_OPTS= +contents: CONTAINERD_OPTS=--log-level=info path: /etc/sysconfig/containerd type: file --- diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/tasks.yaml index 9127c39393..e39b3cb506 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_18.06.3/tasks.yaml @@ -2,7 +2,7 @@ file: /usr/bin/docker-runc mode: +i --- contents: |- - DOCKER_OPTS= + DOCKER_OPTS=--ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs DOCKER_NOFILE=1000000 path: /etc/sysconfig/docker type: file diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml index 57f71c330c..1ec020baa2 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml @@ -1,5 +1,5 @@ contents: |- - DOCKER_OPTS= + DOCKER_OPTS=--ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs DOCKER_NOFILE=1000000 path: /etc/sysconfig/docker type: file diff --git a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/tasks.yaml index 9127c39393..e39b3cb506 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/tasks.yaml @@ -2,7 +2,7 @@ file: /usr/bin/docker-runc mode: +i --- contents: |- - DOCKER_OPTS= + DOCKER_OPTS=--ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs DOCKER_NOFILE=1000000 path: /etc/sysconfig/docker type: file diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml index 9127c39393..e39b3cb506 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml @@ -2,7 +2,7 @@ file: /usr/bin/docker-runc mode: +i --- contents: |- - DOCKER_OPTS= + DOCKER_OPTS=--ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs DOCKER_NOFILE=1000000 path: /etc/sysconfig/docker type: file diff --git a/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml index 9127c39393..e39b3cb506 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml @@ -2,7 +2,7 @@ file: /usr/bin/docker-runc mode: +i --- contents: |- - DOCKER_OPTS= + DOCKER_OPTS=--ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs DOCKER_NOFILE=1000000 path: /etc/sysconfig/docker type: file diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml index 2aad161269..fe924096e4 100644 --- a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml +++ b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml @@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests type: directory --- contents: | - DAEMON_ARGS="--client-ca-file=/srv/kubernetes/ca.crt --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/" + DAEMON_ARGS="--cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=aws --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --hostname-override=@aws --kubeconfig=/var/lib/kubelet/kubeconfig --network-plugin-mtu=9001 --network-plugin=kubenet --non-masquerade-cidr=100.64.0.0/10 --pod-infra-container-image=k8s.gcr.io/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/cloud.config --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/" HOME="/root" path: /etc/sysconfig/kubelet type: file diff --git a/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml b/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml index 15645ddc05..d66e285354 100644 --- a/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml +++ b/nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml @@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests type: directory --- contents: | - DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --client-ca-file=/srv/kubernetes/ca.crt --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/ --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key" + DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=aws --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --hostname-override=@aws --kubeconfig=/var/lib/kubelet/kubeconfig --network-plugin-mtu=9001 --network-plugin=kubenet --non-masquerade-cidr=100.64.0.0/10 --pod-infra-container-image=k8s.gcr.io/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/cloud.config --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/ --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key" HOME="/root" path: /etc/sysconfig/kubelet type: file diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index 1ed4fa12a4..6eec64f3d4 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Master -NodeupConfigHash: ej6j8tOPld2m+scdzaBE9+pJ0mBBa+NqYP/JXQH/1wU= +NodeupConfigHash: MzXsqZpAZ2tZ3xBPeZF8bbyK05tE4uj4oOA/vlWSja4= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index ba44618de9..56a9f9679a 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Master -NodeupConfigHash: U5k9mxZt5TF/KEuWMRmlZHuH5VODQ+JSonA69DTz+Nk= +NodeupConfigHash: 4MBH6eVy/oDjfHW7iSgG2E2V85fj3cPHstBk0O/LrgA= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index ba44618de9..56a9f9679a 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Master -NodeupConfigHash: U5k9mxZt5TF/KEuWMRmlZHuH5VODQ+JSonA69DTz+Nk= +NodeupConfigHash: 4MBH6eVy/oDjfHW7iSgG2E2V85fj3cPHstBk0O/LrgA= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt index 9d64af0820..c6690886f7 100644 --- a/pkg/model/tests/data/nodeupconfig_0.txt +++ b/pkg/model/tests/data/nodeupconfig_0.txt @@ -1,3 +1,6 @@ +APIServerConfig: + KubeAPIServer: + image: CoreOS CAs: {} FileAssets: - content: user,token diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt index 3b9864d8b9..124df5a186 100644 --- a/pkg/model/tests/data/nodeupconfig_1.txt +++ b/pkg/model/tests/data/nodeupconfig_1.txt @@ -1,3 +1,6 @@ +APIServerConfig: + KubeAPIServer: + image: CoreOS CAs: {} FileAssets: - content: blah blah diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt index 3b9864d8b9..124df5a186 100644 --- a/pkg/model/tests/data/nodeupconfig_2.txt +++ b/pkg/model/tests/data/nodeupconfig_2.txt @@ -1,3 +1,6 @@ +APIServerConfig: + KubeAPIServer: + image: CoreOS CAs: {} FileAssets: - content: blah blah diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index 1a4f0a9a8e..ddcc084b3b 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -163,7 +163,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer - NodeupConfigHash: p8eLHyXBOZnr+jP1TWpeLlU0+66qXOzHvdBwrKrbH2s= + NodeupConfigHash: ZrF2nkmCyprnUDONifcSLPDX0tkrryjPRpJwONi6lUs= __EOF_KUBE_ENV @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 5UuOxKrId64yamuQR5oP3OCdEq0zTVaMY+FSTAxCuvg= + NodeupConfigHash: U+9Aqc/eTytkCzRaERM+ywVrGNXGsseDBCXMn1VJGH8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 4f85099c47..a37e167216 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qqkorWeVyTOu3dNGAUmxef9HeHo0fxXNQzRRivqz9ps= +NodeupConfigHash: lGtyFdBbcwNhryEa/VdzoQUM/f8LCiCEC/U5J+ZZ2Vw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index daabe2921f..2fbb400660 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: SzjP73pafM/nsOQLhdSt3fLoP0BJymVTJ32sTv6PCR0= +NodeupConfigHash: gAsokkTnxR+hVH3VhKusaRU7e5Y1At8KaXeaSkOvV/I= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 5b487dee95..7255b04652 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -260,7 +260,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: d2LINNVhOVDofPTxWK3/5qLttKDWBpczzBm+T//CAOY= + NodeupConfigHash: CAtSatueaxrWwrMDwFh5dqFBdS0FHQ9BINFrI7j5c8U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index 0f5e038a76..a0c4548f92 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -259,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: d2LINNVhOVDofPTxWK3/5qLttKDWBpczzBm+T//CAOY= +NodeupConfigHash: CAtSatueaxrWwrMDwFh5dqFBdS0FHQ9BINFrI7j5c8U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index 2fb53d4318..64c9caea9c 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -133,7 +133,7 @@ ensure-install-dir echo "H4sIAAAAAAAA/+xWTXPbNhC961dgppPJJSbFxE1bTg5V5LRWY6WslI9eIWBFoQIBZgFQVn99ZwFSH47VTKfHdjxjW7uLxe7btw8S2gY5tWat6nLEGN+5N6+X0+XsBlUHSCbGwPCVBlmyNdcORow13PAalt4ir2GquXPgSuYxwEhY47kygItgvGqgZAeLPDolJda2voMOdMmUWdsRYx2gU9aUrMius5cjacU2leC2qp0Z57nW/TVgBO5br6zpa2cmaD0CL+RUB+cBHR2EDox3qYtD9hfZdVa8iG0o87hvG1YwqWZLwB4ErrXdVag6paEmKGIVjHFjzb6xwU2C3xwB4q2aBKnACIi3XzHKiAY8uMx1IpOw5kH7FJqumdpgfMkKsgW/saj+5NTg3Eoo2UTv+N5NqIwRYytl5ERKBOdKNs7iz4ixOMwKbackYEnDHA3Tm8hGOeqx0qFWpq/qHW/AtVzAnVqD2AsN0XynGuUX3NSA8TMVqARMhKAao6kixJwH4z9aHRq44yvQ0XOTWjtlx6n9vdWAsbElCGtkcs6D516Z+lDmJ1htrN1G50eulbzsfmclLMB5VILSRtsCnA0o4LdgPScQvJAJ5r7zjfetK/O8eP5dhK8or8fj4jzy1w4QlRxGmCc2ffPo0ecjxlTDayjZ9nuX1QIzZXOa+hVvlUtE6orseREnRQ4NvkJYAyIMw3y/b4fbZsYDGq5nVfx4a503vEnzeXN/4juuEdWA8DmA8xvgEjDSBWSccsrK6xqh5t7iw9g39x75bfyXqlL3w5HfrxbQWA9XMeLq4bmf0YY2nXt4ILoexn9wVHoDjx8hLy08iIBQWfQlu75+ES2nFJw5F4jhwyh4qzLVA5YJ27QEZgb3vGk1kOGLDL98erv8sJj9gxS5bcEomXdF/sdu644Ze8GZVXFjSlaMx9nLa6JGHmXGpU14zcUWjCwjw5LETK3xaLUGnEdFPUiN4B6I1tPZzcIdxcZ7LjY3QL8XtDxCaVjujagAlZUlK5qxuyQDIlVJGVOJP7xMJRZHJxGFBPtR/EQU2oAwpfQLGzyJ/qB4F7gvDh1eNX2LxyXQiXga4t4mJT6xHfo+Z3hwcK5HUwQJxiuuB6jo6grt/b78auNtWCR2Rh/1uek3bdj+kj39ke/c08tNtvGqk75O6qWApdiADDqN90IOd4j5d/j0wlJefptETWvZv+/M7Z2HRh7sC2t9yfKvsOjm3fKE58X4xGPjqzp8zIjL+vAK3cAq1LUy9S03UtP6Dz1Al9T7lqMsWQONxX3GO640nXtVjMdz9cxYCWt3Zn4yGBX9dT8hwKtvnzyLKH8ROljPYv9+5IRnYn7FCcW845hrtcp7oPNjwBdMNeB3Frfpxe13yyhyWDPn7nMA5GnHz0WD4GytnHOj1uB8fzF4kR+/ReRN73WjhhPSb/8f/H9t8PSy1vQlDHuFoX6Hef8FAAD//wEAAP//MYvDU9kLAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1TOzU7DMBAE4Lufwi+QRhW/ssSFhkJBbREnritnS5zYXuO1neTtUegp19E3o9lZyu1npGJajErCyGJH/mJ+noFRSYfuwqqutc2cMPIGJ3DB4kaTqzW5EJFXoTh4TuA1vkbK4QRuGYGlW2WuEnKqtrBGX2RRyeM/EidqMYfrhTfgTsnj73zbfHfD+4Eey0u5H6ab7TnqO/1Qmv1H0+/DeTbO9KMfnsQfAAAA//8BAAD//7AVi2bPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1TOUUvDMBQF4Pf8iryXrmwgmwEftuFsqbYiVNS3a3JrC0lvyE2q/nupe+rr4TuHc7aUzHOgeTQYlIRvFmea+vHrBIxKOnQ9q6LQNnHEwBv8AectbjS5QpPzAXkVimriCJPGh0DJN+CWEVi6eeI8Isd8C2v0QhaVfPpHoiGDyV8vlMCDknVb2+xwW3WX4z477s3HZfc5dm+uZJwft++n4f637W6yavd6uBN/AAAA//8BAAD//2VQaETPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml index 00d262ee71..559e5380f3 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -253,7 +253,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: vx1g2bnCro3sZcb2sHyjSmq3K4EgSVhtTs+yYjbi1QI= + NodeupConfigHash: RFRWeCrxsIBpecKChkCyG0rxpVjp6LxPHZX5UtCsm58= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index 974a85e0c3..cd06c778b7 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 4BHy4sQg+b+IEBOKmD5oxNIGengpyDckLf4nFZ6KGNs= + NodeupConfigHash: UWazbJsRi0FofksMBKFY2u7RglBuWM6/4LmRFsUZH7A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml index 53cb50e3b1..69c9a9fa39 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -263,7 +263,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: XN2xcwEitXKXi4QqWQ5xn9OppwaH9B4XFJiv3s8pEak= + NodeupConfigHash: js/DOzyNEfbR1/cJDZFjZARgU7awwly60yL7G4DxhGU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index b8f7f292ba..1baaebe7ce 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: i3U4CSU3FuqzBJ8Iy+6FytYAjSXhrsYqtQzI1zafsVw= +NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index fbec2f7518..20b4b1f3ea 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: i3U4CSU3FuqzBJ8Iy+6FytYAjSXhrsYqtQzI1zafsVw= +NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index 7c23432f27..7ce6b59acb 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: i3U4CSU3FuqzBJ8Iy+6FytYAjSXhrsYqtQzI1zafsVw= +NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index 271a9ab439..5bda00a42a 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: qqkorWeVyTOu3dNGAUmxef9HeHo0fxXNQzRRivqz9ps= + NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index df85c9982a..3c8e54a4ff 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ecln7oNpfW/IJWQs4SqU+sHOJUjB+8seCb8S+NoJ0QU= +NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index b63af4da9f..ec272ffa1f 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: ecln7oNpfW/IJWQs4SqU+sHOJUjB+8seCb8S+NoJ0QU= +NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index 2c857da6c6..e438f78dd8 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: ecln7oNpfW/IJWQs4SqU+sHOJUjB+8seCb8S+NoJ0QU= +NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 629e39a295..093a5ce2d4 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: k/dxP29cl6k3EM5wJXQPtqEEToVO5J3OyPjb9cXhKRo= + NodeupConfigHash: AlFC8wy99SsvC1VbRgtiwOVsKJF64x2/o6QrMW8Hv/Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index 575797219c..b284442f1f 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: k/dxP29cl6k3EM5wJXQPtqEEToVO5J3OyPjb9cXhKRo= +NodeupConfigHash: AlFC8wy99SsvC1VbRgtiwOVsKJF64x2/o6QrMW8Hv/Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index cc29d822b9..2d4db16a60 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -246,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: LfyrKgzpixEpTWAiVk2VfQ9ta/INbSk67k9bv50ybeU= +NodeupConfigHash: hopn1N2w/d1DC0i4oB1SEUAiZgA2Ios26BOJAbnMtY0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index df7d0c03a2..fe064df5bd 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 3X+531QYc0K5Mucy4dCdoIlZnq0bY2IxjWBg6XCqCxk= +NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index c88e0488ae..7330589b80 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: 3X+531QYc0K5Mucy4dCdoIlZnq0bY2IxjWBg6XCqCxk= +NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index 93d1ee4682..a3b1ee4d02 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: 3X+531QYc0K5Mucy4dCdoIlZnq0bY2IxjWBg6XCqCxk= +NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index 922b9cf554..a02dd1b8bc 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: /PiYerlnADgL+mIWkpZ0RTPcyOoQk4kwvLOKVAcQdpA= +NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index aa115a6fe5..39bc5d462d 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: Master -NodeupConfigHash: /PiYerlnADgL+mIWkpZ0RTPcyOoQk4kwvLOKVAcQdpA= +NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index c9513ce60f..916add986e 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: Master -NodeupConfigHash: /PiYerlnADgL+mIWkpZ0RTPcyOoQk4kwvLOKVAcQdpA= +NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 88df3196b2..831fecc464 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: fOpCb4QTuHyO2Wo7MOFc3qAlO5hfL9HKVyi5Jk5TKTs= +NodeupConfigHash: rv6TrPQKtrMb/K0NDdArz7J9SL/cX9qmZ5L+smi3ipY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index c4a322fbe0..063281f2f8 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -252,7 +252,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: AnhG4S2vmSqlFp6NF4pMR9ohvNnofkglN7LqKAdTlOo= +NodeupConfigHash: PACgJGDzNeR50goziPahdsTOGbCfchODtRpGpnfB2D8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml index 1acaac3231..9a62c9bd00 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -261,7 +261,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: nFj4StYotytc8HjM+2SFARL30uAbj5DCiMarLWo4+/Q= + NodeupConfigHash: l/xI57IEaF993tGMaoFVIaymP3M01cZxEI7Wr+GweAw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml index 462597e1de..4b61dd937d 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: qqkorWeVyTOu3dNGAUmxef9HeHo0fxXNQzRRivqz9ps= + NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3bc0c0ecce..1f5ca2691d 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -250,7 +250,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qqkorWeVyTOu3dNGAUmxef9HeHo0fxXNQzRRivqz9ps= +NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml index 4eb3511694..4f0ab70897 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: iDp7DUag7QChvfo5ntgbL23Vx2fQJjm/dEC9+zkqPAs= + NodeupConfigHash: IjTy8kBQot33WJvAaerH9tKCW6xbPl+y2JZGvdtsD3k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index e7f4ad35b8..1aea28c5b8 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: iDp7DUag7QChvfo5ntgbL23Vx2fQJjm/dEC9+zkqPAs= +NodeupConfigHash: IjTy8kBQot33WJvAaerH9tKCW6xbPl+y2JZGvdtsD3k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data index db8d80388b..815c6e92f3 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-json.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: LmusQHbPviFiPM3JAi3EpYF8G1I7dJudRZF1oiAQ2ac= +NodeupConfigHash: flLgsUDRbjCmUHf76HMfve2Nm8iNq/RCmAyl8X00F+U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 070fef3b45..764ed933c3 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -253,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Ao8uVAOR6P40iWBoICjT6phr+HWNDICXSkZAJAG9a8g= +NodeupConfigHash: GPSqfzNFYOcMyOpXH/4i/0CcADXtCzn0B0okcxR31zg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 271a9ab439..5bda00a42a 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: qqkorWeVyTOu3dNGAUmxef9HeHo0fxXNQzRRivqz9ps= + NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index dda9baad69..1b3512a2d7 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qqkorWeVyTOu3dNGAUmxef9HeHo0fxXNQzRRivqz9ps= +NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 3aa058b512..14c8fb8288 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: QVr+bhltJSYAUMZr9ikiLkK3UuP18t3+D78FJLGY+/A= +NodeupConfigHash: n3PWi1Op01/UaMsxGcSr+EUWnPtGVltFjrYQiM4JxiY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 8976089ed0..04afe9bcf2 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: LVK3c7q0+A5FlCBH43VUujJ8tz7rRlU91cXg/pNkXds= +NodeupConfigHash: NGeDqbCK2rRtB9jRcoPuxPz7DVsJA2IZuP72YikfKOY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 8aa32dbb99..9750f0b6e7 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: JnT0LtbCJ2EGQv1436Y+cWSi24DKn7TXFFxyH0h6FrA= +NodeupConfigHash: RXfAaBCifiIl+YHXHi8o7+ALaEaqqiBoJaGXP2QnbKc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index eb2ce830f7..fff15cbe6c 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= + NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV @@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= + NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV @@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= + NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index b5f9d4030f..4d36be6a34 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= +NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 936e608030..3f30e523e2 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= +NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 10dbfd6189..6d9c21462e 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= +NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index eb2ce830f7..fff15cbe6c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= + NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV @@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= + NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV @@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= + NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index b5f9d4030f..4d36be6a34 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= +NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 936e608030..3f30e523e2 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= +NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 10dbfd6189..6d9c21462e 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: WMVk8J0L7etYatXDeRLMPbNJv+D9kuAtWhqNvSmSnC4= +NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml index 48c9119007..65b114e9cb 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 3gk2h9qpHR4okkmKRK0eFURBr/Wni5zDJnWNp1Oasew= + NodeupConfigHash: Dk1aAD6LyilDH5Y2d75Rb5+GkIlGz8dog5kNHOv8IQM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data index c9a53b3269..52a33ca929 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 3gk2h9qpHR4okkmKRK0eFURBr/Wni5zDJnWNp1Oasew= +NodeupConfigHash: Dk1aAD6LyilDH5Y2d75Rb5+GkIlGz8dog5kNHOv8IQM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml index 0ddee36b5e..e3ee7bd839 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 9s7uWhumQraci5HrOiDDvsspkp+RkrDw9HVE66MdWZ4= + NodeupConfigHash: D94uzEMmvqyZi+pnRvwwYXqNwWMLCC4jTeIqxGkqwCQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index d0dc278ae2..b1726c482d 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 9s7uWhumQraci5HrOiDDvsspkp+RkrDw9HVE66MdWZ4= +NodeupConfigHash: D94uzEMmvqyZi+pnRvwwYXqNwWMLCC4jTeIqxGkqwCQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index 1352e77510..706c44e014 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: W5kKn+y0hL7iN9O0m51G4dUxLpfVy/1N8Sbgte6NRAA= +NodeupConfigHash: M2RmIUPdS4QNZXpbcfpUTnmUpAKO700xyqkAK4ufkR4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 8264edbe5e..7bb7c9a426 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: UJX5iGHbJ7OHywOwcVW3ae//N3p1N9yf7/9/KsUy7Do= + NodeupConfigHash: qFC+IuNZdaczWOal4TveEvxfptUfR2I5yxnkj1EySOY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index 926cf0ce91..3f2838a651 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: UJX5iGHbJ7OHywOwcVW3ae//N3p1N9yf7/9/KsUy7Do= +NodeupConfigHash: qFC+IuNZdaczWOal4TveEvxfptUfR2I5yxnkj1EySOY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index e562d8e553..e27164e899 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 9O31CSCnLCvCA1+C2k9wT7OB0PazUW1g76JAF2+YhN8= +NodeupConfigHash: c22OPNrkShxP1eWNimqV+aP5qPp4wo1LLT9OMTTdST0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 0b0e29d1a2..e18514e1cd 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 74QFjgw/F/jXa/Zl949lO+TxAxRAD44Lfv8yAyEyxmU= + NodeupConfigHash: Tw9bYLgB6YLLejylOQLmNpF1EuSK2LIUjv0lWym3mAo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 3c375a7f54..85f9da9ac0 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 74QFjgw/F/jXa/Zl949lO+TxAxRAD44Lfv8yAyEyxmU= +NodeupConfigHash: Tw9bYLgB6YLLejylOQLmNpF1EuSK2LIUjv0lWym3mAo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index faefa91474..da1643f5ce 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: D9+ykwtrDz0iMGRm/RO7ZL5t2Ev8hjcUS7oxgryhqtk= + NodeupConfigHash: znwb+ZgMChUtCkn8yFP9Zr0EukREtfZ+q2Qp0tuAohs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index e9cf0d7f72..63d836c86b 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -249,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: D9+ykwtrDz0iMGRm/RO7ZL5t2Ev8hjcUS7oxgryhqtk= +NodeupConfigHash: znwb+ZgMChUtCkn8yFP9Zr0EukREtfZ+q2Qp0tuAohs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index c79bf211cc..c66bf07526 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -249,7 +249,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 58rDov0rcoNX88fBs1Bs0tVQEjTzd5sXhdXUXLnPc0Q= + NodeupConfigHash: pYq/8Yzhuk0H1T8z4ZJNM0E344Xeym7LxR6myrhYwB4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index 659e5af834..21d757886f 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -247,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 58rDov0rcoNX88fBs1Bs0tVQEjTzd5sXhdXUXLnPc0Q= +NodeupConfigHash: pYq/8Yzhuk0H1T8z4ZJNM0E344Xeym7LxR6myrhYwB4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 5160b79749..407b4e002e 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: n1JQY5tU0FIe2oeguBTHR9kGqOa8WQtRjFQg7HoOAcs= +NodeupConfigHash: avrRY1Li5dJl6Ak8bLy/8RR6ALBUdKxdR7ZxGe/vkBo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index e9f959b6bd..e20ed253be 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: b0jLXRH3YvC0nEEyMJ8K0rqJS32YP3VFU8SNFw6uv2M= +NodeupConfigHash: ycTJyrGJ+JTIF0wuWPkksO53deGB3r8i328cFfwW0NE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index c1ea907fcf..d58f051051 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: D0Y92wp9sdix4qrZCCmYJ07mLWeD5+a0S47foXgLWew= +NodeupConfigHash: +wKlmNU4hK+/BBb2Na/RdFrZbIDEAewWY8gFSxDQ3c8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 638545bc20..1777508526 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: +DOEKqfcsRxmtWfe4/uJm4PKJDy5h78/ZQnD6WQWtdQ= +NodeupConfigHash: u022yLElmlcCakyX+gEMqcAbpaNuL72bNwebu3m/pA4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index 53367c9039..1c4d8f2580 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 9zWLHV0Z2t9soYnrsJS20YRBVIMWCgk8j149VDw1NMA= +NodeupConfigHash: e26rBO+7Vl7eQjrQGdVtNdN2t2s5j/djMjFciIL6h94= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ce3614a1b9..bdebd0c8cd 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -255,7 +255,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: llFbwmUKxmtS93Ft3tz7dQvd4c6aZ7FGtltTmth0vH0= +NodeupConfigHash: jBmt6+uYZs1qpzVq5VzRUS3jxBsi/8K6RatUARK94yM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index d341cd69fb..2c7880b04a 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: zb/qhdUT5iepfIB9T050JgY+1/yBPwcfV8qd9bfK6vI= +NodeupConfigHash: iJEQ9arhOSa/j3LE/ctKHja9dRoQclnqwgF2Lco5D/k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index d0b28df027..8b5c5d316b 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 58Radea2xQsVakDCs25yFlmCPxmmT06/p2VvSGtR134= +NodeupConfigHash: VZeijGPu2v0SYh3YKhbVpkIaLD41hn3o4/3/kfN7/1U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index ec06efcd04..fe1dd5ab70 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: L3ywUXxhitW50RPk/RImnR2mUnYfQwglv67tiPlLF+c= +NodeupConfigHash: ZaQNHe78707sLO1OKxJcEfRnNVAfWL1XbioeuZazc1Y= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 4f85099c47..a37e167216 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qqkorWeVyTOu3dNGAUmxef9HeHo0fxXNQzRRivqz9ps= +NodeupConfigHash: lGtyFdBbcwNhryEa/VdzoQUM/f8LCiCEC/U5J+ZZ2Vw= __EOF_KUBE_ENV From 60ae29c93c5569c54c27754b4152fbf8eef794f9 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 26 Jun 2021 13:03:58 -0700 Subject: [PATCH 3/7] Refactor EncryptionConfig --- nodeup/pkg/model/kube_apiserver.go | 32 +++++++++--------- pkg/apis/nodeup/config.go | 4 +++ upup/pkg/fi/cloudup/apply_cluster.go | 49 +++++++++++++++++----------- 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index 820fada9c8..710138d102 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -64,26 +64,24 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { return err } - if b.Cluster.Spec.EncryptionConfig != nil { - if *b.Cluster.Spec.EncryptionConfig { - encryptionConfigPath := fi.String(filepath.Join(b.PathSrvKubernetes(), "encryptionconfig.yaml")) + if b.NodeupConfig.APIServerConfig.EncryptionConfigSecretHash != "" { + encryptionConfigPath := fi.String(filepath.Join(b.PathSrvKubernetes(), "kube-apiserver", "encryptionconfig.yaml")) - kubeAPIServer.EncryptionProviderConfig = encryptionConfigPath + kubeAPIServer.EncryptionProviderConfig = encryptionConfigPath - key := "encryptionconfig" - encryptioncfg, err := b.SecretStore.Secret(key) - if err == nil { - contents := string(encryptioncfg.Data) - t := &nodetasks.File{ - Path: *encryptionConfigPath, - Contents: fi.NewStringResource(contents), - Mode: fi.String("600"), - Type: nodetasks.FileType_File, - } - c.AddTask(t) - } else { - return fmt.Errorf("encryptionConfig enabled, but could not load encryptionconfig secret: %v", err) + key := "encryptionconfig" + encryptioncfg, err := b.SecretStore.Secret(key) + if err == nil { + contents := string(encryptioncfg.Data) + t := &nodetasks.File{ + Path: *encryptionConfigPath, + Contents: fi.NewStringResource(contents), + Mode: fi.String("600"), + Type: nodetasks.FileType_File, } + c.AddTask(t) + } else { + return fmt.Errorf("encryptionConfig enabled, but could not load encryptionconfig secret: %v", err) } } { diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go index 7c81c6b123..a1ce893049 100644 --- a/pkg/apis/nodeup/config.go +++ b/pkg/apis/nodeup/config.go @@ -123,6 +123,10 @@ type StaticManifest struct { type APIServerConfig struct { // KubeAPIServer is a copy of the KubeAPIServerConfig from the cluster spec. KubeAPIServer *kops.KubeAPIServerConfig + // EncryptionConfigSecretHash is a hash of the encryptionconfig secret. + // It is empty if EncryptionConfig is not enabled. + // TODO: give secrets IDs and look them up like we do keypairs. + EncryptionConfigSecretHash string `json:",omitempty"` } func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Config, *BootConfig) { diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 0b50b88f31..a87ce7e29e 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -19,6 +19,8 @@ package cloudup import ( "bytes" "context" + "crypto/sha256" + "encoding/base64" "fmt" "io" "net" @@ -333,6 +335,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error { } } + encryptionConfigSecretHash := "" if fi.BoolValue(c.Cluster.Spec.EncryptionConfig) { secret, err := secretStore.FindSecret("encryptionconfig") if err != nil { @@ -344,6 +347,8 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error { fmt.Println("See `kops create secret encryptionconfig -h` and https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/") return fmt.Errorf("could not find encryptionconfig secret") } + hashBytes := sha256.Sum256(secret.Data) + encryptionConfigSecretHash = base64.URLEncoding.EncodeToString(hashBytes[:]) } ciliumSpec := c.Cluster.Spec.Networking.Cilium @@ -487,7 +492,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error { cloud: cloud, } - configBuilder, err := newNodeUpConfigBuilder(cluster, assetBuilder, c.Assets) + configBuilder, err := newNodeUpConfigBuilder(cluster, assetBuilder, c.Assets, encryptionConfigSecretHash) if err != nil { return err } @@ -1139,17 +1144,18 @@ type nodeUpConfigBuilder struct { // url with hash: @http://... or @https://... assets map[architectures.Architecture][]*mirrors.MirroredAsset - assetBuilder *assets.AssetBuilder - channels []string - configBase vfs.Path - cluster *kops.Cluster - etcdManifests map[kops.InstanceGroupRole][]string - images map[kops.InstanceGroupRole]map[architectures.Architecture][]*nodeup.Image - protokubeAsset map[architectures.Architecture][]*mirrors.MirroredAsset - channelsAsset map[architectures.Architecture][]*mirrors.MirroredAsset + assetBuilder *assets.AssetBuilder + channels []string + configBase vfs.Path + cluster *kops.Cluster + etcdManifests map[kops.InstanceGroupRole][]string + images map[kops.InstanceGroupRole]map[architectures.Architecture][]*nodeup.Image + protokubeAsset map[architectures.Architecture][]*mirrors.MirroredAsset + channelsAsset map[architectures.Architecture][]*mirrors.MirroredAsset + encryptionConfigSecretHash string } -func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBuilder, assets map[architectures.Architecture][]*mirrors.MirroredAsset) (model.NodeUpConfigBuilder, error) { +func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBuilder, assets map[architectures.Architecture][]*mirrors.MirroredAsset, encryptionConfigSecretHash string) (model.NodeUpConfigBuilder, error) { configBase, err := vfs.Context.BuildVfsPath(cluster.Spec.ConfigBase) if err != nil { return nil, fmt.Errorf("error parsing config base %q: %v", cluster.Spec.ConfigBase, err) @@ -1282,15 +1288,16 @@ func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBui } configBuilder := nodeUpConfigBuilder{ - assetBuilder: assetBuilder, - assets: assets, - channels: channels, - configBase: configBase, - cluster: cluster, - etcdManifests: etcdManifests, - images: images, - protokubeAsset: protokubeAsset, - channelsAsset: channelsAsset, + assetBuilder: assetBuilder, + assets: assets, + channels: channels, + configBase: configBase, + cluster: cluster, + etcdManifests: etcdManifests, + images: images, + protokubeAsset: protokubeAsset, + channelsAsset: channelsAsset, + encryptionConfigSecretHash: encryptionConfigSecretHash, } return &configBuilder, nil @@ -1344,6 +1351,10 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit } } + if isMaster || role == kops.InstanceGroupRoleAPIServer { + config.APIServerConfig.EncryptionConfigSecretHash = n.encryptionConfigSecretHash + } + if isMaster || useGossip { for _, arch := range architectures.GetSupported() { for _, a := range n.protokubeAsset[arch] { From 7e0c6acbad5263f95e3c88f9887e1f9eb420165c Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 26 Jun 2021 19:56:22 -0700 Subject: [PATCH 4/7] Take poorly formed keypair out of tests --- nodeup/pkg/model/kubelet_test.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go index 459e5ccfe4..f83da3c324 100644 --- a/nodeup/pkg/model/kubelet_test.go +++ b/nodeup/pkg/model/kubelet_test.go @@ -333,18 +333,13 @@ func simplePrivateKeyset(cert, key string) *kops.Keyset { func rotatingPrivateKeyset() *kops.Keyset { return &kops.Keyset{ Spec: kops.KeysetSpec{ - PrimaryId: "3", + PrimaryId: "2", Keys: []kops.KeysetItem{ { Id: "2", PrivateMaterial: []byte(previousKey), PublicMaterial: []byte(previousCertificate), }, - { - Id: "3", - PrivateMaterial: []byte(dummyKey), - PublicMaterial: []byte(dummyCertificate), - }, { Id: "4", PrivateMaterial: []byte(nextKey), From 20ca7082d7642b63e833b4779b937f39e2d56e2d Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 26 Jun 2021 20:00:35 -0700 Subject: [PATCH 5/7] hack/update-expected.sh --- .../golden/awsiam/tasks-kube-apiserver.yaml | 9 ------ .../tasks-kube-apiserver.yaml | 9 ------ .../golden/minimal/tasks-kube-apiserver.yaml | 9 ------ .../tasks-kube-controller-manager.yaml | 32 ++++--------------- .../tests/golden/minimal/tasks-secret.yaml | 32 ++++--------------- .../tasks-kube-apiserver-amd64.yaml | 9 ------ .../tasks-kube-apiserver-arm64.yaml | 9 ------ .../tasks-kube-controller-manager-amd64.yaml | 32 ++++--------------- .../tasks-kube-controller-manager-arm64.yaml | 32 ++++--------------- .../tasks-kube-apiserver.yaml | 9 ------ 10 files changed, 28 insertions(+), 154 deletions(-) diff --git a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml index fdf2cdc6bf..2b9793f03d 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml @@ -254,15 +254,6 @@ contents: | XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== -----END RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY----- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4JwpEprZ5n8RIEt6jT2l - Ah+UDgRgx/4px21gjgywQivYHVxHAZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMD - ZVt+McFnWVwexnqBYFNcVjkEmDgAgvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+Cp - OxyLhYZZNa0ZOZDHsSiJSQSj9WGFGHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m - 74kjK4dsBhmjeq/7OAoTmiG2QgJ/P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdG - kwwZz2eF77aSPGmi/A2CSKgMwDTx9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF - 6QIDAQAB - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== -----END RSA PUBLIC KEY----- diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml index daff77983b..e59d505716 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml @@ -194,15 +194,6 @@ contents: | XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== -----END RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY----- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4JwpEprZ5n8RIEt6jT2l - Ah+UDgRgx/4px21gjgywQivYHVxHAZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMD - ZVt+McFnWVwexnqBYFNcVjkEmDgAgvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+Cp - OxyLhYZZNa0ZOZDHsSiJSQSj9WGFGHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m - 74kjK4dsBhmjeq/7OAoTmiG2QgJ/P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdG - kwwZz2eF77aSPGmi/A2CSKgMwDTx9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF - 6QIDAQAB - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== -----END RSA PUBLIC KEY----- diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml index 442853faa9..b3c0e3c650 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml @@ -194,15 +194,6 @@ contents: | XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== -----END RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY----- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4JwpEprZ5n8RIEt6jT2l - Ah+UDgRgx/4px21gjgywQivYHVxHAZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMD - ZVt+McFnWVwexnqBYFNcVjkEmDgAgvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+Cp - OxyLhYZZNa0ZOZDHsSiJSQSj9WGFGHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m - 74kjK4dsBhmjeq/7OAoTmiG2QgJ/P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdG - kwwZz2eF77aSPGmi/A2CSKgMwDTx9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF - 6QIDAQAB - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== -----END RSA PUBLIC KEY----- diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml index 7267a89352..c9acd01ea3 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml @@ -202,31 +202,13 @@ type: file --- contents: | -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEA4JwpEprZ5n8RIEt6jT2lAh+UDgRgx/4px21gjgywQivYHVxH - AZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMDZVt+McFnWVwexnqBYFNcVjkEmDgA - gvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+CpOxyLhYZZNa0ZOZDHsSiJSQSj9WGF - GHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m74kjK4dsBhmjeq/7OAoTmiG2QgJ/ - P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdGkwwZz2eF77aSPGmi/A2CSKgMwDTx - 9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF6QIDAQABAoIBAA0ktjaTfyrAxsTI - Bezb7Zr5NBW55dvuII299cd6MJo+rI/TRYhvUv48kY8IFXp/hyUjzgeDLunxmIf9 - /Zgsoic9Ol44/g45mMduhcGYPzAAeCdcJ5OB9rR9VfDCXyjYLlN8H8iU0734tTqM - 0V13tQ9zdSqkGPZOIcq/kR/pylbOZaQMe97BTlsAnOMSMKDgnftY4122Lq3GYy+t - vpr+bKVaQZwvkLoSU3rECCaKaghgwCyX7jft9aEkhdJv+KlwbsGY6WErvxOaLWHd - cuMQjGapY1Fa/4UD00mvrA260NyKfzrp6+P46RrVMwEYRJMIQ8YBAk6N6Hh7dc0G - 8Z6i1m0CgYEA9HeCJR0TSwbIQ1bDXUrzpftHuidG5BnSBtax/ND9qIPhR/FBW5nj - 22nwLc48KkyirlfIULd0ae4qVXJn7wfYcuX/cJMLDmSVtlM5Dzmi/91xRiFgIzx1 - AsbBzaFjISP2HpSgL+e9FtSXaaqeZVrflitVhYKUpI/AKV31qGHf04sCgYEA6zTV - 99Sb49Wdlns5IgsfnXl6ToRttB18lfEKcVfjAM4frnkk06JpFAZeR+9GGKUXZHqs - z2qcplw4d/moCC6p3rYPBMLXsrGNEUFZqBlgz72QA6BBq3X0Cg1Bc2ZbK5VIzwkg - ST2SSux6ccROfgULmN5ZiLOtdUKNEZpFF3i3qtsCgYADT/s7dYFlatobz3kmMnXK - sfTu2MllHdRys0YGHu7Q8biDuQkhrJwhxPW0KS83g4JQym+0aEfzh36bWcl+u6R7 - KhKj+9oSf9pndgk345gJz35RbPJYh+EuAHNvzdgCAvK6x1jETWeKf6btj5pF1U1i - Q4QNIw/QiwIXjWZeubTGsQKBgQCbduLu2rLnlyyAaJZM8DlHZyH2gAXbBZpxqU8T - t9mtkJDUS/KRiEoYGFV9CqS0aXrayVMsDfXY6B/S/UuZjO5u7LtklDzqOf1aKG3Q - dGXPKibknqqJYH+bnUNjuYYNerETV57lijMGHuSYCf8vwLn3oxBfERRX61M/DU8Z - worz/QKBgQDCTJI2+jdXg26XuYUmM4XXfnocfzAXhXBULt1nENcogNf1fcptAVtu - BAiz4/HipQKqoWVUYmxfgbbLRKKLK0s0lOWKbYdVjhEm/m2ZU8wtXTagNwkIGoyq - Y/C1Lox4f1ROJnCjc/hfcOjcxX5M8A8peecHWlVtUPKTJgxQ7oMKcw== + MIIBPQIBAAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKmXVSysPKgE80QSU4tZ6m4 + 9pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQJBAKt/gmpHqP3qA3u8RA5R + 2W6L360Z2Mnza1FmkI/9StCCkJGjuE5yDhxU4JcVnFyX/nMxm2ockEEQDqRSu7Oo + xTECIQD2QsUsgFL4FnXWzTclySJ6ajE4Cte3gSDOIvyMNMireQIhAOEnsV8UaSI+ + ZyL7NMLzMPLCgtsrPnlamr8gdrEHf9ITAiEAxCCLbpTI/4LL2QZZrINTLVGT34Fr + Kl/yI5pjrrp/M2kCIQDfOktQyRuzJ8t5kzWsUxCkntS+FxHJn1rtQ3Jp8dV4oQIh + AOyiVWDyLZJvg7Y24Ycmp86BZjM9Wk/BfWpBXKnl9iDY -----END RSA PRIVATE KEY----- mode: "0600" path: /srv/kubernetes/kube-controller-manager/service-account.key diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml index 75b950842b..44e1ab1bb1 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-secret.yaml @@ -112,31 +112,13 @@ type: file --- contents: | -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEA4JwpEprZ5n8RIEt6jT2lAh+UDgRgx/4px21gjgywQivYHVxH - AZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMDZVt+McFnWVwexnqBYFNcVjkEmDgA - gvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+CpOxyLhYZZNa0ZOZDHsSiJSQSj9WGF - GHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m74kjK4dsBhmjeq/7OAoTmiG2QgJ/ - P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdGkwwZz2eF77aSPGmi/A2CSKgMwDTx - 9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF6QIDAQABAoIBAA0ktjaTfyrAxsTI - Bezb7Zr5NBW55dvuII299cd6MJo+rI/TRYhvUv48kY8IFXp/hyUjzgeDLunxmIf9 - /Zgsoic9Ol44/g45mMduhcGYPzAAeCdcJ5OB9rR9VfDCXyjYLlN8H8iU0734tTqM - 0V13tQ9zdSqkGPZOIcq/kR/pylbOZaQMe97BTlsAnOMSMKDgnftY4122Lq3GYy+t - vpr+bKVaQZwvkLoSU3rECCaKaghgwCyX7jft9aEkhdJv+KlwbsGY6WErvxOaLWHd - cuMQjGapY1Fa/4UD00mvrA260NyKfzrp6+P46RrVMwEYRJMIQ8YBAk6N6Hh7dc0G - 8Z6i1m0CgYEA9HeCJR0TSwbIQ1bDXUrzpftHuidG5BnSBtax/ND9qIPhR/FBW5nj - 22nwLc48KkyirlfIULd0ae4qVXJn7wfYcuX/cJMLDmSVtlM5Dzmi/91xRiFgIzx1 - AsbBzaFjISP2HpSgL+e9FtSXaaqeZVrflitVhYKUpI/AKV31qGHf04sCgYEA6zTV - 99Sb49Wdlns5IgsfnXl6ToRttB18lfEKcVfjAM4frnkk06JpFAZeR+9GGKUXZHqs - z2qcplw4d/moCC6p3rYPBMLXsrGNEUFZqBlgz72QA6BBq3X0Cg1Bc2ZbK5VIzwkg - ST2SSux6ccROfgULmN5ZiLOtdUKNEZpFF3i3qtsCgYADT/s7dYFlatobz3kmMnXK - sfTu2MllHdRys0YGHu7Q8biDuQkhrJwhxPW0KS83g4JQym+0aEfzh36bWcl+u6R7 - KhKj+9oSf9pndgk345gJz35RbPJYh+EuAHNvzdgCAvK6x1jETWeKf6btj5pF1U1i - Q4QNIw/QiwIXjWZeubTGsQKBgQCbduLu2rLnlyyAaJZM8DlHZyH2gAXbBZpxqU8T - t9mtkJDUS/KRiEoYGFV9CqS0aXrayVMsDfXY6B/S/UuZjO5u7LtklDzqOf1aKG3Q - dGXPKibknqqJYH+bnUNjuYYNerETV57lijMGHuSYCf8vwLn3oxBfERRX61M/DU8Z - worz/QKBgQDCTJI2+jdXg26XuYUmM4XXfnocfzAXhXBULt1nENcogNf1fcptAVtu - BAiz4/HipQKqoWVUYmxfgbbLRKKLK0s0lOWKbYdVjhEm/m2ZU8wtXTagNwkIGoyq - Y/C1Lox4f1ROJnCjc/hfcOjcxX5M8A8peecHWlVtUPKTJgxQ7oMKcw== + MIIBPQIBAAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKmXVSysPKgE80QSU4tZ6m4 + 9pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQJBAKt/gmpHqP3qA3u8RA5R + 2W6L360Z2Mnza1FmkI/9StCCkJGjuE5yDhxU4JcVnFyX/nMxm2ockEEQDqRSu7Oo + xTECIQD2QsUsgFL4FnXWzTclySJ6ajE4Cte3gSDOIvyMNMireQIhAOEnsV8UaSI+ + ZyL7NMLzMPLCgtsrPnlamr8gdrEHf9ITAiEAxCCLbpTI/4LL2QZZrINTLVGT34Fr + Kl/yI5pjrrp/M2kCIQDfOktQyRuzJ8t5kzWsUxCkntS+FxHJn1rtQ3Jp8dV4oQIh + AOyiVWDyLZJvg7Y24Ycmp86BZjM9Wk/BfWpBXKnl9iDY -----END RSA PRIVATE KEY----- mode: "0600" path: /srv/kubernetes/service-account.key diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml index 80c1c18e16..2620887395 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml @@ -194,15 +194,6 @@ contents: | XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== -----END RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY----- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4JwpEprZ5n8RIEt6jT2l - Ah+UDgRgx/4px21gjgywQivYHVxHAZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMD - ZVt+McFnWVwexnqBYFNcVjkEmDgAgvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+Cp - OxyLhYZZNa0ZOZDHsSiJSQSj9WGFGHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m - 74kjK4dsBhmjeq/7OAoTmiG2QgJ/P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdG - kwwZz2eF77aSPGmi/A2CSKgMwDTx9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF - 6QIDAQAB - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== -----END RSA PUBLIC KEY----- diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml index e0c1424da8..82061eccee 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml @@ -194,15 +194,6 @@ contents: | XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== -----END RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY----- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4JwpEprZ5n8RIEt6jT2l - Ah+UDgRgx/4px21gjgywQivYHVxHAZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMD - ZVt+McFnWVwexnqBYFNcVjkEmDgAgvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+Cp - OxyLhYZZNa0ZOZDHsSiJSQSj9WGFGHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m - 74kjK4dsBhmjeq/7OAoTmiG2QgJ/P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdG - kwwZz2eF77aSPGmi/A2CSKgMwDTx9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF - 6QIDAQAB - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== -----END RSA PUBLIC KEY----- diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml index 47eb8557c3..415b4ff05f 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml @@ -202,31 +202,13 @@ type: file --- contents: | -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEA4JwpEprZ5n8RIEt6jT2lAh+UDgRgx/4px21gjgywQivYHVxH - AZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMDZVt+McFnWVwexnqBYFNcVjkEmDgA - gvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+CpOxyLhYZZNa0ZOZDHsSiJSQSj9WGF - GHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m74kjK4dsBhmjeq/7OAoTmiG2QgJ/ - P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdGkwwZz2eF77aSPGmi/A2CSKgMwDTx - 9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF6QIDAQABAoIBAA0ktjaTfyrAxsTI - Bezb7Zr5NBW55dvuII299cd6MJo+rI/TRYhvUv48kY8IFXp/hyUjzgeDLunxmIf9 - /Zgsoic9Ol44/g45mMduhcGYPzAAeCdcJ5OB9rR9VfDCXyjYLlN8H8iU0734tTqM - 0V13tQ9zdSqkGPZOIcq/kR/pylbOZaQMe97BTlsAnOMSMKDgnftY4122Lq3GYy+t - vpr+bKVaQZwvkLoSU3rECCaKaghgwCyX7jft9aEkhdJv+KlwbsGY6WErvxOaLWHd - cuMQjGapY1Fa/4UD00mvrA260NyKfzrp6+P46RrVMwEYRJMIQ8YBAk6N6Hh7dc0G - 8Z6i1m0CgYEA9HeCJR0TSwbIQ1bDXUrzpftHuidG5BnSBtax/ND9qIPhR/FBW5nj - 22nwLc48KkyirlfIULd0ae4qVXJn7wfYcuX/cJMLDmSVtlM5Dzmi/91xRiFgIzx1 - AsbBzaFjISP2HpSgL+e9FtSXaaqeZVrflitVhYKUpI/AKV31qGHf04sCgYEA6zTV - 99Sb49Wdlns5IgsfnXl6ToRttB18lfEKcVfjAM4frnkk06JpFAZeR+9GGKUXZHqs - z2qcplw4d/moCC6p3rYPBMLXsrGNEUFZqBlgz72QA6BBq3X0Cg1Bc2ZbK5VIzwkg - ST2SSux6ccROfgULmN5ZiLOtdUKNEZpFF3i3qtsCgYADT/s7dYFlatobz3kmMnXK - sfTu2MllHdRys0YGHu7Q8biDuQkhrJwhxPW0KS83g4JQym+0aEfzh36bWcl+u6R7 - KhKj+9oSf9pndgk345gJz35RbPJYh+EuAHNvzdgCAvK6x1jETWeKf6btj5pF1U1i - Q4QNIw/QiwIXjWZeubTGsQKBgQCbduLu2rLnlyyAaJZM8DlHZyH2gAXbBZpxqU8T - t9mtkJDUS/KRiEoYGFV9CqS0aXrayVMsDfXY6B/S/UuZjO5u7LtklDzqOf1aKG3Q - dGXPKibknqqJYH+bnUNjuYYNerETV57lijMGHuSYCf8vwLn3oxBfERRX61M/DU8Z - worz/QKBgQDCTJI2+jdXg26XuYUmM4XXfnocfzAXhXBULt1nENcogNf1fcptAVtu - BAiz4/HipQKqoWVUYmxfgbbLRKKLK0s0lOWKbYdVjhEm/m2ZU8wtXTagNwkIGoyq - Y/C1Lox4f1ROJnCjc/hfcOjcxX5M8A8peecHWlVtUPKTJgxQ7oMKcw== + MIIBPQIBAAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKmXVSysPKgE80QSU4tZ6m4 + 9pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQJBAKt/gmpHqP3qA3u8RA5R + 2W6L360Z2Mnza1FmkI/9StCCkJGjuE5yDhxU4JcVnFyX/nMxm2ockEEQDqRSu7Oo + xTECIQD2QsUsgFL4FnXWzTclySJ6ajE4Cte3gSDOIvyMNMireQIhAOEnsV8UaSI+ + ZyL7NMLzMPLCgtsrPnlamr8gdrEHf9ITAiEAxCCLbpTI/4LL2QZZrINTLVGT34Fr + Kl/yI5pjrrp/M2kCIQDfOktQyRuzJ8t5kzWsUxCkntS+FxHJn1rtQ3Jp8dV4oQIh + AOyiVWDyLZJvg7Y24Ycmp86BZjM9Wk/BfWpBXKnl9iDY -----END RSA PRIVATE KEY----- mode: "0600" path: /srv/kubernetes/kube-controller-manager/service-account.key diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml index d77eb1f6b5..2c858f9c30 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml @@ -202,31 +202,13 @@ type: file --- contents: | -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEA4JwpEprZ5n8RIEt6jT2lAh+UDgRgx/4px21gjgywQivYHVxH - AZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMDZVt+McFnWVwexnqBYFNcVjkEmDgA - gvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+CpOxyLhYZZNa0ZOZDHsSiJSQSj9WGF - GHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m74kjK4dsBhmjeq/7OAoTmiG2QgJ/ - P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdGkwwZz2eF77aSPGmi/A2CSKgMwDTx - 9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF6QIDAQABAoIBAA0ktjaTfyrAxsTI - Bezb7Zr5NBW55dvuII299cd6MJo+rI/TRYhvUv48kY8IFXp/hyUjzgeDLunxmIf9 - /Zgsoic9Ol44/g45mMduhcGYPzAAeCdcJ5OB9rR9VfDCXyjYLlN8H8iU0734tTqM - 0V13tQ9zdSqkGPZOIcq/kR/pylbOZaQMe97BTlsAnOMSMKDgnftY4122Lq3GYy+t - vpr+bKVaQZwvkLoSU3rECCaKaghgwCyX7jft9aEkhdJv+KlwbsGY6WErvxOaLWHd - cuMQjGapY1Fa/4UD00mvrA260NyKfzrp6+P46RrVMwEYRJMIQ8YBAk6N6Hh7dc0G - 8Z6i1m0CgYEA9HeCJR0TSwbIQ1bDXUrzpftHuidG5BnSBtax/ND9qIPhR/FBW5nj - 22nwLc48KkyirlfIULd0ae4qVXJn7wfYcuX/cJMLDmSVtlM5Dzmi/91xRiFgIzx1 - AsbBzaFjISP2HpSgL+e9FtSXaaqeZVrflitVhYKUpI/AKV31qGHf04sCgYEA6zTV - 99Sb49Wdlns5IgsfnXl6ToRttB18lfEKcVfjAM4frnkk06JpFAZeR+9GGKUXZHqs - z2qcplw4d/moCC6p3rYPBMLXsrGNEUFZqBlgz72QA6BBq3X0Cg1Bc2ZbK5VIzwkg - ST2SSux6ccROfgULmN5ZiLOtdUKNEZpFF3i3qtsCgYADT/s7dYFlatobz3kmMnXK - sfTu2MllHdRys0YGHu7Q8biDuQkhrJwhxPW0KS83g4JQym+0aEfzh36bWcl+u6R7 - KhKj+9oSf9pndgk345gJz35RbPJYh+EuAHNvzdgCAvK6x1jETWeKf6btj5pF1U1i - Q4QNIw/QiwIXjWZeubTGsQKBgQCbduLu2rLnlyyAaJZM8DlHZyH2gAXbBZpxqU8T - t9mtkJDUS/KRiEoYGFV9CqS0aXrayVMsDfXY6B/S/UuZjO5u7LtklDzqOf1aKG3Q - dGXPKibknqqJYH+bnUNjuYYNerETV57lijMGHuSYCf8vwLn3oxBfERRX61M/DU8Z - worz/QKBgQDCTJI2+jdXg26XuYUmM4XXfnocfzAXhXBULt1nENcogNf1fcptAVtu - BAiz4/HipQKqoWVUYmxfgbbLRKKLK0s0lOWKbYdVjhEm/m2ZU8wtXTagNwkIGoyq - Y/C1Lox4f1ROJnCjc/hfcOjcxX5M8A8peecHWlVtUPKTJgxQ7oMKcw== + MIIBPQIBAAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKmXVSysPKgE80QSU4tZ6m4 + 9pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQJBAKt/gmpHqP3qA3u8RA5R + 2W6L360Z2Mnza1FmkI/9StCCkJGjuE5yDhxU4JcVnFyX/nMxm2ockEEQDqRSu7Oo + xTECIQD2QsUsgFL4FnXWzTclySJ6ajE4Cte3gSDOIvyMNMireQIhAOEnsV8UaSI+ + ZyL7NMLzMPLCgtsrPnlamr8gdrEHf9ITAiEAxCCLbpTI/4LL2QZZrINTLVGT34Fr + Kl/yI5pjrrp/M2kCIQDfOktQyRuzJ8t5kzWsUxCkntS+FxHJn1rtQ3Jp8dV4oQIh + AOyiVWDyLZJvg7Y24Ycmp86BZjM9Wk/BfWpBXKnl9iDY -----END RSA PRIVATE KEY----- mode: "0600" path: /srv/kubernetes/kube-controller-manager/service-account.key diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml index 6baff4de69..ba3632a81d 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml @@ -193,15 +193,6 @@ contents: | XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== -----END RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY----- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4JwpEprZ5n8RIEt6jT2l - Ah+UDgRgx/4px21gjgywQivYHVxHAZexVb/E9pBa9Q2G9B1Q7TCO7YsUVRQy4JMD - ZVt+McFnWVwexnqBYFNcVjkEmDgAgvCYGE0P9d/RwRL4KuLHo+u6fv7P0jXMN+Cp - OxyLhYZZNa0ZOZDHsSiJSQSj9WGFGHrbCf0KVDpKieR1uBqHrRO+mLR5zkX2L58m - 74kjK4dsBhmjeq/7OAoTmiG2QgJ/P2IjyhiA2mRqY+hl55lwEUV/0yHYEkJC8LdG - kwwZz2eF77aSPGmi/A2CSKgMwDTx9m+P7jcpWreYw6NG9BueGoDIve/tgFKwvVFF - 6QIDAQAB - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== -----END RSA PUBLIC KEY----- From e1df9f09dddabe3f1c4dfe99f4f28e8453f522b1 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 26 Jun 2021 18:44:46 -0700 Subject: [PATCH 6/7] Refactor service-account public keys --- cmd/kops/integration_test.go | 6 ++ cmd/kops/lifecycle_integration_test.go | 82 ++------------------ nodeup/pkg/model/kube_apiserver.go | 33 +++----- nodeup/pkg/model/kubelet_test.go | 40 +++++----- pkg/apis/nodeup/config.go | 2 + pkg/model/awsmodel/autoscalinggroup_test.go | 6 ++ pkg/model/bootstrapscript.go | 3 + pkg/model/bootstrapscript_test.go | 6 ++ pkg/model/openstackmodel/servergroup_test.go | 8 +- upup/pkg/fi/ca.go | 11 +-- upup/pkg/fi/cloudup/apply_cluster.go | 4 + 11 files changed, 77 insertions(+), 124 deletions(-) diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go index 4e05add0e8..694705f3df 100644 --- a/cmd/kops/integration_test.go +++ b/cmd/kops/integration_test.go @@ -616,6 +616,12 @@ func (i *integrationTest) setupCluster(t *testing.T, inputYAML string, ctx conte secondaryKey: "-----BEGIN RSA PRIVATE KEY-----\nMIIBOgIBAAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZFFtxc+8xir1XC3mI/RhCC\nrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQJAejInjmEzqmzQr0NxcIN4\nPukwK3FBKl+RAOZfqNIKcww14mfOn7Gc6lF2zEC4GnLiB3tthbSXoBGi54nkW4ki\nyQIhANZNne9UhQlwyjsd3WxDWWrl6OOZ3J8ppMOIQni9WRLlAiEAw1XEdxPOSOSO\nB6rucpTT1QivVvyEFIb/ukvPm769Mh8CIQDNQwKnHdlfNX0+KljPPaMD1LrAZbr/\naC+8aWLhqtsKUQIgF7gUcTkwdV17eabh6Xv09Qtm7zMefred2etWvFy+8JUCIECv\nFYOKQVWHX+Q7CHX2K1oTECVnZuW1UItdDYVlFYxQ\n-----END RSA PRIVATE KEY-----\n", secondaryCertificate: "-----BEGIN CERTIFICATE-----\nMIIBaDCCARKgAwIBAgIMFoq6PeyECsgUTfc2MA0GCSqGSIb3DQEBCwUAMBUxEzAR\nBgNVBAMTCmt1YmVybmV0ZXMwHhcNMjEwNjE5MjI0MzEwWhcNMzEwNjE5MjI0MzEw\nWjAVMRMwEQYDVQQDEwprdWJlcm5ldGVzMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB\nAKOE64nZbH+GM91AIrqf7HEk4hvzqsZFFtxc+8xir1XC3mI/RhCCrs6AdVRZNZ26\nA6uHArhi33c2kHQkCjyLA7sCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud\nEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIT28RJlG8FTgmvn2YMa3hYX+u1BMA0GCSqG\nSIb3DQEBCwUAA0EAKuaE5wKMP26AyfxkWu83iHoTPFtdjabXF0JcyPy0ijQZxfJq\n9xc2CkttvgaDtT4H+E/ryQ3iq6kSfEYYPi8c0w==\n-----END CERTIFICATE-----", }) + storeKeyset(t, keyStore, "service-account", &testingKeyset{ + primaryKey: "-----BEGIN RSA PRIVATE KEY-----\nMIIBPQIBAAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKmXVSysPKgE80QSU4tZ6m4\n9pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQJBAKt/gmpHqP3qA3u8RA5R\n2W6L360Z2Mnza1FmkI/9StCCkJGjuE5yDhxU4JcVnFyX/nMxm2ockEEQDqRSu7Oo\nxTECIQD2QsUsgFL4FnXWzTclySJ6ajE4Cte3gSDOIvyMNMireQIhAOEnsV8UaSI+\nZyL7NMLzMPLCgtsrPnlamr8gdrEHf9ITAiEAxCCLbpTI/4LL2QZZrINTLVGT34Fr\nKl/yI5pjrrp/M2kCIQDfOktQyRuzJ8t5kzWsUxCkntS+FxHJn1rtQ3Jp8dV4oQIh\nAOyiVWDyLZJvg7Y24Ycmp86BZjM9Wk/BfWpBXKnl9iDY\n-----END RSA PRIVATE KEY-----", + primaryCertificate: "-----BEGIN CERTIFICATE-----\nMIIBZzCCARGgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9zZXJ2\naWNlLWFjY291bnQwHhcNMjEwNTAyMjAzMDA2WhcNMzEwNTAyMjAzMDA2WjAaMRgw\nFgYDVQQDEw9zZXJ2aWNlLWFjY291bnQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA\n2JbeF8dNwqfEKKD65aGlVs58fWkA0qZdVLKw8qATzRBJTi1nqbj2kAR4gyy/C8Mx\nouxva/om9d7Sq8Ka55T7+wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T\nAQH/BAUwAwEB/zAdBgNVHQ4EFgQUI5beFHueAGyT1pQ6UTOdbMfj3gQwDQYJKoZI\nhvcNAQELBQADQQBwPLO+Np8o6k3aNBGKE4JTCOs06X72OXNivkWWWP/9XGz6x4DI\nHPU65kbUn/pWXBUVVlpsKsdmWA2Bu8pd/vD+\n-----END CERTIFICATE-----\n", + secondaryKey: "-----BEGIN RSA PRIVATE KEY-----\nMIIBOgIBAAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZFFtxc+8xir1XC3mI/RhCC\nrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQJAejInjmEzqmzQr0NxcIN4\nPukwK3FBKl+RAOZfqNIKcww14mfOn7Gc6lF2zEC4GnLiB3tthbSXoBGi54nkW4ki\nyQIhANZNne9UhQlwyjsd3WxDWWrl6OOZ3J8ppMOIQni9WRLlAiEAw1XEdxPOSOSO\nB6rucpTT1QivVvyEFIb/ukvPm769Mh8CIQDNQwKnHdlfNX0+KljPPaMD1LrAZbr/\naC+8aWLhqtsKUQIgF7gUcTkwdV17eabh6Xv09Qtm7zMefred2etWvFy+8JUCIECv\nFYOKQVWHX+Q7CHX2K1oTECVnZuW1UItdDYVlFYxQ\n-----END RSA PRIVATE KEY-----", + secondaryCertificate: "-----BEGIN CERTIFICATE-----\nMIIBZzCCARGgAwIBAgIBBDANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9zZXJ2\naWNlLWFjY291bnQwHhcNMjEwNTAyMjAzMjE3WhcNMzEwNTAyMjAzMjE3WjAaMRgw\nFgYDVQQDEw9zZXJ2aWNlLWFjY291bnQwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA\no4Tridlsf4Yz3UAiup/scSTiG/OqxkUW3Fz7zGKvVcLeYj9GEIKuzoB1VFk1nboD\nq4cCuGLfdzaQdCQKPIsDuwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T\nAQH/BAUwAwEB/zAdBgNVHQ4EFgQUhPbxEmUbwVOCa+fZgxreFhf67UEwDQYJKoZI\nhvcNAQELBQADQQALMsyK2Q7C/bk27eCvXyZKUfrLvor10hEjwGhv14zsKWDeTj/J\nA1LPYp7U9VtFfgFOkVbkLE9Rstc0ltNrPqxA\n-----END CERTIFICATE-----\n", + }) if i.ciliumEtcd { storeKeyset(t, keyStore, "etcd-clients-ca-cilium", &testingKeyset{ primaryKey: "-----BEGIN RSA PRIVATE KEY-----\nMIIBPQIBAAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKmXVSysPKgE80QSU4tZ6m4\n9pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQJBAKt/gmpHqP3qA3u8RA5R\n2W6L360Z2Mnza1FmkI/9StCCkJGjuE5yDhxU4JcVnFyX/nMxm2ockEEQDqRSu7Oo\nxTECIQD2QsUsgFL4FnXWzTclySJ6ajE4Cte3gSDOIvyMNMireQIhAOEnsV8UaSI+\nZyL7NMLzMPLCgtsrPnlamr8gdrEHf9ITAiEAxCCLbpTI/4LL2QZZrINTLVGT34Fr\nKl/yI5pjrrp/M2kCIQDfOktQyRuzJ8t5kzWsUxCkntS+FxHJn1rtQ3Jp8dV4oQIh\nAOyiVWDyLZJvg7Y24Ycmp86BZjM9Wk/BfWpBXKnl9iDY\n-----END RSA PRIVATE KEY-----", diff --git a/cmd/kops/lifecycle_integration_test.go b/cmd/kops/lifecycle_integration_test.go index 597ec255b6..6c73fa776c 100644 --- a/cmd/kops/lifecycle_integration_test.go +++ b/cmd/kops/lifecycle_integration_test.go @@ -195,34 +195,11 @@ func runLifecycleTest(h *testutils.IntegrationTestHarness, o *LifecycleTestOptio inputYAML := "in-" + o.Version + ".yaml" - factoryOptions := &util.FactoryOptions{} - factoryOptions.RegistryPath = "memfs://tests" - - factory := util.NewFactory(factoryOptions) - beforeResources := AllAWSResources(cloud) - { - options := &CreateOptions{} - options.Filenames = []string{path.Join(o.SrcDir, inputYAML)} + factory := newIntegrationTest(o.ClusterName, o.SrcDir). + setupCluster(t, inputYAML, ctx, stdout) - err := RunCreate(ctx, factory, &stdout, options) - if err != nil { - t.Fatalf("error running %q create: %v", inputYAML, err) - } - } - - { - options := &CreateSecretPublickeyOptions{} - options.ClusterName = o.ClusterName - options.Name = "admin" - options.PublicKeyPath = path.Join(o.SrcDir, "id_rsa.pub") - - err := RunCreateSecretPublicKey(ctx, factory, &stdout, options) - if err != nil { - t.Fatalf("error running %q create: %v", inputYAML, err) - } - } updateEnsureNoChanges(ctx, t, factory, o.ClusterName, stdout) // Overrides @@ -437,32 +414,8 @@ func runLifecycleTestOpenstack(o *LifecycleTestOptions) { inputYAML := "in-" + o.Version + ".yaml" - factoryOptions := &util.FactoryOptions{} - factoryOptions.RegistryPath = "memfs://tests" - - factory := util.NewFactory(factoryOptions) - - { - options := &CreateOptions{} - options.Filenames = []string{path.Join(o.SrcDir, inputYAML)} - - err := RunCreate(ctx, factory, &stdout, options) - if err != nil { - t.Fatalf("error running %q create: %v", inputYAML, err) - } - } - - { - options := &CreateSecretPublickeyOptions{} - options.ClusterName = o.ClusterName - options.Name = "admin" - options.PublicKeyPath = path.Join(o.SrcDir, "id_rsa.pub") - - err := RunCreateSecretPublicKey(ctx, factory, &stdout, options) - if err != nil { - t.Fatalf("error running %q create: %v", inputYAML, err) - } - } + factory := newIntegrationTest(o.ClusterName, o.SrcDir). + setupCluster(t, inputYAML, ctx, stdout) updateEnsureNoChanges(ctx, t, factory, o.ClusterName, stdout) @@ -515,31 +468,8 @@ func runLifecycleTestGCE(o *LifecycleTestOptions) { var stdout bytes.Buffer inputYAML := "in-" + o.Version + ".yaml" - factory := util.NewFactory(&util.FactoryOptions{ - RegistryPath: "memfs://tests", - }) - - { - options := &CreateOptions{} - options.Filenames = []string{path.Join(o.SrcDir, inputYAML)} - - err := RunCreate(ctx, factory, &stdout, options) - if err != nil { - t.Fatalf("error running %q create: %v", inputYAML, err) - } - } - - { - options := &CreateSecretPublickeyOptions{} - options.ClusterName = o.ClusterName - options.Name = "admin" - options.PublicKeyPath = path.Join(o.SrcDir, "id_rsa.pub") - - err := RunCreateSecretPublicKey(ctx, factory, &stdout, options) - if err != nil { - t.Fatalf("error running %q create: %v", inputYAML, err) - } - } + factory := newIntegrationTest(o.ClusterName, o.SrcDir). + setupCluster(t, inputYAML, ctx, stdout) updateEnsureNoChanges(ctx, t, factory, o.ClusterName, stdout) diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index 710138d102..985748284a 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -55,6 +55,8 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { return nil } + pathSrvKAPI := filepath.Join(b.PathSrvKubernetes(), "kube-apiserver") + var kubeAPIServer kops.KubeAPIServerConfig if b.NodeupConfig.APIServerConfig.KubeAPIServer != nil { kubeAPIServer = *b.NodeupConfig.APIServerConfig.KubeAPIServer @@ -65,7 +67,7 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { } if b.NodeupConfig.APIServerConfig.EncryptionConfigSecretHash != "" { - encryptionConfigPath := fi.String(filepath.Join(b.PathSrvKubernetes(), "kube-apiserver", "encryptionconfig.yaml")) + encryptionConfigPath := fi.String(filepath.Join(pathSrvKAPI, "encryptionconfig.yaml")) kubeAPIServer.EncryptionProviderConfig = encryptionConfigPath @@ -84,28 +86,15 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { return fmt.Errorf("encryptionConfig enabled, but could not load encryptionconfig secret: %v", err) } } - { - keyset, err := b.KeyStore.FindKeyset("service-account") - if err != nil { - return err - } - if keyset == nil { - return fmt.Errorf("service-account keyset not found") - } + kubeAPIServer.ServiceAccountKeyFile = append(kubeAPIServer.ServiceAccountKeyFile, filepath.Join(pathSrvKAPI, "service-account.pub")) + c.AddTask(&nodetasks.File{ + Path: filepath.Join(pathSrvKAPI, "service-account.pub"), + Contents: fi.NewStringResource(b.NodeupConfig.APIServerConfig.ServiceAccountPublicKeys), + Type: nodetasks.FileType_File, + Mode: s("0600"), + }) - buf, err := keyset.ToPublicKeyBytes() - if err != nil { - return err - } - - c.AddTask(&nodetasks.File{ - Path: filepath.Join(b.PathSrvKubernetes(), "service-account.pub"), - Contents: fi.NewBytesResource(buf), - Type: nodetasks.FileType_File, - Mode: s("0600"), - }) - } { pod, err := b.buildPod(&kubeAPIServer) if err != nil { @@ -306,8 +295,6 @@ func (b *KubeAPIServerBuilder) writeAuthenticationConfig(c *fi.ModelBuilderConte // buildPod is responsible for generating the kube-apiserver pod and thus manifest file func (b *KubeAPIServerBuilder) buildPod(kubeAPIServer *kops.KubeAPIServerConfig) (*v1.Pod, error) { - kubeAPIServer.ServiceAccountKeyFile = append(kubeAPIServer.ServiceAccountKeyFile, filepath.Join(b.PathSrvKubernetes(), "service-account.pub")) - // Set the signing key if we're using Service Account Token VolumeProjection if kubeAPIServer.ServiceAccountSigningKeyFile == nil { if fi.StringValue(kubeAPIServer.ServiceAccountIssuer) != "" { diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go index f83da3c324..c80531721c 100644 --- a/nodeup/pkg/model/kubelet_test.go +++ b/nodeup/pkg/model/kubelet_test.go @@ -287,9 +287,15 @@ func BuildNodeupModelContext(model *testutils.Model) (*NodeupModelContext, error return nil, fmt.Errorf("unexpected number of instance groups: found %d", len(model.InstanceGroups)) } + // Are we mocking out too much of the apply_cluster logic? nodeupModelContext.NodeupConfig.CAs["ca"] = dummyCertificate + nextCertificate nodeupModelContext.NodeupConfig.KeypairIDs["ca"] = "3" + if nodeupModelContext.NodeupConfig.APIServerConfig != nil { + saPublicKeys, _ := rotatingPrivateKeyset().ToPublicKeys() + nodeupModelContext.NodeupConfig.APIServerConfig.ServiceAccountPublicKeys = saPublicKeys + } + return nodeupModelContext, nil } @@ -330,24 +336,11 @@ func simplePrivateKeyset(cert, key string) *kops.Keyset { } } -func rotatingPrivateKeyset() *kops.Keyset { - return &kops.Keyset{ - Spec: kops.KeysetSpec{ - PrimaryId: "2", - Keys: []kops.KeysetItem{ - { - Id: "2", - PrivateMaterial: []byte(previousKey), - PublicMaterial: []byte(previousCertificate), - }, - { - Id: "4", - PrivateMaterial: []byte(nextKey), - PublicMaterial: []byte(nextCertificate), - }, - }, - }, - } +func rotatingPrivateKeyset() *fi.Keyset { + keyset, _ := fi.NewKeyset(mustParseCertificate(previousCertificate), mustParseKey(previousKey)) + _ = keyset.AddItem(mustParseCertificate(nextCertificate), mustParseKey(nextKey), false) + + return keyset } func mustParseCertificate(s string) *pki.Certificate { @@ -358,6 +351,14 @@ func mustParseCertificate(s string) *pki.Certificate { return k } +func mustParseKey(s string) *pki.PrivateKey { + k, err := pki.ParsePEMPrivateKey([]byte(s)) + if err != nil { + klog.Fatalf("error parsing private key %v", err) + } + return k +} + func RunGoldenTest(t *testing.T, basedir string, key string, builder func(*NodeupModelContext, *fi.ModelBuilderContext) error) { h := testutils.NewIntegrationTestHarness(t) defer h.Close() @@ -376,13 +377,14 @@ func RunGoldenTest(t *testing.T, basedir string, key string, builder func(*Nodeu keystore := &fakeCAStore{} keystore.T = t + saKeyset, _ := rotatingPrivateKeyset().ToAPIObject("service-account", true) keystore.privateKeysets = map[string]*kops.Keyset{ "ca": simplePrivateKeyset(dummyCertificate, dummyKey), "apiserver-aggregator-ca": simplePrivateKeyset(dummyCertificate, dummyKey), "kube-controller-manager": simplePrivateKeyset(dummyCertificate, dummyKey), "kube-proxy": simplePrivateKeyset(dummyCertificate, dummyKey), "kube-scheduler": simplePrivateKeyset(dummyCertificate, dummyKey), - "service-account": rotatingPrivateKeyset(), + "service-account": saKeyset, } keystore.certs = map[string]*pki.Certificate{ "ca": mustParseCertificate(dummyCertificate), diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go index a1ce893049..adbef6288c 100644 --- a/pkg/apis/nodeup/config.go +++ b/pkg/apis/nodeup/config.go @@ -127,6 +127,8 @@ type APIServerConfig struct { // It is empty if EncryptionConfig is not enabled. // TODO: give secrets IDs and look them up like we do keypairs. EncryptionConfigSecretHash string `json:",omitempty"` + // ServiceAccountPublicKeys are the service-account public keys to trust. + ServiceAccountPublicKeys string } func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Config, *BootConfig) { diff --git a/pkg/model/awsmodel/autoscalinggroup_test.go b/pkg/model/awsmodel/autoscalinggroup_test.go index b2eea736cc..83e268ec4d 100644 --- a/pkg/model/awsmodel/autoscalinggroup_test.go +++ b/pkg/model/awsmodel/autoscalinggroup_test.go @@ -180,6 +180,12 @@ func TestAPIServerAdditionalSecurityGroupsWithNLB(t *testing.T) { Type: "ca", } c.AddTask(caTask) + saTask := &fitasks.Keypair{ + Name: fi.String("service-account"), + Subject: "cn=service-account", + Type: "ca", + } + c.AddTask(saTask) b.Build(c) diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index cf238763d6..fa1a8f3026 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -218,6 +218,9 @@ func (b *BootstrapScriptBuilder) ResourceNodeUp(c *fi.ModelBuilderContext, ig *k keypairs = append(keypairs, "etcd-client-cilium") } } + if ig.HasAPIServer() { + keypairs = append(keypairs, "service-account") + } caTasks := map[string]*fitasks.Keypair{} for _, keypair := range keypairs { diff --git a/pkg/model/bootstrapscript_test.go b/pkg/model/bootstrapscript_test.go index f65a8d908f..18fd185122 100644 --- a/pkg/model/bootstrapscript_test.go +++ b/pkg/model/bootstrapscript_test.go @@ -139,6 +139,12 @@ func TestBootstrapUserData(t *testing.T) { Type: "ca", } c.AddTask(caTask) + saTask := &fitasks.Keypair{ + Name: fi.String("service-account"), + Subject: "cn=service-account", + Type: "ca", + } + c.AddTask(saTask) bs := &BootstrapScriptBuilder{ NodeUpConfigBuilder: &nodeupConfigBuilder{cluster: cluster}, diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go index bd34d32d66..f3ab2b7fae 100644 --- a/pkg/model/openstackmodel/servergroup_test.go +++ b/pkg/model/openstackmodel/servergroup_test.go @@ -1056,13 +1056,19 @@ func RunGoldenTest(t *testing.T, basedir string, testCase serverGroupModelBuilde LifecycleOverrides: map[string]fi.Lifecycle{}, } - // We need the CA for the bootstrap script + // We need the CA and service-account for the bootstrap script caTask := &fitasks.Keypair{ Name: fi.String(fi.CertificateIDCA), Subject: "cn=kubernetes", Type: "ca", } context.AddTask(caTask) + saTask := &fitasks.Keypair{ + Name: fi.String("service-account"), + Subject: "cn=service-account", + Type: "ca", + } + context.AddTask(saTask) if err := builder.Build(context); err != nil { t.Fatalf("error from Build: %v", err) diff --git a/upup/pkg/fi/ca.go b/upup/pkg/fi/ca.go index abd3dfd6e7..75bb6bcbd1 100644 --- a/upup/pkg/fi/ca.go +++ b/upup/pkg/fi/ca.go @@ -23,6 +23,7 @@ import ( "fmt" "math/big" "sort" + "strings" "time" "k8s.io/kops/pkg/apis/kops" @@ -160,7 +161,7 @@ func (k *Keyset) ToCertificateBytes() ([]byte, error) { return buf.Bytes(), nil } -func (k *Keyset) ToPublicKeyBytes() ([]byte, error) { +func (k *Keyset) ToPublicKeys() (string, error) { keys := make([]string, 0, len(k.Items)) for k := range k.Items { keys = append(keys, k) @@ -169,18 +170,18 @@ func (k *Keyset) ToPublicKeyBytes() ([]byte, error) { return KeysetItemIdOlder(k.Items[keys[i]].Id, k.Items[keys[j]].Id) }) - buf := new(bytes.Buffer) + buf := new(strings.Builder) for _, key := range keys { item := k.Items[key] publicKeyData, err := x509.MarshalPKIXPublicKey(item.Certificate.PublicKey) if err != nil { - return nil, fmt.Errorf("marshalling public key %s: %v", item.Id, err) + return "", fmt.Errorf("marshalling public key %s: %v", item.Id, err) } if err = pem.Encode(buf, &pem.Block{Type: "RSA PUBLIC KEY", Bytes: publicKeyData}); err != nil { - return nil, fmt.Errorf("encoding public key %s: %v", item.Id, err) + return "", fmt.Errorf("encoding public key %s: %v", item.Id, err) } } - return buf.Bytes(), nil + return buf.String(), nil } // NewKeyset creates a Keyset. diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index a87ce7e29e..50d20c52a9 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -1353,6 +1353,10 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit if isMaster || role == kops.InstanceGroupRoleAPIServer { config.APIServerConfig.EncryptionConfigSecretHash = n.encryptionConfigSecretHash + config.APIServerConfig.ServiceAccountPublicKeys, err = caTasks["service-account"].Keyset().ToPublicKeys() + if err != nil { + return nil, nil, fmt.Errorf("encoding service-account keys: %w", err) + } } if isMaster || useGossip { From 7dfe9d82ab75a957f581e94e6f5429cba09291c6 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 26 Jun 2021 19:50:54 -0700 Subject: [PATCH 7/7] hack/update-expected.sh --- .../golden/awsiam/tasks-kube-apiserver.yaml | 28 +++++++++---------- .../tasks-kube-apiserver.yaml | 28 +++++++++---------- .../golden/minimal/tasks-kube-apiserver.yaml | 28 +++++++++---------- .../tasks-kube-apiserver-amd64.yaml | 28 +++++++++---------- .../tasks-kube-apiserver-arm64.yaml | 28 +++++++++---------- .../tasks-kube-apiserver.yaml | 28 +++++++++---------- .../adds-additional-security-groups.yaml | 8 ++++++ .../adds-cloud-labels-from-ClusterSpec.yaml | 8 ++++++ ...s-cloud-labels-from-InstanceGroupSpec.yaml | 8 ++++++ ...erver-group-affinity-with-annotations.yaml | 8 ++++++ ...ithout-bastion-auto-zone-distribution.yaml | 8 ++++++ ...without-bastion-with-API-loadbalancer.yaml | 8 ++++++ ...tup-3-masters-3-nodes-without-bastion.yaml | 8 ++++++ ...sters-3-nodes-without-external-router.yaml | 8 ++++++ .../one-master-one-node-one-bastion-2.yaml | 8 ++++++ .../one-master-one-node-one-bastion.yaml | 8 ++++++ ...hout-bastion-no-public-ip-association.yaml | 8 ++++++ .../servergroup/one-master-one-node.yaml | 8 ++++++ ...subnet-as-availability-zones-fallback.yaml | 8 ++++++ ...nce-group-zones-as-availability-zones.yaml | 8 ++++++ pkg/model/tests/data/bootstrapscript_0.txt | 2 +- pkg/model/tests/data/bootstrapscript_1.txt | 2 +- pkg/model/tests/data/bootstrapscript_2.txt | 2 +- pkg/model/tests/data/nodeupconfig_0.txt | 1 + pkg/model/tests/data/nodeupconfig_1.txt | 1 + pkg/model/tests/data/nodeupconfig_2.txt | 1 + .../cloudformation.json.extracted.yaml | 4 +-- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...ters.bastionuserdata.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...t-1a.masters.complex.example.com_user_data | 2 +- ...-1a.masters.compress.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- .../cloudformation.json.extracted.yaml | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...masters.existing-iam.example.com_user_data | 2 +- ...masters.existing-iam.example.com_user_data | 2 +- ...masters.existing-iam.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...a.masters.existingsg.example.com_user_data | 2 +- ...b.masters.existingsg.example.com_user_data | 2 +- ...c.masters.existingsg.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...a.masters.externallb.example.com_user_data | 2 +- ...ers.externalpolicies.example.com_user_data | 2 +- ...s-test-1a.masters.ha.example.com_user_data | 2 +- ...s-test-1b.masters.ha.example.com_user_data | 2 +- ...s-test-1c.masters.ha.example.com_user_data | 2 +- ...ha-gce-example-com_metadata_startup-script | 2 +- ...ha-gce-example-com_metadata_startup-script | 2 +- ...ha-gce-example-com_metadata_startup-script | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...masters.minimal-ipv6.example.com_user_data | 2 +- ...masters.minimal-json.example.com_user_data | 2 +- ...ers.minimal-warmpool.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...al-gce-example-com_metadata_startup-script | 2 +- ...rivate-example-com_metadata_startup-script | 2 +- ...est-1a.masters.minimal.k8s.local_user_data | 2 +- .../cloudformation.json.extracted.yaml | 6 ++-- ...sters.mixedinstances.example.com_user_data | 2 +- ...sters.mixedinstances.example.com_user_data | 2 +- ...sters.mixedinstances.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 6 ++-- ...sters.mixedinstances.example.com_user_data | 2 +- ...sters.mixedinstances.example.com_user_data | 2 +- ...sters.mixedinstances.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...ters.nthsqsresources.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...rs.private-shared-ip.example.com_user_data | 2 +- ...rivate-shared-subnet.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...asters.privatecalico.example.com_user_data | 2 +- ...masters.privatecanal.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...asters.privatecilium.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...asters.privatecilium.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 2 +- ...rivateciliumadvanced.example.com_user_data | 2 +- ....masters.privatedns1.example.com_user_data | 2 +- ....masters.privatedns2.example.com_user_data | 2 +- ...sters.privateflannel.example.com_user_data | 2 +- ...asters.privatekopeio.example.com_user_data | 2 +- ...masters.privateweave.example.com_user_data | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- ...masters.sharedsubnet.example.com_user_data | 2 +- ...1a.masters.sharedvpc.example.com_user_data | 2 +- ...1a.masters.unmanaged.example.com_user_data | 2 +- ...t-1a.masters.minimal.example.com_user_data | 2 +- 97 files changed, 278 insertions(+), 163 deletions(-) diff --git a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml index 2b9793f03d..bcf6977fe0 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml @@ -62,7 +62,7 @@ contents: | - --requestheader-group-headers=X-Remote-Group - --requestheader-username-headers=X-Remote-User - --secure-port=443 - - --service-account-key-file=/srv/kubernetes/service-account.pub + - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub - --service-cluster-ip-range=100.64.0.0/13 - --storage-backend=etcd3 - --tls-cert-file=/srv/kubernetes/server.crt @@ -226,6 +226,19 @@ owner: aws-iam-authenticator path: /srv/kubernetes/aws-iam-authenticator/key.pem type: file --- +contents: | + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm + XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== + -----END RSA PUBLIC KEY----- + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF + Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== + -----END RSA PUBLIC KEY----- +mode: "0600" +path: /srv/kubernetes/kube-apiserver/service-account.pub +type: file +--- contents: task: Name: kubelet-api @@ -248,19 +261,6 @@ mode: "0600" path: /srv/kubernetes/kubelet-api.key type: file --- -contents: | - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm - XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF - Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== - -----END RSA PUBLIC KEY----- -mode: "0600" -path: /srv/kubernetes/service-account.pub -type: file ---- contents: "" ifNotExists: true mode: "0400" diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml index e59d505716..609270ab50 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml @@ -40,7 +40,7 @@ contents: | - --requestheader-group-headers=X-Remote-Group - --requestheader-username-headers=X-Remote-User - --secure-port=443 - - --service-account-key-file=/srv/kubernetes/service-account.pub + - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub - --service-cluster-ip-range=100.64.0.0/13 - --storage-backend=etcd3 - --tls-cert-file=/srv/kubernetes/server.crt @@ -166,6 +166,19 @@ mode: "0755" path: /srv/kubernetes type: directory --- +contents: | + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm + XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== + -----END RSA PUBLIC KEY----- + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF + Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== + -----END RSA PUBLIC KEY----- +mode: "0600" +path: /srv/kubernetes/kube-apiserver/service-account.pub +type: file +--- contents: task: Name: kubelet-api @@ -188,19 +201,6 @@ mode: "0600" path: /srv/kubernetes/kubelet-api.key type: file --- -contents: | - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm - XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF - Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== - -----END RSA PUBLIC KEY----- -mode: "0600" -path: /srv/kubernetes/service-account.pub -type: file ---- contents: "" ifNotExists: true mode: "0400" diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml index b3c0e3c650..0d02b61913 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml @@ -40,7 +40,7 @@ contents: | - --requestheader-group-headers=X-Remote-Group - --requestheader-username-headers=X-Remote-User - --secure-port=443 - - --service-account-key-file=/srv/kubernetes/service-account.pub + - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub - --service-cluster-ip-range=100.64.0.0/13 - --storage-backend=etcd3 - --tls-cert-file=/srv/kubernetes/server.crt @@ -166,6 +166,19 @@ mode: "0755" path: /srv/kubernetes type: directory --- +contents: | + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm + XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== + -----END RSA PUBLIC KEY----- + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF + Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== + -----END RSA PUBLIC KEY----- +mode: "0600" +path: /srv/kubernetes/kube-apiserver/service-account.pub +type: file +--- contents: task: Name: kubelet-api @@ -188,19 +201,6 @@ mode: "0600" path: /srv/kubernetes/kubelet-api.key type: file --- -contents: | - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm - XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF - Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== - -----END RSA PUBLIC KEY----- -mode: "0600" -path: /srv/kubernetes/service-account.pub -type: file ---- contents: "" ifNotExists: true mode: "0400" diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml index 2620887395..826b33c21f 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml @@ -40,7 +40,7 @@ contents: | - --requestheader-group-headers=X-Remote-Group - --requestheader-username-headers=X-Remote-User - --secure-port=443 - - --service-account-key-file=/srv/kubernetes/service-account.pub + - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub - --service-cluster-ip-range=100.64.0.0/13 - --storage-backend=etcd3 - --tls-cert-file=/srv/kubernetes/server.crt @@ -166,6 +166,19 @@ mode: "0755" path: /srv/kubernetes type: directory --- +contents: | + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm + XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== + -----END RSA PUBLIC KEY----- + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF + Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== + -----END RSA PUBLIC KEY----- +mode: "0600" +path: /srv/kubernetes/kube-apiserver/service-account.pub +type: file +--- contents: task: Name: kubelet-api @@ -188,19 +201,6 @@ mode: "0600" path: /srv/kubernetes/kubelet-api.key type: file --- -contents: | - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm - XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF - Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== - -----END RSA PUBLIC KEY----- -mode: "0600" -path: /srv/kubernetes/service-account.pub -type: file ---- contents: "" ifNotExists: true mode: "0400" diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml index 82061eccee..ca8393cd38 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml @@ -40,7 +40,7 @@ contents: | - --requestheader-group-headers=X-Remote-Group - --requestheader-username-headers=X-Remote-User - --secure-port=443 - - --service-account-key-file=/srv/kubernetes/service-account.pub + - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub - --service-cluster-ip-range=100.64.0.0/13 - --storage-backend=etcd3 - --tls-cert-file=/srv/kubernetes/server.crt @@ -166,6 +166,19 @@ mode: "0755" path: /srv/kubernetes type: directory --- +contents: | + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm + XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== + -----END RSA PUBLIC KEY----- + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF + Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== + -----END RSA PUBLIC KEY----- +mode: "0600" +path: /srv/kubernetes/kube-apiserver/service-account.pub +type: file +--- contents: task: Name: kubelet-api @@ -188,19 +201,6 @@ mode: "0600" path: /srv/kubernetes/kubelet-api.key type: file --- -contents: | - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm - XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF - Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== - -----END RSA PUBLIC KEY----- -mode: "0600" -path: /srv/kubernetes/service-account.pub -type: file ---- contents: "" ifNotExists: true mode: "0400" diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml index ba3632a81d..601fb49ee2 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml @@ -39,7 +39,7 @@ contents: | - --requestheader-group-headers=X-Remote-Group - --requestheader-username-headers=X-Remote-User - --secure-port=443 - - --service-account-key-file=/srv/kubernetes/service-account.pub + - --service-account-key-file=/srv/kubernetes/kube-apiserver/service-account.pub - --service-cluster-ip-range=100.64.0.0/13 - --storage-backend=etcd3 - --tls-cert-file=/srv/kubernetes/server.crt @@ -165,6 +165,19 @@ mode: "0755" path: /srv/kubernetes type: directory --- +contents: | + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm + XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== + -----END RSA PUBLIC KEY----- + -----BEGIN RSA PUBLIC KEY----- + MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF + Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== + -----END RSA PUBLIC KEY----- +mode: "0600" +path: /srv/kubernetes/kube-apiserver/service-account.pub +type: file +--- contents: task: Name: kubelet-api @@ -187,19 +200,6 @@ mode: "0600" path: /srv/kubernetes/kubelet-api.key type: file --- -contents: | - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANiW3hfHTcKnxCig+uWhpVbOfH1pANKm - XVSysPKgE80QSU4tZ6m49pAEeIMsvwvDMaLsb2v6JvXe0qvCmueU+/sCAwEAAQ== - -----END RSA PUBLIC KEY----- - -----BEGIN RSA PUBLIC KEY----- - MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKOE64nZbH+GM91AIrqf7HEk4hvzqsZF - Ftxc+8xir1XC3mI/RhCCrs6AdVRZNZ26A6uHArhi33c2kHQkCjyLA7sCAwEAAQ== - -----END RSA PUBLIC KEY----- -mode: "0600" -path: /srv/kubernetes/service-account.pub -type: file ---- contents: "" ifNotExists: true mode: "0400" diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml index d59a804445..5423f9ce84 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -78,6 +78,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml index e9d5bb43f6..469d1b0c1b 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml @@ -77,6 +77,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml index e9d5bb43f6..469d1b0c1b 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml @@ -77,6 +77,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml index 857747d2e4..4370e7e30b 100644 --- a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml @@ -76,6 +76,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml index 7bfbebb819..a4a268a310 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml @@ -519,6 +519,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml index 9d06ff83f9..cbb3cca1ec 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml @@ -494,6 +494,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- ID: null Lifecycle: Sync Name: master-public-name diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml index b5a0047660..19d4d10aa5 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml @@ -531,6 +531,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml index f866e9c065..95dbc1a132 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml @@ -453,6 +453,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml index 27576e02d7..970e530272 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml @@ -224,6 +224,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml index 1904c4752b..737479edcd 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml @@ -250,6 +250,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml index dd65c5a9fc..2119c56932 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml @@ -155,6 +155,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml index cae7469e92..e5d27938a3 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -181,6 +181,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml index 50dc23d9c9..06bbe04aa2 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml @@ -78,6 +78,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml index cfb53ac4f2..f3c07f478c 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml @@ -78,6 +78,14 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Lifecycle: "" +Name: service-account +Signer: null +alternateNames: null +oldFormat: false +subject: cn=service-account +type: ca +--- Base: null Contents: task: diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index 6eec64f3d4..5b426d700e 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Master -NodeupConfigHash: MzXsqZpAZ2tZ3xBPeZF8bbyK05tE4uj4oOA/vlWSja4= +NodeupConfigHash: L9npiRTZoJ1W2sV9djQigAKS/Bg1SHddDfAZQ6CQAA4= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 56a9f9679a..c20118eb04 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Master -NodeupConfigHash: 4MBH6eVy/oDjfHW7iSgG2E2V85fj3cPHstBk0O/LrgA= +NodeupConfigHash: vB51JBmy+BhFYBTDlPnoR0TB5D8VUdMQrHeNa5Lj1bU= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 56a9f9679a..c20118eb04 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -177,7 +177,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Master -NodeupConfigHash: 4MBH6eVy/oDjfHW7iSgG2E2V85fj3cPHstBk0O/LrgA= +NodeupConfigHash: vB51JBmy+BhFYBTDlPnoR0TB5D8VUdMQrHeNa5Lj1bU= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt index c6690886f7..ebed8d44bf 100644 --- a/pkg/model/tests/data/nodeupconfig_0.txt +++ b/pkg/model/tests/data/nodeupconfig_0.txt @@ -1,6 +1,7 @@ APIServerConfig: KubeAPIServer: image: CoreOS + ServiceAccountPublicKeys: "" CAs: {} FileAssets: - content: user,token diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt index 124df5a186..1d4744f890 100644 --- a/pkg/model/tests/data/nodeupconfig_1.txt +++ b/pkg/model/tests/data/nodeupconfig_1.txt @@ -1,6 +1,7 @@ APIServerConfig: KubeAPIServer: image: CoreOS + ServiceAccountPublicKeys: "" CAs: {} FileAssets: - content: blah blah diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt index 124df5a186..1d4744f890 100644 --- a/pkg/model/tests/data/nodeupconfig_2.txt +++ b/pkg/model/tests/data/nodeupconfig_2.txt @@ -1,6 +1,7 @@ APIServerConfig: KubeAPIServer: image: CoreOS + ServiceAccountPublicKeys: "" CAs: {} FileAssets: - content: blah blah diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index ddcc084b3b..71d22afb9d 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -163,7 +163,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer - NodeupConfigHash: ZrF2nkmCyprnUDONifcSLPDX0tkrryjPRpJwONi6lUs= + NodeupConfigHash: FKeaqZnI/dOLrVy8lPWdvS2WvXhUhczI7Iu6lDciQYw= __EOF_KUBE_ENV @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: U+9Aqc/eTytkCzRaERM+ywVrGNXGsseDBCXMn1VJGH8= + NodeupConfigHash: tTxzxFjI2kWmTVzywjnJCk1BKOWd28VXY3XooPHnF1k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index a37e167216..d15e122c41 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: lGtyFdBbcwNhryEa/VdzoQUM/f8LCiCEC/U5J+ZZ2Vw= +NodeupConfigHash: GUtetdFfK2ik1zoZhCYKpdtrKcOSnzVSscEuiY9+t0E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 2fbb400660..886eee9879 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: gAsokkTnxR+hVH3VhKusaRU7e5Y1At8KaXeaSkOvV/I= +NodeupConfigHash: 4SeJkVlFhQMg6cdt7qEb+eyViqJqhpK9V/TLPh8G95U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 7255b04652..63ae668da8 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -260,7 +260,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: CAtSatueaxrWwrMDwFh5dqFBdS0FHQ9BINFrI7j5c8U= + NodeupConfigHash: fvdBgmEKdJZzmDzC5GVq2f0w589jGIZScvvfokIl5HI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index a0c4548f92..5d18252641 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -259,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: CAtSatueaxrWwrMDwFh5dqFBdS0FHQ9BINFrI7j5c8U= +NodeupConfigHash: fvdBgmEKdJZzmDzC5GVq2f0w589jGIZScvvfokIl5HI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index 64c9caea9c..6ff15a56b8 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -133,7 +133,7 @@ ensure-install-dir echo "H4sIAAAAAAAA/+xWTXPbNhC961dgppPJJSbFxE1bTg5V5LRWY6WslI9eIWBFoQIBZgFQVn99ZwFSH47VTKfHdjxjW7uLxe7btw8S2gY5tWat6nLEGN+5N6+X0+XsBlUHSCbGwPCVBlmyNdcORow13PAalt4ir2GquXPgSuYxwEhY47kygItgvGqgZAeLPDolJda2voMOdMmUWdsRYx2gU9aUrMius5cjacU2leC2qp0Z57nW/TVgBO5br6zpa2cmaD0CL+RUB+cBHR2EDox3qYtD9hfZdVa8iG0o87hvG1YwqWZLwB4ErrXdVag6paEmKGIVjHFjzb6xwU2C3xwB4q2aBKnACIi3XzHKiAY8uMx1IpOw5kH7FJqumdpgfMkKsgW/saj+5NTg3Eoo2UTv+N5NqIwRYytl5ERKBOdKNs7iz4ixOMwKbackYEnDHA3Tm8hGOeqx0qFWpq/qHW/AtVzAnVqD2AsN0XynGuUX3NSA8TMVqARMhKAao6kixJwH4z9aHRq44yvQ0XOTWjtlx6n9vdWAsbElCGtkcs6D516Z+lDmJ1htrN1G50eulbzsfmclLMB5VILSRtsCnA0o4LdgPScQvJAJ5r7zjfetK/O8eP5dhK8or8fj4jzy1w4QlRxGmCc2ffPo0ecjxlTDayjZ9nuX1QIzZXOa+hVvlUtE6orseREnRQ4NvkJYAyIMw3y/b4fbZsYDGq5nVfx4a503vEnzeXN/4juuEdWA8DmA8xvgEjDSBWSccsrK6xqh5t7iw9g39x75bfyXqlL3w5HfrxbQWA9XMeLq4bmf0YY2nXt4ILoexn9wVHoDjx8hLy08iIBQWfQlu75+ES2nFJw5F4jhwyh4qzLVA5YJ27QEZgb3vGk1kOGLDL98erv8sJj9gxS5bcEomXdF/sdu644Ze8GZVXFjSlaMx9nLa6JGHmXGpU14zcUWjCwjw5LETK3xaLUGnEdFPUiN4B6I1tPZzcIdxcZ7LjY3QL8XtDxCaVjujagAlZUlK5qxuyQDIlVJGVOJP7xMJRZHJxGFBPtR/EQU2oAwpfQLGzyJ/qB4F7gvDh1eNX2LxyXQiXga4t4mJT6xHfo+Z3hwcK5HUwQJxiuuB6jo6grt/b78auNtWCR2Rh/1uek3bdj+kj39ke/c08tNtvGqk75O6qWApdiADDqN90IOd4j5d/j0wlJefptETWvZv+/M7Z2HRh7sC2t9yfKvsOjm3fKE58X4xGPjqzp8zIjL+vAK3cAq1LUy9S03UtP6Dz1Al9T7lqMsWQONxX3GO640nXtVjMdz9cxYCWt3Zn4yGBX9dT8hwKtvnzyLKH8ROljPYv9+5IRnYn7FCcW845hrtcp7oPNjwBdMNeB3Frfpxe13yyhyWDPn7nMA5GnHz0WD4GytnHOj1uB8fzF4kR+/ReRN73WjhhPSb/8f/H9t8PSy1vQlDHuFoX6Hef8FAAD//wEAAP//MYvDU9kLAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1TOUUvDMBQF4Pf8iryXrmwgmwEftuFsqbYiVNS3a3JrC0lvyE2q/nupe+rr4TuHc7aUzHOgeTQYlIRvFmea+vHrBIxKOnQ9q6LQNnHEwBv8AectbjS5QpPzAXkVimriCJPGh0DJN+CWEVi6eeI8Isd8C2v0QhaVfPpHoiGDyV8vlMCDknVb2+xwW3WX4z477s3HZfc5dm+uZJwft++n4f637W6yavd6uBN/AAAA//8BAAD//2VQaETPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1TOwU6GMBAE4Hufoi/AX7mQ2MSLGJEoiFw8b8oWMS1bui34+AY9cZ18M5naUZ6GSPsyYdQSDhY1rXaZH4FRS4/eslbKuMwJI9/wB3xweDPklSEfIvIlFO3KCVaDTaQcevDnCJzdInORkFNRwhWN5FDL7g+JnibM4f/CC/CXlmXz/e78XYw127bdbPWqCHJlt3k0H3tjP5/etuq574b740H8AgAA//8BAAD//3cHslLPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml index 559e5380f3..20aaf7bfdf 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -253,7 +253,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: RFRWeCrxsIBpecKChkCyG0rxpVjp6LxPHZX5UtCsm58= + NodeupConfigHash: Sq0I5pz2L+2D73CjmoeIB/9z1oUeLwslx87/2iK4eJo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index cd06c778b7..e91f9f8fdf 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: UWazbJsRi0FofksMBKFY2u7RglBuWM6/4LmRFsUZH7A= + NodeupConfigHash: uuHLQ7LEBXbqgo/6XZAPlzKeDK9RdXNals0+fxnVQRk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml index 69c9a9fa39..1d9af144e6 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -263,7 +263,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: js/DOzyNEfbR1/cJDZFjZARgU7awwly60yL7G4DxhGU= + NodeupConfigHash: IZcM9ZumsH5eSiiW8bXlbD1u+j7lZSDcjoB8A8HLvPk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index 1baaebe7ce..de7991f58e 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0= +NodeupConfigHash: ijOrtG5JsHgxXWvIz08I7kb04wa/op1xEDuM6oF4AWk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index 20b4b1f3ea..c89d18b667 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0= +NodeupConfigHash: ijOrtG5JsHgxXWvIz08I7kb04wa/op1xEDuM6oF4AWk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index 7ce6b59acb..a3a710e735 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: NxT/Kdq5mx8lW9W6qPz12YMO9732rGIJ0v43kjCUfJ0= +NodeupConfigHash: ijOrtG5JsHgxXWvIz08I7kb04wa/op1xEDuM6oF4AWk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index 5bda00a42a..6fa52e499e 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= + NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 3c8e54a4ff..e94c3c8fd6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA= +NodeupConfigHash: bBHYG3NWErmR1E2THGXxUYh+736/VPsJZbOAzkUaKDA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index ec272ffa1f..e9eb264a10 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA= +NodeupConfigHash: bBHYG3NWErmR1E2THGXxUYh+736/VPsJZbOAzkUaKDA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index e438f78dd8..5c28626494 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: Z9RAWqHE0WQP2Piw2gSwJ/Tw+CbhKfkDKabhnCpUfhA= +NodeupConfigHash: bBHYG3NWErmR1E2THGXxUYh+736/VPsJZbOAzkUaKDA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 093a5ce2d4..9e6bc2a648 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: AlFC8wy99SsvC1VbRgtiwOVsKJF64x2/o6QrMW8Hv/Q= + NodeupConfigHash: XjxRgkih3TUUmgjQjNJJ/8b2mCbIf8kXQ1qle6ZxIAc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index b284442f1f..26783c5c02 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: AlFC8wy99SsvC1VbRgtiwOVsKJF64x2/o6QrMW8Hv/Q= +NodeupConfigHash: XjxRgkih3TUUmgjQjNJJ/8b2mCbIf8kXQ1qle6ZxIAc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index 2d4db16a60..34abcf4b79 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -246,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: hopn1N2w/d1DC0i4oB1SEUAiZgA2Ios26BOJAbnMtY0= +NodeupConfigHash: DHNc4ru6B1/N/vyTrkKAdephpBwUM8dm7/cy5xk4D+w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index fe064df5bd..9c2c3987b6 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU= +NodeupConfigHash: P1aR3ZEi0agPY9otd70azdS2HHfkowgL1rlaYVacN4o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index 7330589b80..958674fdef 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU= +NodeupConfigHash: P1aR3ZEi0agPY9otd70azdS2HHfkowgL1rlaYVacN4o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index a3b1ee4d02..5a26d6507f 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: kI2NLcZwxqwYjPYJZrYPcxec9GvL8PhgG8rG1mIbtMU= +NodeupConfigHash: P1aR3ZEi0agPY9otd70azdS2HHfkowgL1rlaYVacN4o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index a02dd1b8bc..9e7c8b70db 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M= +NodeupConfigHash: MzIcPf5bm65emH0rC70EKM77eI6uG3GJhfrHgafhkT8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index 39bc5d462d..8bfbb58118 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: Master -NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M= +NodeupConfigHash: MzIcPf5bm65emH0rC70EKM77eI6uG3GJhfrHgafhkT8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index 916add986e..dcda4a2974 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: Master -NodeupConfigHash: OWt0Dvl4qnGyZvC9iC6aTf69x2H/BeJB0d/WFlCaa4M= +NodeupConfigHash: MzIcPf5bm65emH0rC70EKM77eI6uG3GJhfrHgafhkT8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 831fecc464..bbb991140c 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: rv6TrPQKtrMb/K0NDdArz7J9SL/cX9qmZ5L+smi3ipY= +NodeupConfigHash: hg3B2NPa/EF93K1qBzwPizWyXldYa+5ubf39Q5Uk6t4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 063281f2f8..410f8fd840 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -252,7 +252,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: PACgJGDzNeR50goziPahdsTOGbCfchODtRpGpnfB2D8= +NodeupConfigHash: ln7bIlLHHQFmg6Zb3FO2RKQma/CI1qtw17XgGc3o/qU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml index 9a62c9bd00..af4149f4ab 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -261,7 +261,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: l/xI57IEaF993tGMaoFVIaymP3M01cZxEI7Wr+GweAw= + NodeupConfigHash: GaR1NvHcan/TYk50u3CSMboThzKascwLmIiUYnHYl7o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml index 4b61dd937d..810805b283 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= + NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 1f5ca2691d..c62fe44c67 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -250,7 +250,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= +NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml index 4f0ab70897..ec5d3fcb2e 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: IjTy8kBQot33WJvAaerH9tKCW6xbPl+y2JZGvdtsD3k= + NodeupConfigHash: P/NyVuDBHbEjsjc2b4aB86Lvn7+F6HYawQcf+vu2H2I= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 1aea28c5b8..4fe63da234 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: IjTy8kBQot33WJvAaerH9tKCW6xbPl+y2JZGvdtsD3k= +NodeupConfigHash: P/NyVuDBHbEjsjc2b4aB86Lvn7+F6HYawQcf+vu2H2I= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data index 815c6e92f3..ebb06d701f 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-json.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: flLgsUDRbjCmUHf76HMfve2Nm8iNq/RCmAyl8X00F+U= +NodeupConfigHash: D1GfC6ZTtM+f7JEWvxvwmHduPUBCOniEksTcBYQ/Fy8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 764ed933c3..05a4ce6205 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -253,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: GPSqfzNFYOcMyOpXH/4i/0CcADXtCzn0B0okcxR31zg= +NodeupConfigHash: MYFIg34AcC89M1I2DI0sadoxyUy/sZYhV9CVZsJEv1o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 5bda00a42a..6fa52e499e 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= + NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 1b3512a2d7..78068b53a9 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: aEwCTgSZ/C/fu7LXNDQPC9Setro5FlcuggjpgGKiwVE= +NodeupConfigHash: 0z4orA8perAj0Tmz6tIi8Qxg5Xvx4WXpwlTUhbrAyQo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 14c8fb8288..69dc5a63d1 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: n3PWi1Op01/UaMsxGcSr+EUWnPtGVltFjrYQiM4JxiY= +NodeupConfigHash: RrcEnJWcbxqxB1TbUqhS49YsSaP3ea6hHPxr+tbHM3A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 04afe9bcf2..0e2acb7097 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: NGeDqbCK2rRtB9jRcoPuxPz7DVsJA2IZuP72YikfKOY= +NodeupConfigHash: zKoRWQXy4joQiuqKVTpTsUK2pAdlST7Jt1s8rstxamY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 9750f0b6e7..80b90b9ee9 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: RXfAaBCifiIl+YHXHi8o7+ALaEaqqiBoJaGXP2QnbKc= +NodeupConfigHash: d1E5kcA97aLLb6+f1czZUGjNbZfACSs2tedsNXh4/DI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index fff15cbe6c..82404880c6 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= + NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV @@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= + NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV @@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= + NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 4d36be6a34..03bca1730b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= +NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 3f30e523e2..318af3dfbc 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= +NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 6d9c21462e..611c90beb4 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= +NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index fff15cbe6c..82404880c6 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= + NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV @@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= + NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV @@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= + NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 4d36be6a34..03bca1730b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= +NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 3f30e523e2..318af3dfbc 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= +NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 6d9c21462e..611c90beb4 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: x4WObuxiS3UY/YxYtCV1WZmv+/U684fsftjgEZ+lSX8= +NodeupConfigHash: 7yzc5/wwIjTvmrhmU8K/wblITMq8aHduBXvaEQybbrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml index 65b114e9cb..1e6c011e1a 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: Dk1aAD6LyilDH5Y2d75Rb5+GkIlGz8dog5kNHOv8IQM= + NodeupConfigHash: JunA8N0Cr4NpTSOdG+99oNWhBV1JnN/h6nw5CFnhMTU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data index 52a33ca929..86c4eed3ef 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Dk1aAD6LyilDH5Y2d75Rb5+GkIlGz8dog5kNHOv8IQM= +NodeupConfigHash: JunA8N0Cr4NpTSOdG+99oNWhBV1JnN/h6nw5CFnhMTU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml index e3ee7bd839..cf956df5e2 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: D94uzEMmvqyZi+pnRvwwYXqNwWMLCC4jTeIqxGkqwCQ= + NodeupConfigHash: p/b3vD1+APIro3lpHZS933MMJfpurNX7TLow6zqhuis= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index b1726c482d..ce10d7e4fc 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: D94uzEMmvqyZi+pnRvwwYXqNwWMLCC4jTeIqxGkqwCQ= +NodeupConfigHash: p/b3vD1+APIro3lpHZS933MMJfpurNX7TLow6zqhuis= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index 706c44e014..2f16e4f2dc 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: M2RmIUPdS4QNZXpbcfpUTnmUpAKO700xyqkAK4ufkR4= +NodeupConfigHash: tqw10j8p35yO2Uj0JC7tR2ZgWqCYt8OEEm9pvwBGMng= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 7bb7c9a426..8d2d745e14 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: qFC+IuNZdaczWOal4TveEvxfptUfR2I5yxnkj1EySOY= + NodeupConfigHash: GRk8SK1PWlrP4xOfhiwVZw+/BhuYh2qaDgIJarrydWQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index 3f2838a651..8017f1f0b1 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qFC+IuNZdaczWOal4TveEvxfptUfR2I5yxnkj1EySOY= +NodeupConfigHash: GRk8SK1PWlrP4xOfhiwVZw+/BhuYh2qaDgIJarrydWQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index e27164e899..d9cdf23e34 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: c22OPNrkShxP1eWNimqV+aP5qPp4wo1LLT9OMTTdST0= +NodeupConfigHash: NbGfE0uRvjJES5vLncpaL0EKiaE/kW2cUWgIPtNfW8U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index e18514e1cd..3ab36cad02 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: Tw9bYLgB6YLLejylOQLmNpF1EuSK2LIUjv0lWym3mAo= + NodeupConfigHash: YayOD0Woh/ErwF9kHnc0K4QqJ5BLHrvhIO83mpOLXcg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 85f9da9ac0..0627edc9bc 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Tw9bYLgB6YLLejylOQLmNpF1EuSK2LIUjv0lWym3mAo= +NodeupConfigHash: YayOD0Woh/ErwF9kHnc0K4QqJ5BLHrvhIO83mpOLXcg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index da1643f5ce..6b35ed27df 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: znwb+ZgMChUtCkn8yFP9Zr0EukREtfZ+q2Qp0tuAohs= + NodeupConfigHash: HNd0g/LrG5x+dqeSF60Yr8OroENrgb4dBMJCHvyW2Nw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 63d836c86b..0c02139647 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -249,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: znwb+ZgMChUtCkn8yFP9Zr0EukREtfZ+q2Qp0tuAohs= +NodeupConfigHash: HNd0g/LrG5x+dqeSF60Yr8OroENrgb4dBMJCHvyW2Nw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index c66bf07526..1f1f7329d7 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -249,7 +249,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: pYq/8Yzhuk0H1T8z4ZJNM0E344Xeym7LxR6myrhYwB4= + NodeupConfigHash: pp7l8itnmWpr1UA+gD/iEhNlE/YdbeFhGe8C4XcqPWk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index 21d757886f..c1f85350e3 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -247,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: pYq/8Yzhuk0H1T8z4ZJNM0E344Xeym7LxR6myrhYwB4= +NodeupConfigHash: pp7l8itnmWpr1UA+gD/iEhNlE/YdbeFhGe8C4XcqPWk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 407b4e002e..5d22ceb020 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: avrRY1Li5dJl6Ak8bLy/8RR6ALBUdKxdR7ZxGe/vkBo= +NodeupConfigHash: YNIao1w1/Plkq0H/MPa415c9GbAJQ6VAU0JMHzQRnDc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index e20ed253be..506c532dc1 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ycTJyrGJ+JTIF0wuWPkksO53deGB3r8i328cFfwW0NE= +NodeupConfigHash: e0GeFulEbRktZoGZPM0P0P2EKqtMvfWVUpEENh8bOEc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index d58f051051..2a52d2a11d 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: +wKlmNU4hK+/BBb2Na/RdFrZbIDEAewWY8gFSxDQ3c8= +NodeupConfigHash: cd4WeAU+zD0yXWS/DMzuUc+EGv3zzxkcPXAShYnByls= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 1777508526..9ebb6510e4 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: u022yLElmlcCakyX+gEMqcAbpaNuL72bNwebu3m/pA4= +NodeupConfigHash: 0X8CrPxiDLo18M4mMOo9WlSuT6TFeljRNptvPKG5u58= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index 1c4d8f2580..7796cf2387 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: e26rBO+7Vl7eQjrQGdVtNdN2t2s5j/djMjFciIL6h94= +NodeupConfigHash: ewVIbSaZfYLqmziqck2XzZ1H4SL6Rzwz/Ouh25COjx4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index bdebd0c8cd..a82da5e0bd 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -255,7 +255,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: jBmt6+uYZs1qpzVq5VzRUS3jxBsi/8K6RatUARK94yM= +NodeupConfigHash: rivR2kusU0Xv4BjHDfzEOEwM0jFh2pWvOgBTRVknH+Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index 2c7880b04a..7bb3dc0c30 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: iJEQ9arhOSa/j3LE/ctKHja9dRoQclnqwgF2Lco5D/k= +NodeupConfigHash: pClweOjfZJ6M9Cw98uZ7S1BWzhVBcCUubg61A+dvy5g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index 8b5c5d316b..fa24d7bba3 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: VZeijGPu2v0SYh3YKhbVpkIaLD41hn3o4/3/kfN7/1U= +NodeupConfigHash: c4GTatkK+m64E8xkAC371CalFrXMF7N5ymIngYeApc0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index fe1dd5ab70..f7bc358715 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ZaQNHe78707sLO1OKxJcEfRnNVAfWL1XbioeuZazc1Y= +NodeupConfigHash: LIkEENWVd+eT2Mer5213Pz+QfcOAQmv5+adMgwJUveA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index a37e167216..d15e122c41 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: lGtyFdBbcwNhryEa/VdzoQUM/f8LCiCEC/U5J+ZZ2Vw= +NodeupConfigHash: GUtetdFfK2ik1zoZhCYKpdtrKcOSnzVSscEuiY9+t0E= __EOF_KUBE_ENV