diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml index 902c55efba..784eb6edd3 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml @@ -15,7 +15,6 @@ contents: | - /usr/local/bin/kube-proxy - --cluster-cidr=100.96.0.0/11 - --conntrack-max-per-core=131072 - - --hostname-override=@aws - --kubeconfig=/var/lib/kube-proxy/kubeconfig - --master=https://127.0.0.1 - --oom-score-adj=-998 diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-amd64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-amd64.yaml index b28f0b2e0d..ad005ea600 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-amd64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-amd64.yaml @@ -13,7 +13,6 @@ contents: | - args: - --cluster-cidr=100.96.0.0/11 - --conntrack-max-per-core=131072 - - --hostname-override=@aws - --kubeconfig=/var/lib/kube-proxy/kubeconfig - --master=https://127.0.0.1 - --oom-score-adj=-998 diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-arm64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-arm64.yaml index 1b84790e49..bc56d7b84f 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-arm64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-proxy-arm64.yaml @@ -13,7 +13,6 @@ contents: | - args: - --cluster-cidr=100.96.0.0/11 - --conntrack-max-per-core=131072 - - --hostname-override=@aws - --kubeconfig=/var/lib/kube-proxy/kubeconfig - --master=https://127.0.0.1 - --oom-score-adj=-998 diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml index 8689fd547a..fc4a4f19cb 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="--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.5 --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/in-tree-cloud.config --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 --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.5 --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/in-tree-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 2672943269..6f3bf6de0f 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 --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.5 --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/in-tree-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" + 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% --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.5 --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/in-tree-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/components/kubelet.go b/pkg/model/components/kubelet.go index 32faf0fa22..b9852fe124 100644 --- a/pkg/model/components/kubelet.go +++ b/pkg/model/components/kubelet.go @@ -21,6 +21,7 @@ import ( "strings" "k8s.io/klog/v2" + "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/loader" @@ -126,17 +127,10 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { klog.V(1).Infof("Cloud Provider: %s", cloudProvider) if cloudProvider == kops.CloudProviderAWS { clusterSpec.Kubelet.CloudProvider = "aws" - - // Use the hostname from the AWS metadata service - // if hostnameOverride is not set. - if clusterSpec.Kubelet.HostnameOverride == "" { - clusterSpec.Kubelet.HostnameOverride = "@aws" - } } if cloudProvider == kops.CloudProviderDO { clusterSpec.Kubelet.CloudProvider = "external" - clusterSpec.Kubelet.HostnameOverride = "@digitalocean" } if cloudProvider == kops.CloudProviderGCE { @@ -149,11 +143,6 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { clusterSpec.CloudConfig.Multizone = fi.Bool(true) clusterSpec.CloudConfig.NodeTags = fi.String(GCETagForRole(b.ClusterName, kops.InstanceGroupRoleNode)) - // Use the hostname from the GCE metadata service - // if hostnameOverride is not set. - if clusterSpec.Kubelet.HostnameOverride == "" { - clusterSpec.Kubelet.HostnameOverride = "@gce" - } } if cloudProvider == kops.CloudProviderOpenstack { @@ -162,16 +151,10 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { if cloudProvider == kops.CloudProviderALI { clusterSpec.Kubelet.CloudProvider = "alicloud" - clusterSpec.Kubelet.HostnameOverride = "@alicloud" } if cloudProvider == kops.CloudProviderAzure { clusterSpec.Kubelet.CloudProvider = "azure" - // We don't set hostname override in Azure since Azure hostnames are - // not always valid characters that can be used for pod names. - // More specifically, VMs created from VM Scale Sets contain '_' in their - // names, which is not a valid character in pod names. K8s API server will fail - // to start as its pod name contains a hostname as suffix (kube-apiserver-). } if clusterSpec.ExternalCloudControllerManager != nil { @@ -182,7 +165,6 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { networking := clusterSpec.Networking if networking == nil { return fmt.Errorf("no networking mode set") - } if UsesKubenet(networking) { clusterSpec.Kubelet.NetworkPluginName = "kubenet" diff --git a/pkg/model/components/kubeproxy.go b/pkg/model/components/kubeproxy.go index ae110748b6..43bc635cd0 100644 --- a/pkg/model/components/kubeproxy.go +++ b/pkg/model/components/kubeproxy.go @@ -18,6 +18,7 @@ package components import ( "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/loader" @@ -67,34 +68,6 @@ func (b *KubeProxyOptionsBuilder) BuildOptions(o interface{}) error { } } - // Set the kube-proxy hostname-override (actually the NodeName), to avoid #2915 et al - cloudProvider := kops.CloudProviderID(clusterSpec.CloudProvider) - if cloudProvider == kops.CloudProviderAWS { - // Use the hostname from the AWS metadata service - // if hostnameOverride is not set. - if config.HostnameOverride == "" { - config.HostnameOverride = "@aws" - } - } - - if cloudProvider == kops.CloudProviderDO { - if config.HostnameOverride == "" { - config.HostnameOverride = "@digitalocean" - } - } - - if cloudProvider == kops.CloudProviderALI { - if config.HostnameOverride == "" { - config.HostnameOverride = "@alicloud" - } - } - - if cloudProvider == kops.CloudProviderAzure { - if config.HostnameOverride == "" { - config.HostnameOverride = "@azure" - } - } - return nil } diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index ba66a5d735..d4b0ad0fba 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -137,7 +137,6 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -149,7 +148,6 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -163,7 +161,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer - NodeupConfigHash: csGbJpNLSgbfCyF1qss04FAzaX+mB0ekZCcECqvmwlE= + NodeupConfigHash: 6jMxCThXoYVW7vXQgpVcKvaE1EKNQRto1h8p6pFGc/I= __EOF_KUBE_ENV @@ -368,7 +366,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -385,7 +382,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -400,7 +396,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -415,7 +410,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: Bi3zwqdeHSTZHFXK5RQFdKNx6W3wc0Aha0ZFx7ugDWs= + NodeupConfigHash: rYy9c0uu3dAVcG5gyWvjmsia1v4d0ttO5HfiiFNfSDw= __EOF_KUBE_ENV @@ -560,7 +555,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -572,7 +566,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -586,7 +579,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= + NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __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 a30c69771a..b0b0eebd70 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: mRNx2d1ys4aKviHY7yRCTvfI0BcX3VQ/MJwoa+QaDoQ= +NodeupConfigHash: Z4IU80+07IRL4JdtasAA0cGjl3hQHN6rUgqsA2L/R+E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index 1944c2ff28..853009f820 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= +NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content index db10c3baaf..edbcebf7f2 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -121,7 +121,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -138,7 +137,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -157,7 +155,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 86b7f98adb..a66607232b 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6d95ccbc59..014862648a 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 b12c47e8cf..525fb5f127 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 3ji1nBS4aogmeEaD5IkZ1Fsj28JOtGvwsXCrLfCyuqI= +NodeupConfigHash: 7xUO7k1uQbBUaMlsM+NW5p1fMqdkidFPDimmdgeBl1w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index 57e8e31b7c..795f972cc6 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -145,7 +145,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -157,7 +156,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -171,7 +169,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: +vVWcTsf0ptTszB0sTo8BTvSwlYjyrNRYoZJs7R263U= +NodeupConfigHash: gYT2972YtkKGA5bw0vx9+9arxRQaDiJ4V9kFyAQs03M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content index 7cb414b319..e61f95ec0d 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content index c9705a4a7b..b90382b8b1 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content @@ -24,7 +24,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index e28653670d..ca2a0101d3 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content index d28b9949b0..b205f22ed7 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 6c318cbfbf..4b3af004d8 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -212,7 +212,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -229,7 +228,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +242,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -259,7 +256,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: B555I6UHCjDaE0IsuMy9GwGzFXA+LaW80jgXXYs1PoY= + NodeupConfigHash: DLpDrrH3h2Uy2+7dsECWpgBLoINeoU7fDp1uSjhJtMM= __EOF_KUBE_ENV @@ -424,7 +421,6 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -436,7 +432,6 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -450,7 +445,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: HqDhnUiEz686tkOlrTceIOdDoT5PTV8kkVWtcODt1+o= + NodeupConfigHash: fGTmBcbyKuWorJbX6eBkslcjYOq0PB5pxqJzrWuWxzE= __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 e0e606a080..58e2a8a00d 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 @@ -211,7 +211,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -228,7 +227,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +241,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -258,7 +255,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: B555I6UHCjDaE0IsuMy9GwGzFXA+LaW80jgXXYs1PoY= +NodeupConfigHash: DLpDrrH3h2Uy2+7dsECWpgBLoINeoU7fDp1uSjhJtMM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index 3090d652ed..061abdf167 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -145,7 +145,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -157,7 +156,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -171,7 +169,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: HqDhnUiEz686tkOlrTceIOdDoT5PTV8kkVWtcODt1+o= +NodeupConfigHash: fGTmBcbyKuWorJbX6eBkslcjYOq0PB5pxqJzrWuWxzE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content index ae94d4211f..7d4abeacb5 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -159,7 +158,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -178,7 +176,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 54dc0e1ce6..b7a1f10b7f 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -245,7 +245,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 78f2ae77a7..9666527039 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 736922d907..5cfae635ae 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 @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xWT5Pbtg+9+1Nw5jeZXGLJ2uwvbTU51LHTrps4de2k6ZUmYZk1RSogKa/76TsgJf/ZXTfT6bGdzGRXAAgCDw+PK7QNcmLNRlXlgDG+d2/frCar2RRVC0gmxsDwtQZZsg3XDgaM1dzwClbeIq9gorlz4ErmMcBAWOO5MoDLYLyqoWRHizw5JSXWtnoPLeiSKbOxA8ZaQKesKVmR3WbFzUBasUs1uJ1qZsZ5rnV3DxiBh8Yra7rimQlaD8ALOdHBeUBHB6EF411q45j+JaV/GftQ5mnfLqxhvJitADsUuNZ2v0DVKg0VYRGrYIwbaw61DW4c/PaEEG/UOEgFRkC8fcgoIxrw4DLXikzChgftU2i6ZmKD8SUryBb81qL6g1ODcyuhZGO95wc3pjIGjK2VkWMpEZwr2SiL/waMxWku0LZKApY0zUE/vrGslaMeFzpUynRVfeA1uIYLeK82IA5CQzS/V7XyS24qwPhNBSoBYyGoxmiapgbOSXBu/2g1YCx/BcIamZzz4LlXpjoW8xnWW2t30fkr10ped3+wEpbgPCpBaaNtCc4GFPBLsJ5Tq17IBGbX39b7xpV5Xtx8E0EqytvRqLiM/LkFRCX7QeWJM/978ujNgDFV8wpKtvvWZZXATNmcZjvkjXKJLm2R3RRxHuTQ4BcIG0CEfmQfD01/28x4QMP1bBE/76zzhtdpCm/vz3ynbaEaEL4EcH4LXAJGUoCMs0xZeVUhVNxbfBj79t4jv4u/UlXqvj/y23AJtfUwjBHDh+d+RBuadO7hgeh6GP/JUek1PH2EvLTWIALCwqIv2e3ty2g5J9rMuUA87kfBG5WpDrBM2LohMDO453WjgQyPMvz0+d3q03L2N1LktgGjZN4W+e/7nTtl7GRltoh7UbJiNMpe3RI18igmLm3CGy52YGQZGZaEZGKNR6s14DwK51FQBPdAtJ7Mpkt3khTvudhOgf5f0vIIpWF1MGIBqKwsWVGP3LVlF6lKyphK/O5VKrE4OYkopMtP4ieinAaECaVf2uBJ23tdu8J9cexwWHctnpZAJ+JpiHub9PbMduz7kuHBwaXqTBAkGK+47qGiqxdo7w/lVxtvwjKxM/qoz223af32l+z593zvnl9vsolXnfV1Vi8FrMQWZNBpvFdyuGPMP8OnE5by+gskKlrL7hln7uA81PJoX1rrS5Z/hUXTD6sznhejM4+Nb2f/mRGX9fGtmcI6VJUy1R03UtP69z1Am9T7jqMsWQ21xUPGW640nXtdjEZz9cJYCRt3YX7WGxX9dD8gwOv/P3sRUX4U2lsvYv965IRnYv6CE4p5yzHXap13QOengEdMNeD3FnfpXe12yyhyWDPn7ksA5GnHL0WD4GysnHOjNuB8dzF4kZ/+VsjrzusGNSek3/03+H/b4OllrRSh3SkM9dvP+08AAAD//wEAAP//kmdU7MALAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xVT28btxO961MQ+CG3aFdr+5e2i1wUya3VWK4qJU2vFDlaseKSmyG5tvrpiyF39ce2EBS9FYUB2zszHL6ZefMotA1yYs1GVeWAMf7obj+sJqvZFFULSCbGwPC1BlmyDdcOBozV3PAKVt4ir2CiuXPgSuYxwEBY47kygMtgvKqhZAeLPDolJda2uocWdMmU2dgBYy2gU9aUrMhusuJqIK3YJQxup5qZcZ5r3d0DRuC+8cqaDjwzQesBeCEnOjgP6OggtGC8S2Uc0l9T+utYhzKv+3ZhDePFbAXYdYFrbR8XqFqloaJeRBSMcWPNvrbBjYPfHjvEGzUOUoEREG8fMsqIBjy4zLUik7DhQfsUmq6Z2GB8yQqyBb+1qP7kVODcSijZWD/yvRsTjAFja2XkWEoE50o2yuLPgLE4zQXaVknAkqY56Mc3lrVyVONCh0qZDtUDr8E1XMC92oDYCw3RfK9q5ZfcVIDxmwAqAWMhCGM0TVMBpyQ4tX+yGjDCX4GwRibnPHjulakOYL7AemvtLjp/41rJy+4HK2EJzqMSlDbaluBsQAG/Bus5leqFTM3s6tt637gyz4ur72KTivJmNCrOI39pAVHJflB54sz/Xj16NWBM1byCku2+d1klMFM2p9kOeaNcoktbZFdFnAc5NPgFwgYQoR/Zp33T3zYzHtBwPVvEzzvrvOF1msLt04nvuC2EAeFrAOe3wCVgJAXIOMuUlVcVQsW9xeext08e+V38l1Cpp/7I78Ml1NbDMEYMn5/7CW1o0rnnB6LrefxnR9BreP0IeWmtQQSEhUVfspub62g5JdrMuUA87kfBG5WprmGZsHVDzczgideNBjK8yPDzl4+rz8vZ30iR2waMknlb5H887twxYycrs0Xci5IVo1H27oaokUcxcWkTPnCxAyPLyLAkJBNrPFqtAedROA+CIrgHovVkNl26o6R4z8V2CvR7ScsjlIbV3ogFoLKyZEU9cpeWXSSUlDFB/OFdglgcnUQU0uVX+yeinAaECaVf2uBJ23tdu8B9cahwWHclHpdAJ+JpiHub9PbEdqj7nOHBwbnqTBAkGK+47ltFVy/QPu3LbxbehGViZ/TVlytpYr4T8CegKGAltiCDTjO8kMMdYv5ZEzr1KC8/M6Ki3eveaub2zkMtD/altb5k+TeoMn1YnZC5GJ14bHwg+8+MCKsPD8oU1qGqlKnuuJGadryvAdok0XccZclqqC3uM95ypenc+2I0mqu3xkrYuDPzm96o6K/7EQHe///N29jlF6G99Sy2k9zE4QWnVuUtx1yrdd51Mz8GvOCcAf9ocZdeyG5LjCKHNXPuvgZAnrb1fP2pZ42Vc27UBpzvLgYv8uOrn9ed1w1qTu38+N90/5XTpYewUtTSTiuoqH6ofwEAAP//AQAA///de1UPbwsAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1TOwU7DMBAE0Lu/wj+QuggOlSUuLaKtRAKKoojr4mzAws4ar02cv0ehp1xHb0ZzcpSHt0i/dsCoJcwsTjSN9vMIjFp69CNrpYzLnDDyDgv44HBnyCtDPkTkTSiuEyeYDJ4j5dCAX0dg7VaZq4ScqjvYopYcaln/I9HQgDncLlyAv7Rc9paLeSnL9b5rX/fP5XxRH92hL+N8tEv9XtzcHuxP//Tw/Sj+AAAA//8BAAD///+TVvHPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1TOT0vEMBAF8Hs+Re6lG9c9LAa8WNxawVIritcxnf7BJBMySfXjS91Tr4/fe7zKUh66SOsyYNQSflhU5MdlegBGLR26kbVSxmZOGPmAv+CCxYMhpwy5EJF3oWg8J/AG60g5tOC2Edi6ZeYyIafyCHvUk0UtX/6RaGnAHK4XnoBnLY/V56lWr/NNX3z15JRtLuc3dSq+u/PzJbyr4taPH2tz99hO9+IPAAD//wEAAP//2xox+M8AAAA=" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index 88f155e381..970fc86b11 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/3yS0W7bPAyF7/0UvCl601+2g/7FJvRiW7KhAZYuSJ6AsRhXiEymouQsbz/YTZplA3Zl+Bzah/zIJkh2U+Gtb20BgAf9+mU9Xc9n0fcUBwmAGDeBnIUtBqUCoEPGltZJIrY0DahKaiHFTEUjnNAzxVXm5Duy8K64i+mGHwdpv1NPwYLnrRQAPUX1whZqc2/qSeGk2b31oDu/n7MmDOGUs8sbWkb5eRzsJmRNFKfz2cpCXVXm44OpTFXW9WDu84peM2kava4AeBFNjB396ClG78jC7Sc86G0B4DtsycLug5q2icZLOST9tx+j+tpMalNd9T4ZWwmURnwsfOwk6+ecXi68mjZK3p+Qgh41Uefe9ZVIslCOc0h2yyi9d0MhHvQy3Ox5/Tbbw72pTF395kiHnu351QRpMBTntc1ok9vWc/uE7ALF86IAqPdN8sJPGJ2FjjqJR4M9+jB891hX1cLfsTja6pV8cxb98NRvkejx/5u7kdxfpWf1qvbfKxh4NuNFLnGgWPYYy+A35Ql0eSn4YxMATOkgcbcMufX8jOP9sR8M4QXqa6aIji6HMsKsyhHnXtwC2W9J0ymYUjOGRaZEWnYnV4tfAAAA//8BAAD//1u51GY2AwAA" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/2SS327bPAzF7/0UvOldP9ku+hWb0Jst2dAASxEkT8BYjCZEJlP9cZa3H6QmzbJdGT6H4qF+1OAlm5nwzlndAOAxfvu6mW0W8+AmCkUCIMatJ6Nhhz5SAzAio6VNkoCWZh5jpKghhUzNIJzQMYV15uRG0vChmKtpSmMv9gdN5DU43kkDMFGITlhDrx5V/9AYGfbvM8S9Oyw4JvT+nLPPW1oF+XUq9uBzTBRmi/laQ9916vOT6lTX9n0xD3lNb5liqt7YALgRLWnYf4rKDkE5aUu7/w6139Srh151NwM+1DxPqTJi4dMoOX7J6ecVymCD5MOZG8RTTDSaD30tkjS0dVjJZhVkcqYU4jFebzB/3bxf4OlRdarv/nBkRMf68qu8DOiby27mtM3WOrYvyMZTuGwDgCY3JCf8gsFoGGmUcFI4ofPl3HPfdUt3z2JoF2/ku4voyjd+D0TP/9/dV3L/lF7Um9oGoEAb6ttaYUHVThha77btmWZ7LfgLNwBTOkrYr3y2jl+xviR2xRBeYnzLFNDQdeWVWNdWZgcxS2S3o5jOwZSGGhaYEsV2PLux+Q0AAP//AQAA//9kT9sbAAMAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1SNO26EMBQAe5/CJwAUKYpkKU0oAgKh/KCgc+xHANl+lh+OvXv61WormilmiqkNRv0R8H/TEASXiViNbtn+3iSB4BbsQqIslYl0QKACsrTeQKHQlgqtD0AnyVpHh3QK3gNGP0gLgjvUQOfwhQYEH1ADuyP6x7SRtAr+9JvHb191U9ybeCST1mm/pjz2+RJ+5pd+el4+527Nc9W+shsAAAD//wEAAP//KucQDMEAAAA=" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1SNMWuEMBhA9/yK7AWtUhACHapI6lBpK9U5Jp9VSPKl+UzP+/fHcZPLG94bXmMxmc+I/5uBKLi6EGvQL9tvrQgEd+AWEnmubaIdImVwKBcsZBpdrtGFCHSSrPO0K69BRkyhVw4E92iAzuEbLQjeowF2RwqP6buiVfBVFqMfbFeXI7RXVw7HLKcxzG9zu2BV/fxN3ddHIZ+et5dXdgMAAP//AQAA//+eWv3rwQAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content index 20bbee7e8d..c177c2a452 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 247cf3da63..849cf83f33 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content index cd06ea1f36..8c43796f3a 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 70023e405c..5ef87f94ab 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -205,7 +205,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -222,7 +221,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -237,7 +235,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -252,7 +249,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 4vo47eNSe01dc3RxahoGhdS/2XnUukVydc2YqiP7mtk= + NodeupConfigHash: WispMRRMt9r8at+5bKKPekFvI1E5kOZeuiILgag4aPg= __EOF_KUBE_ENV @@ -405,7 +402,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -417,7 +413,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -431,7 +426,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: Nkqz0R7A8wEqke/cdPQkaMNMmc6XS6JM9Z4jxZiUhdQ= + NodeupConfigHash: krsiCbdQZMYdurZxyRE/4Osu5QfM8hRVV4y/cdbyQrA= __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 aef8f9153f..4ae33eb889 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -197,7 +197,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -214,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +227,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +241,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: FlBXgNaArFbjvH0MXbWqPPbmNVd8144Nc2CLdVnOojw= + NodeupConfigHash: FA6VRuiT1rBLm39qACJIZ1/T2dn6CJSItW7J895yKu8= __EOF_KUBE_ENV @@ -389,7 +386,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -401,7 +397,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -415,7 +410,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: cL6FBQfZen0Zy8f1+22s4jf4DBzzhvq3wSbUuH2/IHg= + NodeupConfigHash: RxZT6XD6Ct6J0lTbFKtPD60d22NvqNpOiFFo3xZcxTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data index e26b5dcaa0..1189ce5616 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Nu/twRK/S/NV+WYjVsl7qA+EC5bGObWBdnNV3ZscgPY= +NodeupConfigHash: o1zSS+QxSQUcRSNV/uzPveNGK7fSB3KGUNh28ak05VE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data index 49987d5c39..98b2faf18f 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /XqNQCwTAsGPA457H3gue7DUaw92pxypjiENRiz6tU0= +NodeupConfigHash: eFmQW+OG5QjK8rQAKnN4lvjCOEq2TJKMLXZjXzzdYv0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content index b59ac91ea2..f532db01aa 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -138,7 +138,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubeScheduler: @@ -155,7 +154,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -174,7 +172,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 14822dfd45..578a5d955c 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 3cc630b939..6084b1b555 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 28b7163753..9bc93ff20c 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -213,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -230,7 +229,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -246,7 +244,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -262,7 +259,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: sWjOwigV1Op8L3/9Ua9YBkILaUUdJ7huisFgdb+xwGo= + NodeupConfigHash: 7ktp4JvhdO/O/XyNdFeUntUFeh7aRgRZtXccWjgjCVc= __EOF_KUBE_ENV @@ -423,7 +420,6 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -435,7 +431,6 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -450,7 +445,7 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: IUUmgKRx8/87kspoEHjZ9Q2XsW04SJhfvsctLdfPywA= + NodeupConfigHash: ZJav5qB5z1KCPNs5xEzwJNgIsfndzVeuPgIcku0dA6M= __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 004c1219d1..d7fd074d27 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: LLPSaZ7yQjVg0VFNYU9xbeyDt7qh+9NduadeyjaUew0= +NodeupConfigHash: zs3zc8B5yobSqVDr6l/71ZysNaUb9t0ICWt/RMIk3Nc= __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 75e474b610..c61cd1c0e5 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: LLPSaZ7yQjVg0VFNYU9xbeyDt7qh+9NduadeyjaUew0= +NodeupConfigHash: zs3zc8B5yobSqVDr6l/71ZysNaUb9t0ICWt/RMIk3Nc= __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 ed2354f170..53804eb80e 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: LLPSaZ7yQjVg0VFNYU9xbeyDt7qh+9NduadeyjaUew0= +NodeupConfigHash: zs3zc8B5yobSqVDr6l/71ZysNaUb9t0ICWt/RMIk3Nc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index e54bfc794e..746692176e 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 64JNwyLOJ9K8+oMKNwaC867rWRd9HljX5+2+nvRtxaU= +NodeupConfigHash: uKxTT/iNxVP2NfTmFattvcgYB+ZNz/1KVupBl8KExe8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content index 310fe4dbb0..a4469f57d4 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -124,7 +124,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -141,7 +140,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -160,7 +158,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 0067f8318c..613f8a6597 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 0067f8318c..613f8a6597 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 0067f8318c..613f8a6597 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6f27e86348..50a0d1ffe3 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 f44ade264b..48f3097682 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 @@ -197,7 +197,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -214,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +227,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +241,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= + NodeupConfigHash: LFwTDQ1M/AxVLdvKc8ZPsktDgr836JEsdQRwn2TU+iM= __EOF_KUBE_ENV @@ -389,7 +386,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -401,7 +397,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -415,7 +410,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= + NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __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 6fedec5f4f..d9dae273e0 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: mGHcQjjdpQvWRo+opMWRtdHNKUm/Gs26dDU/XkA/Iio= +NodeupConfigHash: rokSj73T20Ss5amwzqlEa+jMITqkC8JuEapGdK1mEpY= __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 00078e8ba3..56a09995a3 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: mGHcQjjdpQvWRo+opMWRtdHNKUm/Gs26dDU/XkA/Iio= +NodeupConfigHash: rokSj73T20Ss5amwzqlEa+jMITqkC8JuEapGdK1mEpY= __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 76672bc1df..c6342d3e34 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: mGHcQjjdpQvWRo+opMWRtdHNKUm/Gs26dDU/XkA/Iio= +NodeupConfigHash: rokSj73T20Ss5amwzqlEa+jMITqkC8JuEapGdK1mEpY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index fdca62bbd0..e0d7e54452 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Y6r7TcwG5dFQwHZ5V7ESid8cuKzXvaYR3gkI7AGE9dk= +NodeupConfigHash: mRgzQXch8YVtWqPMNAJsZe7Yl3rAV0mIcNUGvcnn8is= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content index 3730f2ede0..65142afe33 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -127,7 +127,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -144,7 +143,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -163,7 +161,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 923fa82173..4d8b818ed1 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 923fa82173..4d8b818ed1 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 923fa82173..4d8b818ed1 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 580028ff3d..e1956e93a8 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml index f44ade264b..48f3097682 100644 --- a/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml @@ -197,7 +197,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -214,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +227,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +241,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= + NodeupConfigHash: LFwTDQ1M/AxVLdvKc8ZPsktDgr836JEsdQRwn2TU+iM= __EOF_KUBE_ENV @@ -389,7 +386,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -401,7 +397,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -415,7 +410,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= + NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index f0570fac88..899013be00 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= +NodeupConfigHash: LFwTDQ1M/AxVLdvKc8ZPsktDgr836JEsdQRwn2TU+iM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data index 1944c2ff28..853009f820 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= +NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content index cc2ad277f2..1ae41d5ab3 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 5bf5fbcfd4..7d06ee5690 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6d95ccbc59..014862648a 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index a30c69771a..b0b0eebd70 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: mRNx2d1ys4aKviHY7yRCTvfI0BcX3VQ/MJwoa+QaDoQ= +NodeupConfigHash: Z4IU80+07IRL4JdtasAA0cGjl3hQHN6rUgqsA2L/R+E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 1944c2ff28..853009f820 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= +NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 7ccef32fe4..49516b229b 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -117,7 +117,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -134,7 +133,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -153,7 +151,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 86b7f98adb..a66607232b 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6d95ccbc59..014862648a 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index c0008b5acc..60ed0ce536 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -197,7 +197,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -214,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +227,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +241,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: f3DY46c9S34SlQUCLoLIIOAfN1HNaSqb5pvYu2TIhcA= + NodeupConfigHash: 0YKvAJOBUqEyrjJPFyis77iel3sVd85hIi7DGRJEsUY= __EOF_KUBE_ENV @@ -389,7 +386,6 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -401,7 +397,6 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -415,7 +410,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: MHi9NAsIuHM2xEIMETmwjHUKTsj94fcLDuyKPPLSiYI= + NodeupConfigHash: pVe1buipSaG6mldzw+6XvVfsFuVEd4fvnn6TRJhmMnc= __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 ae6b22fda1..284b1aa728 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: f3DY46c9S34SlQUCLoLIIOAfN1HNaSqb5pvYu2TIhcA= +NodeupConfigHash: 0YKvAJOBUqEyrjJPFyis77iel3sVd85hIi7DGRJEsUY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index 671b9ef891..705e9d1277 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: MHi9NAsIuHM2xEIMETmwjHUKTsj94fcLDuyKPPLSiYI= +NodeupConfigHash: pVe1buipSaG6mldzw+6XvVfsFuVEd4fvnn6TRJhmMnc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content index 0bd45c5e64..6a9c2f4e4a 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index e7674c88df..40395ba968 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content index d98f4096e5..b10a4ef03d 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 c8324b4c3a..7a9620e005 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 @@ -198,7 +198,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -215,7 +214,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -230,7 +228,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -245,7 +242,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: JBKy48m7b0wLCLpCzDcJu1n4J1wYCcyiIYUnWNgqYn0= +NodeupConfigHash: /Dd92eqJxZ1guTUrCtAGxgetNgEvjIimszNnLtGNIzY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index 75f497aec7..b30fb8ff55 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: illm8WGdSwct6x84JSe/8i1yuNLZNm2HpIAVYbeFPuw= +NodeupConfigHash: Aw3aGi9IDsosTJS+rw9Ij6CC1jQdoW7MDQq91ixRVLo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content index fb271bd217..0604eb6ab7 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -133,7 +133,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -150,7 +149,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -169,7 +167,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 597614edd2..e7741ad9e3 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -241,7 +241,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 37fd40df80..41a0ff6f75 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 5a49db4b92..b840f7904f 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: lMg7OJXkMgVJcncnaHKX2zo9BvLAJ793ZztMB2MYHZY= +NodeupConfigHash: 2s6Jz+Wvv8CX7pCj2jjSzVzkh0Idn10v26/c4v+Qo7U= __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 f93f3b573e..f2e3606986 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: lMg7OJXkMgVJcncnaHKX2zo9BvLAJ793ZztMB2MYHZY= +NodeupConfigHash: 2s6Jz+Wvv8CX7pCj2jjSzVzkh0Idn10v26/c4v+Qo7U= __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 da30aff793..f27f557dad 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: lMg7OJXkMgVJcncnaHKX2zo9BvLAJ793ZztMB2MYHZY= +NodeupConfigHash: 2s6Jz+Wvv8CX7pCj2jjSzVzkh0Idn10v26/c4v+Qo7U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data index 6b43fa5b3a..1cab3a9459 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Vm253bVe7Fr2SZJf/0LxdZ0+Gmz6OvB73hYKCJWQm0g= +NodeupConfigHash: cnGthbxRiDaueP2pCnvx9DgDbD4kdYQX9I3QTjzeloM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content index 2155febf89..1b406533fb 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -124,7 +124,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -141,7 +140,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -160,7 +158,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 49afe15b39..120b2e0ed6 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 49afe15b39..120b2e0ed6 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 49afe15b39..120b2e0ed6 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 296e2036ba..f92504701d 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 7289748b57..57af213e0a 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -141,7 +141,6 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +161,6 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index e263b36820..9112e08c33 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -242,7 +242,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content index e263b36820..9112e08c33 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content @@ -242,7 +242,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content index e263b36820..9112e08c33 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content @@ -242,7 +242,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 2a399dadf9..fc081a2edd 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -51,7 +51,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 de3da005dc..be3f072b62 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 @@ -213,7 +213,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +228,6 @@ masterKubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +242,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: 3xHxVjTR1JPfx7HidvZY07qpmK+14yCJzkA7H4IN60g= +NodeupConfigHash: ed1bwsN4PTJjUWdPgaSYtnSq5jPOvKqFr7xhGFt6uiU= __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 4ac10b8fee..e45fcafcdb 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 @@ -213,7 +213,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +228,6 @@ masterKubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +242,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: Master -NodeupConfigHash: 3xHxVjTR1JPfx7HidvZY07qpmK+14yCJzkA7H4IN60g= +NodeupConfigHash: ed1bwsN4PTJjUWdPgaSYtnSq5jPOvKqFr7xhGFt6uiU= __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 12149531e8..a8ebd79d8b 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 @@ -213,7 +213,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +228,6 @@ masterKubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +242,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: Master -NodeupConfigHash: 3xHxVjTR1JPfx7HidvZY07qpmK+14yCJzkA7H4IN60g= +NodeupConfigHash: ed1bwsN4PTJjUWdPgaSYtnSq5jPOvKqFr7xhGFt6uiU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index 331bdab6c0..ed3096aba2 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -148,7 +148,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +161,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2alOBS7Pj4OuQff17Cdt5hloOAtfW5HILgUQcjNmct0= +NodeupConfigHash: UMFCbiXxRyL9wSSjBOZxEMwnDZc6BiL2iZAai/UztX8= __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 93b3af3eaa..2984f83727 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 0cb2JIYaH0bFdk2wMMvfeCCxoTXYyzNRGURRgr22x/Y= +NodeupConfigHash: 5j0PM3fl8JmQYl3SjToSwxz4MquvWcLTKR6YD5/LRtQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index b41e4df891..6ff3d8f5cf 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: gPPnmTpenOgt2sWYr6NvrmgKPxM8bIoVLiFN0dc9m60= +NodeupConfigHash: 7cFgYwRiXRNuaB69UEFK6c7ZZzwHzInhDMV+K92l0FQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 31ce2ca419..f2f7300018 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -143,7 +143,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubeScheduler: @@ -160,7 +159,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -179,7 +177,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 34808b5045..217779a1e7 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content index f24ac35bd4..234ac27ff7 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 7e27bd7323..9728898cd0 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -198,7 +198,6 @@ kubeControllerManager: useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -218,7 +217,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -236,7 +234,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -251,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ZtYesr1MGsN4N4D6gbfb9fVoxDhpgB8BS9f/V9lbhCc= +NodeupConfigHash: tKW6N78YxNH4EF0bVU7JlIznFRYaZOHOllN3HIeh+1E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index bcf96b5304..2847b58769 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -151,7 +150,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -165,7 +163,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: g315MHUM2HSA/NYJkRgai/2btqhjj2NFWBY7Qp340II= +NodeupConfigHash: 0hGHAzPWba1DhBDQ/FnrkEGgBsI4GoB7f0p7IakO66s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 6097da5ca1..5edd1cdbc8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -142,7 +142,6 @@ spec: serverIP: 172.20.0.10 kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -162,7 +161,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -184,7 +182,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f4cdada881..479a6f74ee 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -243,7 +243,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 425b710085..fbca86694d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -50,7 +50,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5e69be0e32..ed70f99dfd 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -198,7 +198,6 @@ kubeControllerManager: useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -218,7 +217,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -236,7 +234,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -251,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: JgxiSJkfofRgmi2pfh5J42Kemei2TpqgO3swKU8e8mk= +NodeupConfigHash: xOA3ZKwWMAiK/lu8Mh8Y0BQ1fme0EOXtC7gqeSQGsyc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index bcf96b5304..2847b58769 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -151,7 +150,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -165,7 +163,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: g315MHUM2HSA/NYJkRgai/2btqhjj2NFWBY7Qp340II= +NodeupConfigHash: 0hGHAzPWba1DhBDQ/FnrkEGgBsI4GoB7f0p7IakO66s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content index ecb79c2ad7..8053d52461 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -141,7 +141,6 @@ spec: serverIP: 172.20.0.10 kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -161,7 +160,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -183,7 +181,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 29ec5000a0..78c58e6d00 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -243,7 +243,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 425b710085..fbca86694d 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -50,7 +50,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 2be7762aac..7074283596 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 @@ -198,7 +198,6 @@ kubeControllerManager: useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -218,7 +217,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -236,7 +234,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -251,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: TCyw8vTNFKphqWdXMRQRDZB5DJ0gYCAFqoxCT5pLmD8= +NodeupConfigHash: wpEoz3j5G30oWVdhXywuzSJiqeXydP8NgjG92+kmg7M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index 69e1dc7fae..0c519a93c9 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -151,7 +150,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -165,7 +163,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: sb4FhCuuGLZ2t7zvlMMrpDeMn5nOPdBPzuN4rnJUwTo= +NodeupConfigHash: JjfUEzjUEncUs6emC5FtAnvYrjCUpQSTn00kNW+MNV4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content index 3623e47af4..6d6791589c 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -134,7 +134,6 @@ spec: serverIP: 172.20.0.10 kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -154,7 +153,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -176,7 +174,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d604c28b57..e936033b8f 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -243,7 +243,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content index b09252391b..cf590426b6 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -50,7 +50,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 9316315170..eb0a81e2c1 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -204,7 +204,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.23.0-alpha.4 logLevel: 2 kubeScheduler: @@ -224,7 +223,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +241,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -259,7 +256,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: NtwcqG2MFz7FEA14A4sazfrEiJcbVWGJh7Dd1ndGOPQ= +NodeupConfigHash: +qTgp6upu3QVym0b5VWRc6YMj3+mvpjZPorODih8ZJM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data index d7e53050ba..ba22f5d94c 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -137,7 +137,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.23.0-alpha.4 logLevel: 2 kubelet: @@ -152,7 +151,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -167,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Lo0n0F0Gor0FIKAkcqmY5hAfOSxW4t/XqIG9DEfN39w= +NodeupConfigHash: 6hDLTpuxXYeQ2XLy3OfFaVzz5ZWJLq+zmp4Cq+I9H5o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content index 37cb883f9f..6dc202c6d6 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -127,7 +127,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.23.0-alpha.4 logLevel: 2 kubeScheduler: @@ -147,7 +146,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -171,7 +169,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 42e1aa5ac7..9fdb1c5c34 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -242,7 +242,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a6b2789e7a..d9b5ab3508 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -49,7 +49,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 eefa33acd8..4ea8b71b26 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -213,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -230,7 +229,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -245,7 +243,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -260,7 +257,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 7+mILLSMqIQgMetrcjjXSuoGf4NAX4HMI+aICn+j75g= + NodeupConfigHash: BK/W4QgIsZ+tCQF64h8VQQYHieZIzpZCYT5MOtJ88G8= __EOF_KUBE_ENV @@ -405,7 +402,6 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -417,7 +413,6 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -431,7 +426,7 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: eHxhM0uG2hBDcprCkR4Sdj3e7bAde7Xb0D+S/nU85+I= + NodeupConfigHash: DgtZQqUIWRLZkLigY23I8F5GAOvNhJmgPPz7qGG5Qcg= __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 5c7edf3b47..ad4ca3c344 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -203,7 +203,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -220,7 +219,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -235,7 +233,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -250,7 +247,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= + NodeupConfigHash: LFwTDQ1M/AxVLdvKc8ZPsktDgr836JEsdQRwn2TU+iM= __EOF_KUBE_ENV @@ -395,7 +392,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -407,7 +403,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -421,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= + NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __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 c9f401123a..ca8715b2a5 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 @@ -202,7 +202,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -219,7 +218,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -234,7 +232,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -249,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= +NodeupConfigHash: LFwTDQ1M/AxVLdvKc8ZPsktDgr836JEsdQRwn2TU+iM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index 1944c2ff28..853009f820 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= +NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content index 68a84985f3..747e8304da 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -122,7 +122,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -139,7 +138,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -158,7 +156,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 5bf5fbcfd4..7d06ee5690 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6d95ccbc59..014862648a 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml index 98c4f4238a..6588f5f37c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml @@ -204,7 +204,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -224,7 +223,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -242,7 +240,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -257,7 +254,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= + NodeupConfigHash: gFE2ROSgr3puWDmP+AmjbQobjhnMOPq7Hksy+JvykzY= __EOF_KUBE_ENV @@ -405,7 +402,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -420,7 +416,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -434,7 +429,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= + NodeupConfigHash: P7HT6cjeZm0wUct7l1FHVzicTajkXkhsK7bk0FhWEas= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 45f0450253..40dea057d6 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -203,7 +203,6 @@ kubeControllerManager: useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -223,7 +222,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -241,7 +239,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -256,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= +NodeupConfigHash: gFE2ROSgr3puWDmP+AmjbQobjhnMOPq7Hksy+JvykzY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 3f6c279855..871653a1ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,6 @@ docker: skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -154,7 +153,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -168,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= +NodeupConfigHash: P7HT6cjeZm0wUct7l1FHVzicTajkXkhsK7bk0FhWEas= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content index 4c76e820f9..54207bef94 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -133,7 +133,6 @@ spec: - fd00:ec2::253 kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -153,7 +152,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -176,7 +174,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d4b84654f7..e28f3cffee 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -242,7 +242,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 60d107e33d..075f9ca50c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -49,7 +49,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml index 98c4f4238a..6588f5f37c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml @@ -204,7 +204,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -224,7 +223,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -242,7 +240,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -257,7 +254,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= + NodeupConfigHash: gFE2ROSgr3puWDmP+AmjbQobjhnMOPq7Hksy+JvykzY= __EOF_KUBE_ENV @@ -405,7 +402,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -420,7 +416,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -434,7 +429,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= + NodeupConfigHash: P7HT6cjeZm0wUct7l1FHVzicTajkXkhsK7bk0FhWEas= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 45f0450253..40dea057d6 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -203,7 +203,6 @@ kubeControllerManager: useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -223,7 +222,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -241,7 +239,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -256,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= +NodeupConfigHash: gFE2ROSgr3puWDmP+AmjbQobjhnMOPq7Hksy+JvykzY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 3f6c279855..871653a1ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,6 @@ docker: skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -154,7 +153,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -168,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= +NodeupConfigHash: P7HT6cjeZm0wUct7l1FHVzicTajkXkhsK7bk0FhWEas= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content index fe8e6182a0..59ee8968b4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -133,7 +133,6 @@ spec: - fd00:ec2::253 kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -153,7 +152,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -176,7 +174,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d4b84654f7..e28f3cffee 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -242,7 +242,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 60d107e33d..075f9ca50c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -49,7 +49,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 45f0450253..40dea057d6 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -203,7 +203,6 @@ kubeControllerManager: useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -223,7 +222,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -241,7 +239,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -256,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= +NodeupConfigHash: gFE2ROSgr3puWDmP+AmjbQobjhnMOPq7Hksy+JvykzY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 3f6c279855..871653a1ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,6 @@ docker: skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -154,7 +153,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -168,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= +NodeupConfigHash: P7HT6cjeZm0wUct7l1FHVzicTajkXkhsK7bk0FhWEas= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content index 9b41e45d88..b33c35397b 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -133,7 +133,6 @@ spec: - fd00:ec2::253 kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -153,7 +152,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -176,7 +174,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d4b84654f7..e28f3cffee 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -242,7 +242,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 60d107e33d..075f9ca50c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -49,7 +49,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 98c4f4238a..6588f5f37c 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -204,7 +204,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -224,7 +223,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -242,7 +240,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -257,7 +254,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= + NodeupConfigHash: gFE2ROSgr3puWDmP+AmjbQobjhnMOPq7Hksy+JvykzY= __EOF_KUBE_ENV @@ -405,7 +402,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -420,7 +416,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -434,7 +429,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= + NodeupConfigHash: P7HT6cjeZm0wUct7l1FHVzicTajkXkhsK7bk0FhWEas= __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 45f0450253..40dea057d6 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 @@ -203,7 +203,6 @@ kubeControllerManager: useServiceAccountCredentials: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -223,7 +222,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -241,7 +239,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -256,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= +NodeupConfigHash: gFE2ROSgr3puWDmP+AmjbQobjhnMOPq7Hksy+JvykzY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 3f6c279855..871653a1ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,6 @@ docker: skipInstall: true kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -154,7 +153,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -168,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= +NodeupConfigHash: P7HT6cjeZm0wUct7l1FHVzicTajkXkhsK7bk0FhWEas= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content index 450e20a3d2..5ea7d0d7f6 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -133,7 +133,6 @@ spec: - fd00:ec2::253 kubeProxy: cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -153,7 +152,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -176,7 +174,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d4b84654f7..e28f3cffee 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -242,7 +242,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 60d107e33d..075f9ca50c 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -49,7 +49,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 bd6e030ac8..0f8174bd9f 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 @@ -199,7 +199,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -219,7 +218,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -237,7 +235,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -252,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: pDRSr6SMzK6tLxmcJOM7n0g2Kji8/350jRsx6uXYUII= +NodeupConfigHash: 6hmgpSTCchDvFoED0AP1McRpMDHI4otXQiC9HSOQVxU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index 36a73d7885..43a4393a3f 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -137,7 +137,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -152,7 +151,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -166,7 +164,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: wU2P6WK8Mck8YKPFHK/R99zUn/tBAvrSKr474aFtMrg= +NodeupConfigHash: Y6sTzUMtcxc1D27Zm7mQvM70/uKMrwEPcI89lVJwQsY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content index a425877d4d..041136d302 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -119,7 +119,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -139,7 +138,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -161,7 +159,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 81cd362543..55d2c48b9c 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -242,7 +242,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 7454a6546d..cb3f2ab2f8 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -50,7 +50,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index f44ade264b..48f3097682 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -197,7 +197,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -214,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +227,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +241,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= + NodeupConfigHash: LFwTDQ1M/AxVLdvKc8ZPsktDgr836JEsdQRwn2TU+iM= __EOF_KUBE_ENV @@ -389,7 +386,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -401,7 +397,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -415,7 +410,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= + NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __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 f0570fac88..899013be00 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= +NodeupConfigHash: LFwTDQ1M/AxVLdvKc8ZPsktDgr836JEsdQRwn2TU+iM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index 1944c2ff28..853009f820 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= +NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content index f379c09add..1a9f915826 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 5bf5fbcfd4..7d06ee5690 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6d95ccbc59..014862648a 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 68912adffb..1964f387ad 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -133,7 +133,6 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -153,7 +152,6 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index aa47a27905..a71f5bec23 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -242,7 +242,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 32c25f3a57..51ba7dd2bf 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -51,7 +51,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 c1846fdcc5..39e0ec3a91 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 @@ -213,7 +213,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +228,6 @@ masterKubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +242,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: RaPC1jXNeS2wf1C+minDmw6vyuKu8d1u0XXgnH2tTwI= +NodeupConfigHash: +dyh5FBTV+sE2YrzbyPzlja2f5MlClfsugeZKze1A7g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 3aae332dda..9339de7df9 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -148,7 +148,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +161,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: IM+wGeyjCq+8zwIapi3qUstAB/39X2jPj40PKuBlMeI= +NodeupConfigHash: a3hjTPENiLt+qcgsgtf1j1jAxwr57xQZr7YEYd/fYIk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content index 83e79ebadb..04372a4953 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -133,7 +133,6 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -153,7 +152,6 @@ spec: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index 21c91a4567..d4f5159ba3 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -242,7 +242,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content index aa84eb1c62..42a58620ec 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -51,7 +51,6 @@ KubeletConfig: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 5d916b1bf0..64259363ad 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 @@ -213,7 +213,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +228,6 @@ masterKubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +242,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: geQXVMBDkdwG8xUA/TEjv4tzs1qNGac3cYZWbTw5lN4= +NodeupConfigHash: 0G4WG7MX1YqHUvq9hrrk+ZWA+znNguO+VUByvXPFrM8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index f014d46d16..1e8e53d3bd 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -148,7 +148,6 @@ kubelet: enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% hairpinMode: promiscuous-bridge - hostnameOverride: '@gce' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +161,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: InFMqIsDiXLR7os8eQnCmWGP1NLPGB1QqFxJLBsiiYU= +NodeupConfigHash: tQRIPDAkcbZbWLCjXTKr9UMgFRAes7kibePgDOZbez4= __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 e06b25f52d..017d0e3924 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: LEvKeSsUPlTwvxrLsM9R/WHEgra5CXKQNJO9cDmZ/0I= +NodeupConfigHash: layXeHSb+OO4klYrGftQF+XS0Pd2C8AV3ZBjHQiQ1cA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data index 246b50530c..aebafc60ff 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A+FBEJzA1as/oasnEykHdc48XRZg9JwEC6nEeZF42mE= +NodeupConfigHash: 4LOPEdywWR1cdgEjwHIalJ6OvmnDxKLHeT/7//hOjNg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content index 7724d728c7..eaafee4328 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -115,7 +115,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -132,7 +131,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -151,7 +149,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 7806eea6e4..d744b542c3 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content index e28e86a763..3655d6c5fe 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -50,7 +50,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 492e60f14d..2fe429d8b5 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -197,7 +197,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -214,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +227,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +241,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= + NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV @@ -449,7 +446,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -466,7 +462,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -481,7 +476,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -496,7 +490,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= + NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV @@ -701,7 +695,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -718,7 +711,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -733,7 +725,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -748,7 +739,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= + NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV @@ -893,7 +884,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -905,7 +895,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -919,7 +908,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= + NodeupConfigHash: /PNqCHniAxKifdnit2OBPsTpWdwOJXNjg2z2x4aasAI= __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 11caf3a9ea..05bfc72b8f 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= +NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __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 5837d087c4..08546f51ae 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= +NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __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 f20ba66881..397b1359db 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= +NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 9dca10ddc3..46e4558d16 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= +NodeupConfigHash: /PNqCHniAxKifdnit2OBPsTpWdwOJXNjg2z2x4aasAI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content index 18fd1e011b..d91f9619bd 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -124,7 +124,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -141,7 +140,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -160,7 +158,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d8574920d0..2c9bc31a47 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index d8574920d0..2c9bc31a47 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index d8574920d0..2c9bc31a47 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content index d85c3cf3cf..40a5db689b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 492e60f14d..2fe429d8b5 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 @@ -197,7 +197,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -214,7 +213,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -229,7 +227,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -244,7 +241,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= + NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV @@ -449,7 +446,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -466,7 +462,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -481,7 +476,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -496,7 +490,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= + NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV @@ -701,7 +695,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -718,7 +711,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -733,7 +725,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -748,7 +739,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= + NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV @@ -893,7 +884,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -905,7 +895,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -919,7 +908,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= + NodeupConfigHash: /PNqCHniAxKifdnit2OBPsTpWdwOJXNjg2z2x4aasAI= __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 11caf3a9ea..05bfc72b8f 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= +NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __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 5837d087c4..08546f51ae 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= +NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __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 f20ba66881..397b1359db 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= +NodeupConfigHash: l822vFY+FeTBb5ySCka0AtEtVpt55+OD62TeSq+mT1A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 9dca10ddc3..46e4558d16 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= +NodeupConfigHash: /PNqCHniAxKifdnit2OBPsTpWdwOJXNjg2z2x4aasAI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content index 18fd1e011b..d91f9619bd 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -124,7 +124,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -141,7 +140,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -160,7 +158,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index d8574920d0..2c9bc31a47 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index d8574920d0..2c9bc31a47 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index d8574920d0..2c9bc31a47 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content index d85c3cf3cf..40a5db689b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 2510ec7821..33871043c0 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 @@ -198,7 +198,6 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubeScheduler: @@ -215,7 +214,6 @@ clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -230,7 +228,6 @@ clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -245,7 +242,7 @@ ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: Anitg6mVaWqntn/87qDuntaQYnw+V6j8bxDjEm9VwPE= + NodeupConfigHash: ccbhseGo7twdGHIlFJuP1zyqFhOr47yyluHOD9P+Zvo= __EOF_KUBE_ENV @@ -390,7 +387,6 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubelet: @@ -402,7 +398,6 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -416,7 +411,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: Tw0pD4UJzZ3BPB/329+fJ1hKHvR+EthYJbCrMKq+3wc= + NodeupConfigHash: CgdecTgiIjVCcgWG7T/14kYn0iveXHsfbZbIrkXfHTQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data index 17c1ca0ccd..267c91bc1a 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Anitg6mVaWqntn/87qDuntaQYnw+V6j8bxDjEm9VwPE= +NodeupConfigHash: ccbhseGo7twdGHIlFJuP1zyqFhOr47yyluHOD9P+Zvo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data index 39f3c8c0b4..e6dd1c57d3 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Tw0pD4UJzZ3BPB/329+fJ1hKHvR+EthYJbCrMKq+3wc= +NodeupConfigHash: CgdecTgiIjVCcgWG7T/14kYn0iveXHsfbZbIrkXfHTQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content index a50c88e1e4..2c246fdf24 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.20.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index e181aa2e51..def3df7b09 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content index da620c108e..e0e78e6b91 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml index bd5c7809f7..50967a2fa7 100644 --- a/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml @@ -200,7 +200,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -217,7 +216,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -232,7 +230,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -247,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: BnBiCCXm3uYSzkYNxqh7P0ZTil+gsxMQPQZ2Wli4O/o= + NodeupConfigHash: EeGX8+HbzbbyYc0gABiQ92QIBDidxYW/t4XOZ15cpNk= __EOF_KUBE_ENV @@ -395,7 +392,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -407,7 +403,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -421,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 3JbfPNO+qitZH0iMWb77sgQaJ2Fp3z/yWM0yWnGR5qs= + NodeupConfigHash: CKYOgIKRB02RwlNWiGCEjh2WhERNT3nmbKLDCVqHzGw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 58fceb4758..28efb53084 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -199,7 +199,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -216,7 +215,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -231,7 +229,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -246,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: BnBiCCXm3uYSzkYNxqh7P0ZTil+gsxMQPQZ2Wli4O/o= +NodeupConfigHash: EeGX8+HbzbbyYc0gABiQ92QIBDidxYW/t4XOZ15cpNk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data index b0766b4c81..f8596c70d5 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -151,7 +150,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -165,7 +163,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 3JbfPNO+qitZH0iMWb77sgQaJ2Fp3z/yWM0yWnGR5qs= +NodeupConfigHash: CKYOgIKRB02RwlNWiGCEjh2WhERNT3nmbKLDCVqHzGw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content index 12ca20bf27..a56eece54c 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -119,7 +119,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -136,7 +135,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -155,7 +153,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 8faccea662..89aec4481b 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 382968c505..24683a708f 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 10ca3c1be3..0536298b64 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 @@ -198,7 +198,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -215,7 +214,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -230,7 +228,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -245,7 +242,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: pk2UmZSleNJwj6l2MUTa7SOAUtdxDiheZf2edFm0AJo= + NodeupConfigHash: gSfIenCD0w+UKCMrYheWHbVAc9TbabjOIfJG7OEqUt4= __EOF_KUBE_ENV @@ -390,7 +387,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -402,7 +398,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -416,7 +411,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: RHB3xpW4L0zay+DhORGAEilJK1r0tVvwmUu0kjdmA6I= + NodeupConfigHash: 3xUw8v/woJZU0IZtY3WBFzH1yU7NIRMIDwl2Q4qcSu0= __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 7186abadd0..fe32b65720 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: pk2UmZSleNJwj6l2MUTa7SOAUtdxDiheZf2edFm0AJo= +NodeupConfigHash: gSfIenCD0w+UKCMrYheWHbVAc9TbabjOIfJG7OEqUt4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index 20c4eba841..3459213e38 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RHB3xpW4L0zay+DhORGAEilJK1r0tVvwmUu0kjdmA6I= +NodeupConfigHash: 3xUw8v/woJZU0IZtY3WBFzH1yU7NIRMIDwl2Q4qcSu0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content index e638c086e1..1a2687ab89 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index b75cfa887f..11e93256a7 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 0861577498..c0ad1a5b93 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 d1f613a574..1e91498744 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: cuBFa2qO3I3HeP/BbKT2Il5QJbZq2dfJfydtis7/ONk= +NodeupConfigHash: Z8fItRufScykw+TS3GBfUjj1939R/vufQts9L4uvSpk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index 6d60f86d43..bb23f581d4 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: OjGIAbjdHtboBbIsjunNu8ywFFPpbi40YxaAr6CbglM= +NodeupConfigHash: bNzGWNMzDav/QPSDPq2HlRMtVR8sgs422Baiv+DKa1c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index becbfbd03b..6b0b2b7114 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index b7021e1c4e..0fac34ae6e 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content index b3d8fe0724..4ba862923b 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index ee942d43bf..d5cd789865 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -198,7 +198,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -215,7 +214,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -230,7 +228,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -245,7 +242,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: QsLjbBH58AR25hdHczx1HEuJkP9V6YL7oIVdAiaNbtE= + NodeupConfigHash: Onxi6kSZR0aOhg654s3mTJay4+91g9cGVZgrDdSRO2s= __EOF_KUBE_ENV @@ -390,7 +387,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -402,7 +398,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -416,7 +411,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: GkHMW8t1Vddxt+JhlYTe84LBWFOHZsTx3XwqjfIPxMY= + NodeupConfigHash: vbkHKUCNSo80S9UMFdEeQQfFazNqYZBmVEwxNU78q7E= __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 d70eb685ac..854dbaabef 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: QsLjbBH58AR25hdHczx1HEuJkP9V6YL7oIVdAiaNbtE= +NodeupConfigHash: Onxi6kSZR0aOhg654s3mTJay4+91g9cGVZgrDdSRO2s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index 7765996d81..862f495bbb 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: GkHMW8t1Vddxt+JhlYTe84LBWFOHZsTx3XwqjfIPxMY= +NodeupConfigHash: vbkHKUCNSo80S9UMFdEeQQfFazNqYZBmVEwxNU78q7E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content index 84ebeafac8..bbcb5e67dc 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f6401cd377..d42df568c7 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 123f4caa87..d7f4c38ed4 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 789854706a..1f91112a58 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 @@ -199,7 +199,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.22.0 logLevel: 2 kubeScheduler: @@ -219,7 +218,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -238,7 +236,6 @@ masterKubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -254,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: fNH/0q8QSo6v5DgfOlE5Tu7N0VfT9JLoggkfwND7oZc= +NodeupConfigHash: /QUgcr6ZSKkw1RdL+xjejyakHOkX+aoEE0z4R+MBa1A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index fb11f98ad1..bef21564bd 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -137,7 +137,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.22.0 logLevel: 2 kubelet: @@ -152,7 +151,6 @@ kubelet: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -167,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 9cdcV95YxxbZb10VjjolJ6X9QQvkXActxmr9KWlQPxs= +NodeupConfigHash: zYBKKIq5GPRopf+ln0RvQt2cCqjtB5YmxQIgOP06Twc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content index 18e5093759..0fae2c808d 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -121,7 +121,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.22.0 logLevel: 2 kubeScheduler: @@ -141,7 +140,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -164,7 +162,6 @@ spec: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 1c54d25f74..cc4ced5b1a 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -242,7 +242,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 967e17e7d9..1f97d35bd0 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -49,7 +49,6 @@ KubeletConfig: featureGates: CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 7b73074baa..b454c68ca0 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -198,7 +198,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -215,7 +214,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -230,7 +228,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -245,7 +242,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: iB55E6GLnxJsiV+aT+Sq04FuPcbSpUKnsoZVQPhLjv4= + NodeupConfigHash: fTnMfqDZnL1BGs5rfuu5knQ5HLpsvC2FOqmxrq6I9YU= __EOF_KUBE_ENV @@ -390,7 +387,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -402,7 +398,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -416,7 +411,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: xC5tzX+O6uOdArq3DaSOez2gKi783lM8grs+u+EFAlw= + NodeupConfigHash: igS7JCgU4BRlNKb1SEvHE4dfJ3Qj//6MB9NyLRv23jY= __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 6b574cbddd..9755d00882 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: iB55E6GLnxJsiV+aT+Sq04FuPcbSpUKnsoZVQPhLjv4= +NodeupConfigHash: fTnMfqDZnL1BGs5rfuu5knQ5HLpsvC2FOqmxrq6I9YU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 35575b09a3..41f5daae90 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xC5tzX+O6uOdArq3DaSOez2gKi783lM8grs+u+EFAlw= +NodeupConfigHash: igS7JCgU4BRlNKb1SEvHE4dfJ3Qj//6MB9NyLRv23jY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content index 20c4ec97cf..e6274d97d4 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 69f7c8444f..a3a46ca2e1 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 4f22cd9e65..5fc57b2c54 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index 54cc3dcfde..3a9871122e 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -203,7 +203,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.18.15 logLevel: 2 kubeScheduler: @@ -219,7 +218,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -234,7 +232,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -250,7 +247,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: qhES04aZ9XxwfJRWZXn4XuJ7+KB0omY6K9bKm4J0qZQ= + NodeupConfigHash: 5edQ6jF/LuqWb8kjKQHlm/zJVGCkj/6SwmtSWvkl0EU= __EOF_KUBE_ENV @@ -404,7 +401,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.18.15 logLevel: 2 kubelet: @@ -415,7 +411,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -430,7 +425,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: O702lpCgyj/azW36UAmvCtb7qRUsCXabl7BGQ3Ri2xo= + NodeupConfigHash: FFuyJV2RPI+GoNiGfmdOX+PxaY8TGBx9Ff1H+8DoQ00= __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 163c72d85b..30e130bfd5 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 @@ -201,7 +201,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.18.15 logLevel: 2 kubeScheduler: @@ -217,7 +216,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -232,7 +230,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -248,7 +245,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qhES04aZ9XxwfJRWZXn4XuJ7+KB0omY6K9bKm4J0qZQ= +NodeupConfigHash: 5edQ6jF/LuqWb8kjKQHlm/zJVGCkj/6SwmtSWvkl0EU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 46acee58e8..d7e193671f 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -145,7 +145,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.18.15 logLevel: 2 kubelet: @@ -156,7 +155,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -171,7 +169,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: O702lpCgyj/azW36UAmvCtb7qRUsCXabl7BGQ3Ri2xo= +NodeupConfigHash: FFuyJV2RPI+GoNiGfmdOX+PxaY8TGBx9Ff1H+8DoQ00= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content index b996b6967d..5a4a779032 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -123,7 +123,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.18.15 logLevel: 2 kubeScheduler: @@ -139,7 +138,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -158,7 +156,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index ad75e437ee..a99164c335 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -234,7 +234,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 5601e2eeb4..2aabf3388f 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -47,7 +47,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index 8276d41886..1aa6c8144e 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -201,7 +201,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec clusterCIDR: 100.96.0.0/11 cpuRequest: 100m enabled: false - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -218,7 +217,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -233,7 +231,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -248,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: VJxx4pMTuHBnBVSpWQuu2yBPo0IJrpQzJaQdA5rbJyM= + NodeupConfigHash: Xq/+JygSB2PNiW4C8Ha2SPqCLWgRtWrWpq4ccQ1UmBY= __EOF_KUBE_ENV @@ -394,7 +391,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La clusterCIDR: 100.96.0.0/11 cpuRequest: 100m enabled: false - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -406,7 +402,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -420,7 +415,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: Whr86CROsMxJvKPNBQeIv/zy9VmneGPq9PrY2nxglb8= + NodeupConfigHash: aBwxAtBJPYguM7qiuMRaPsAyewYtcEeyJKEO2yOlios= __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 23a668f402..ecc438ba44 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 @@ -199,7 +199,6 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m enabled: false - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -216,7 +215,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -231,7 +229,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -246,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: VJxx4pMTuHBnBVSpWQuu2yBPo0IJrpQzJaQdA5rbJyM= +NodeupConfigHash: Xq/+JygSB2PNiW4C8Ha2SPqCLWgRtWrWpq4ccQ1UmBY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index 1298a80f62..ea528bc789 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -137,7 +137,6 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m enabled: false - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -149,7 +148,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -163,7 +161,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Whr86CROsMxJvKPNBQeIv/zy9VmneGPq9PrY2nxglb8= +NodeupConfigHash: aBwxAtBJPYguM7qiuMRaPsAyewYtcEeyJKEO2yOlios= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content index ed025fc286..36497ce1a9 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -126,7 +126,6 @@ spec: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m enabled: false - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -143,7 +142,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index dfbe238093..c23e59fa64 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -309,7 +309,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content index fc59a692ce..b184eeb0a1 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -70,7 +70,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 91179258e7..6f9bcc53bf 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: CPux0dD2+HT4c56ZZio705evTTq8x20pZNL1FYdUyFw= +NodeupConfigHash: dBXCyAzcmwleoQyOX0s+DAfx7RfGaK4rnAEe5N/3K2s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index eb56145c16..2033e5cf63 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: KOE4/tcEk3yVEmlW/UStobdHpaPXYSetj232s84yOR8= +NodeupConfigHash: NMzlS0pqURBduEnSOiVBad9g6TWwlbImPEzJ7eCDjtk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content index 5000d80349..4d425f8899 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -121,7 +121,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -138,7 +137,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -157,7 +155,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f5c4fa8eab..d93d58c2bd 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content index f18d86febe..7e77a53313 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 81b9781d7d..ed41b59b0c 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ioJEozdQomCuJVLhs1OEKKrCX8TX5X4SWb/cPfrWnps= +NodeupConfigHash: jJqjEYujkZgeNA5xsuwT1Y9sr1LzapSZOq/W5ElQz8o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index d1b02f168c..e67cb6057b 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: uhr4uOESSTzwNUKcVIPswkPVvqWsPteu4XGpi5D/pqE= +NodeupConfigHash: axczMlR0sscP0A9zB7D6MQaImyfNrXu7/zwlHMbiDOs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content index 8463cedda3..d0c8aec5f6 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 43bfd6311e..915c13824c 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content index f34b19ed33..9a7bc5a31a 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 8b05f12348..b3bf0f1448 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Zz9KzfUGiTK4kN7RXOy4gdZcaoUPWtxaWc84oo1DkQU= +NodeupConfigHash: K+VE9Vbbzk6/f4VngwJ0ZMCxhuSRnksHI3vW3qCOLT8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index c47821e531..15c1d43ef2 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: moMK5mtrLFbiueb9+1ezRA+wxlNcjdmtHJhVAveBews= +NodeupConfigHash: dkusjaWwFGLssCDHvEN3cXbSXFCtTdkqGOwrHKnmIcM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content index f8e586017e..86e1577028 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 0739cfd75d..b0ce28f4ad 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 391b9106fa..eee9072ec4 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 a9ca5ea392..324f894110 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nonMasqueradeCIDR: 100.64.0.0/10 @@ -227,7 +225,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nonMasqueradeCIDR: 100.64.0.0/10 @@ -241,7 +238,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: WJBgoSYqHArQQkNa1eHivx70rxkNkZGlAtRy1Tob+ko= +NodeupConfigHash: wqtxvZL1TLFoMhxwq4/yKVoLzktXCXq1KhtitdG5HZo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index 866be8250a..d4839991ff 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nonMasqueradeCIDR: 100.64.0.0/10 @@ -161,7 +159,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ZsphstEUyVb1l1RFR5KpsjM5CtOqdvehFI4WEdt289w= +NodeupConfigHash: 1kBhpsQa2xlLCLM+2105qHhGaX1aCeQM0QQiydP4X5k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content index 863caefc51..570f32c1f1 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nonMasqueradeCIDR: 100.64.0.0/10 @@ -153,7 +151,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nonMasqueradeCIDR: 100.64.0.0/10 diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 0a1d73e9bf..6958d2bd6d 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 7c203cc5c8..180a0c7e2f 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 nodeLabels: 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 5a1bac98f2..bc0c75cc0d 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 7eT0x+DGB4d2vPpg1WUjLUYMarUyOu7gTF00n16yQjs= +NodeupConfigHash: cFwLpuwABOis69xV3zWcP00uQESAyE04rTnKnfIPyow= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index e2d9777df7..ee3ded1b29 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Ge59mZH78+vn6rESQespEVRdHVRFGbNik4eo7bRHkPg= +NodeupConfigHash: adODq1P8QI9CRVsMc0x35flIAPMLiQ5uSPJFFSyAeXs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content index 0329da4f4f..ea27d23d4e 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 78ce530e57..a921fe97b0 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 113d680786..0c2cb9a3de 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 d71d628d71..11204431bb 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 @@ -207,7 +207,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubeScheduler: @@ -223,7 +222,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -238,7 +236,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -254,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 4pIe2uoOFBsucVNbeBsffF/vC5Scg1lIe9ihvFasbW4= +NodeupConfigHash: Y9j2tHVSobSpxpBbuJbn/MDN0AOcD9fPwPtIDPseeuI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index b65d7fbbb1..9ec897247a 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -145,7 +145,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubelet: @@ -156,7 +155,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -171,7 +169,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JMivLNdXnURUuRMQAE3OmbRJtADb/bT+NPz+jKPMGi0= +NodeupConfigHash: MQ0MK5YJlr1lVv95HQpMhtxpporTtl2DfiQYYd/+F9E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content index ec8ac85456..157b4c633c 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -128,7 +128,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubeScheduler: @@ -144,7 +143,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -163,7 +161,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index eee164d688..02f9adc6af 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -240,7 +240,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-nodes_content index bf5387337a..52c8625cfa 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -45,7 +45,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 da95ce7b30..34c799e526 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 7PUFcQQbQJz0hBfJwfBpvh9vWW3XUgkXjs1NucShcmQ= +NodeupConfigHash: btnvHy0bPdXiIng7r5qQO06aHpjOKJ+BMRVVRqUQf1M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index c7baa6b3a3..597e97a645 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: gDhLLl3zMfK/GqffLfSTEo2HTI0oOq40e+eDVRKzqeA= +NodeupConfigHash: zg4rGk61O7/q/EAfU9CA7RN7zjLJvNXL+rExlfMIVEI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index e4e84efa27..2de8465fc8 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 51d4165afd..0ef2ad7b7e 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 57d64065bc..8deca3f5e1 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 00e99da4a2..27a6d5494f 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: VHGwRGFDge47Sh4FRKQbwdyvnr5tw9czUrbz2WFqEsw= +NodeupConfigHash: R9OPv5UmTKSquPdnWQnD+V+N2S0NXxXRTEgvRk0yZCA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index 3a5df61edd..418d4378b7 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Vl+/FMmSAiNUwr6sPMejuhCqy+e3905EP8EH5eNXq0w= +NodeupConfigHash: xUf1vNd8FFT3jPsgCxucg4kpXK0JQz8KqFvAViBuAq8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content index 7b08b8260d..73b6df1676 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 1931911954..31b47cf6c5 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content index c95cc57a1d..e73f32d3c1 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 42c37bf758..69bdb5814e 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: iv99SKTGB5CNRQdOS9vrBG5rjSWPfCHBt/z+4LfjCMM= +NodeupConfigHash: WrGUTZ2fVYoi5Pr/VmqEJ1cVFSkWpZg12IxFnwdwauc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index bd7682ea73..cd1e5e9b11 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: CGSc972qynBjNblVJSwm0HjSgxy4n+/57O9YUt7g5Ss= +NodeupConfigHash: dGnOkRpeSNt8NL3h/PSMEQ8f632bvW+6RIC00iQQN2c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content index 3694d03380..126d32c03d 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -118,7 +118,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -135,7 +134,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -154,7 +152,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index fbc1fa00db..c41c5bf219 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content index ac0db69bad..ccae2f14ee 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni 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 a30c69771a..b0b0eebd70 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 @@ -196,7 +196,6 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -213,7 +212,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -228,7 +226,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -243,7 +240,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: mRNx2d1ys4aKviHY7yRCTvfI0BcX3VQ/MJwoa+QaDoQ= +NodeupConfigHash: Z4IU80+07IRL4JdtasAA0cGjl3hQHN6rUgqsA2L/R+E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index 1944c2ff28..853009f820 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,6 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: @@ -148,7 +147,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -162,7 +160,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= +NodeupConfigHash: ehZK5PooPMXQw0YD3dy5oARwClEXIj8ymh6DR1XYbQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content index b7e68c6d91..03bec58588 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -116,7 +116,6 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - hostnameOverride: '@aws' image: k8s.gcr.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: @@ -133,7 +132,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni @@ -152,7 +150,6 @@ spec: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 86b7f98adb..a66607232b 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -239,7 +239,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6d95ccbc59..014862648a 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -46,7 +46,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go index 81be58ce4e..1c7d01aeb3 100644 --- a/upup/pkg/fi/nodeup/command.go +++ b/upup/pkg/fi/nodeup/command.go @@ -447,35 +447,27 @@ func completeWarmingLifecycleAction(cloud awsup.AWSCloud, modelContext *model.No } func evaluateSpec(c *NodeUpCommand, nodeupConfig *nodeup.Config) error { - var err error - - c.cluster.Spec.Kubelet.HostnameOverride, err = evaluateHostnameOverride(c.cluster.Spec.Kubelet.HostnameOverride) + hostnameOverride, err := evaluateHostnameOverride(api.CloudProviderID(c.cluster.Spec.CloudProvider)) if err != nil { return err } - c.cluster.Spec.MasterKubelet.HostnameOverride, err = evaluateHostnameOverride(c.cluster.Spec.MasterKubelet.HostnameOverride) + c.cluster.Spec.Kubelet.HostnameOverride = hostnameOverride + c.cluster.Spec.MasterKubelet.HostnameOverride = hostnameOverride + + nodeupConfig.KubeletConfig.HostnameOverride = hostnameOverride + + if c.cluster.Spec.KubeProxy == nil { + c.cluster.Spec.KubeProxy = &api.KubeProxyConfig{} + } + + c.cluster.Spec.KubeProxy.HostnameOverride = hostnameOverride + c.cluster.Spec.KubeProxy.BindAddress, err = evaluateBindAddress(c.cluster.Spec.KubeProxy.BindAddress) if err != nil { return err } - nodeupConfig.KubeletConfig.HostnameOverride, err = evaluateHostnameOverride(nodeupConfig.KubeletConfig.HostnameOverride) - if err != nil { - return err - } - - if c.cluster.Spec.KubeProxy != nil { - c.cluster.Spec.KubeProxy.HostnameOverride, err = evaluateHostnameOverride(c.cluster.Spec.KubeProxy.HostnameOverride) - if err != nil { - return err - } - c.cluster.Spec.KubeProxy.BindAddress, err = evaluateBindAddress(c.cluster.Spec.KubeProxy.BindAddress) - if err != nil { - return err - } - } - - if c.cluster.Spec.Docker != nil { + if c.cluster.Spec.ContainerRuntime == "docker" { err = evaluateDockerSpecStorage(c.cluster.Spec.Docker) if err != nil { return err @@ -485,24 +477,15 @@ func evaluateSpec(c *NodeUpCommand, nodeupConfig *nodeup.Config) error { return nil } -func evaluateHostnameOverride(hostnameOverride string) (string, error) { - if hostnameOverride == "" || hostnameOverride == "@hostname" { - return "", nil - } - k := strings.TrimSpace(hostnameOverride) - k = strings.ToLower(k) - - if k == "@aws" { - // We recognize @aws as meaning "the private DNS name from AWS" +func evaluateHostnameOverride(cloudProvider api.CloudProviderID) (string, error) { + switch cloudProvider { + case api.CloudProviderAWS: hostnameBytes, err := vfs.Context.ReadFile("metadata://aws/meta-data/local-hostname") if err != nil { return "", fmt.Errorf("error reading local-hostname from AWS metadata: %v", err) } return string(hostnameBytes), nil - } - - if k == "@gce" { - // We recognize @gce as meaning the hostname from the GCE metadata service + case api.CloudProviderGCE: // This lets us tolerate broken hostnames (i.e. systemd) b, err := vfs.Context.ReadFile("metadata://gce/instance/hostname") if err != nil { @@ -514,10 +497,7 @@ func evaluateHostnameOverride(hostnameOverride string) (string, error) { fullyQualified := string(b) bareHostname := strings.Split(fullyQualified, ".")[0] return bareHostname, nil - } - - if k == "@digitalocean" { - // @digitalocean means to use the private ipv4 address of a droplet as the hostname override + case api.CloudProviderDO: vBytes, err := vfs.Context.ReadFile("metadata://digitalocean/interfaces/private/0/ipv4/address") if err != nil { return "", fmt.Errorf("error reading droplet private IP from DigitalOcean metadata: %v", err) @@ -529,10 +509,7 @@ func evaluateHostnameOverride(hostnameOverride string) (string, error) { } return hostname, nil - } - - if k == "@alicloud" { - // @alicloud means to use the "{az}.{instance-id}" of a instance as the hostname override + case api.CloudProviderALI: azBytes, err := vfs.Context.ReadFile("metadata://alicloud/zone-id") if err != nil { return "", fmt.Errorf("error reading zone-id from Alicloud metadata: %v", err) @@ -548,16 +525,7 @@ func evaluateHostnameOverride(hostnameOverride string) (string, error) { return fmt.Sprintf("%s.%s", az, instanceID), nil } - if k == "@hostname" { - // @hostname means kOps will resolve the hostname and override it. This is the default behavior by kubelet, so it should not be needed. - hostname, err := os.Hostname() - if err != nil { - return "", fmt.Errorf("failed to retrieve hostname from OS: %v", err) - } - return hostname, nil - } - - return hostnameOverride, nil + return "", nil } func evaluateBindAddress(bindAddress string) (string, error) {