diff --git a/nodeup/pkg/model/cloudconfig_test.go b/nodeup/pkg/model/cloudconfig_test.go index 60ed08b8d8..5efc3a8c6c 100644 --- a/nodeup/pkg/model/cloudconfig_test.go +++ b/nodeup/pkg/model/cloudconfig_test.go @@ -142,7 +142,7 @@ func TestBuildAWSCustomNodeIPFamilies(t *testing.T) { } var task *nodetasks.File for _, v := range ctx.Tasks { - if f, ok := v.(*nodetasks.File); ok { + if f, ok := v.(*nodetasks.File); ok && f.Path == CloudConfigFilePath { task = f break } diff --git a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml index 088f1352ba..595cd594c5 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml @@ -42,9 +42,9 @@ contents: | - --authorization-mode=AlwaysAllow - --bind-address=0.0.0.0 - --client-ca-file=/srv/kubernetes/ca.crt - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota - --etcd-cafile=/srv/kubernetes/kube-apiserver/etcd-ca.crt - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key @@ -120,7 +120,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -172,7 +172,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml index 44213b348a..37492c6c91 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml @@ -20,9 +20,9 @@ contents: | - --authorization-mode=AlwaysAllow - --bind-address=0.0.0.0 - --client-ca-file=/srv/kubernetes/ca.crt - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota - --etcd-cafile=/srv/kubernetes/kube-apiserver/etcd-ca.crt - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key @@ -98,7 +98,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -147,7 +147,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml index ce31d4b263..bb7d510f67 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml @@ -20,9 +20,9 @@ contents: | - --authorization-mode=AlwaysAllow - --bind-address=0.0.0.0 - --client-ca-file=/srv/kubernetes/ca.crt - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota - --etcd-cafile=/srv/kubernetes/kube-apiserver/etcd-ca.crt - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key @@ -98,7 +98,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -147,7 +147,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml index 8803cf3daa..6fd8fa70e6 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml @@ -14,7 +14,7 @@ contents: | - --attach-detach-reconcile-sync-period=1m0s - --authentication-kubeconfig=/var/lib/kube-controller-manager/kubeconfig - --authorization-kubeconfig=/var/lib/kube-controller-manager/kubeconfig - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - --cluster-cidr=100.96.0.0/11 - --cluster-name=minimal.example.com @@ -78,7 +78,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -129,7 +129,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml index aaa9c2a6b7..0fb29ee0ed 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml @@ -20,9 +20,9 @@ contents: | - --authorization-mode=AlwaysAllow - --bind-address=0.0.0.0 - --client-ca-file=/srv/kubernetes/ca.crt - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota - --etcd-cafile=/srv/kubernetes/kube-apiserver/etcd-ca.crt - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key @@ -98,7 +98,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -147,7 +147,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml index 25b9c860d4..a26e3fa0ce 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml @@ -20,9 +20,9 @@ contents: | - --authorization-mode=AlwaysAllow - --bind-address=0.0.0.0 - --client-ca-file=/srv/kubernetes/ca.crt - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota - --etcd-cafile=/srv/kubernetes/kube-apiserver/etcd-ca.crt - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key @@ -98,7 +98,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -147,7 +147,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml index 6887bbd8dd..9060c6541a 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml @@ -14,7 +14,7 @@ contents: | - --attach-detach-reconcile-sync-period=1m0s - --authentication-kubeconfig=/var/lib/kube-controller-manager/kubeconfig - --authorization-kubeconfig=/var/lib/kube-controller-manager/kubeconfig - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - --cluster-cidr=100.96.0.0/11 - --cluster-name=minimal.example.com @@ -78,7 +78,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -129,7 +129,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml index 678d6cf980..6c62071a38 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml @@ -14,7 +14,7 @@ contents: | - --attach-detach-reconcile-sync-period=1m0s - --authentication-kubeconfig=/var/lib/kube-controller-manager/kubeconfig - --authorization-kubeconfig=/var/lib/kube-controller-manager/kubeconfig - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - --cluster-cidr=100.96.0.0/11 - --cluster-name=minimal.example.com @@ -78,7 +78,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -129,7 +129,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml index dffe951ff8..3593d3cf22 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml @@ -20,9 +20,9 @@ contents: | - --authorization-mode=AlwaysAllow - --bind-address=0.0.0.0 - --client-ca-file=/srv/kubernetes/ca.crt - - --cloud-config=/etc/kubernetes/cloud.config + - --cloud-config=/etc/kubernetes/in-tree-cloud.config - --cloud-provider=aws - - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,NodeRestriction,ResourceQuota - --etcd-cafile=/srv/kubernetes/kube-apiserver/etcd-ca.crt - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key @@ -97,7 +97,7 @@ contents: | - mountPath: /etc/openssl name: etcopenssl readOnly: true - - mountPath: /etc/kubernetes/cloud.config + - mountPath: /etc/kubernetes/in-tree-cloud.config name: cloudconfig readOnly: true - mountPath: /srv/kubernetes/ca.crt @@ -146,7 +146,7 @@ contents: | path: /etc/openssl name: etcopenssl - hostPath: - path: /etc/kubernetes/cloud.config + path: /etc/kubernetes/in-tree-cloud.config name: cloudconfig - hostPath: path: /srv/kubernetes/ca.crt diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml index 773994cba1..8689fd547a 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/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 --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/" 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 3c1553ffc0..2672943269 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/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% --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" HOME="/root" path: /etc/sysconfig/kubelet type: file diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index 38f693df6c..94de05052e 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -163,7 +163,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer - NodeupConfigHash: 6vn0oJtgVeSmj24GjGk02beYl7NwuMSg5qf1+LWNDYg= + NodeupConfigHash: xOIUiwWoN99L8+qbwWAsaYPlkNfMvCNHM94xJcD7Fcw= __EOF_KUBE_ENV @@ -324,7 +324,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -416,7 +415,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: WNVDq0wEQ5Vtq0yZnswckjtG1fwmgGajOnH/67g0vpc= + NodeupConfigHash: BDSsQ6aFwZhmBywQtTHiTetDTpkq+bdhNJS2aw7C8EQ= __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 4fba06d426..0f64e54ca5 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: KlR627RcQK12hwGF4JRUPQQ6fd+fZcYpBBCBuRB8ASc= +NodeupConfigHash: ps29rTfAWDjTZjZk4aLQdA05bBY420JKxvYuRiDbmYU= __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 3ce6cc40c0..27bf0d5f0a 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 @@ -68,7 +68,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 bf05608ce5..0df8ed307e 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 9376002343..d756960f84 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qYmTID0jnMsl4mMdaPk88ouExQWJxv4JBE+cDQ/QusU= +NodeupConfigHash: Yi9nilhmXZVlW5bcmdrYHo0gpSanmVCtkhHFjbcCnrg= __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 3687cc352a..c08d525aa1 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 55db8f0ccc..dca035aa66 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index b1e73622e7..2da7c9cabd 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -165,7 +165,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -260,7 +259,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 3f+2lVOGZ+Av7Y6lc803/TJuvsaq7IKtX2gA7KngvrY= + NodeupConfigHash: KqRuy2EawfJ35GVD0UsFqxy+Virnyf1hgWP6+0Fr/vA= __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 4a188cb4af..36c98a7603 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 @@ -164,7 +164,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -259,7 +258,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 3f+2lVOGZ+Av7Y6lc803/TJuvsaq7IKtX2gA7KngvrY= +NodeupConfigHash: KqRuy2EawfJ35GVD0UsFqxy+Virnyf1hgWP6+0Fr/vA= __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 af26f16a68..db53a4f2ac 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 @@ -86,7 +86,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 fdbed040a1..4d1168983d 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 @@ -15,7 +15,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 7defc639d4..9156ebacb3 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/+xWTXPbNhO+61dg5p1MLjEpJn7ThpNDFTmt1VgpK+WjVwhYUahAgFkAlNVf31mA1IdjNdPpsR3P2NbuYrH77LMPJLQNcmrNWtXliDG+c2/fLKfL2Q2qDpBMjIHhKw2yZGuuHYwYa7jhNSy9RV7DVHPnwJXMY4CRsMZzZQAXwXjVQMkOFnl0SkqsbX0HHeiSKbO2I8Y6QKesKVmRXWevRtKKbSrBbVU7M85zrftrwAjct15Z09fOTNB6BF7IqQ7OAzo6CB0Y71IXh+wvsuuseBHbUOZx3zasYFLNloA9CFxru6tQdUpDTVDEKhjjxpp9Y4ObBL85AsRbNQlSgREQb79ilBENeHCZ60QmYc2D9ik0XTO1wfiSFWQLfmNR/cGpwbmVULKJ3vG9m1AZI8ZWysiJlAjOlWycxZ8RY3GYFdpOScCShjkapjeRjXLUY6VDrUxf1XvegGu5gDu1BrEXGqL5TjXKL7ipAeNnKlAJmAhBNUZTRYg5D8Z/sjo0cMdXoKPnJrV2yo5T+werAWNjSxDWyOScB8+9MvWhzM+w2li7jc5PXCt52f3eSliA86gEpY22BTgbUMCvwXpOIHghE8x95xvvW1fmefH8uwhfUV6Px8V55C8dICo5jDBPbPrfo0efjxhTDa+hZNvvXVYLzJTNaepXvFUuEakrsudFnBQ5NPgKYQ2IMAzzw74dbpsZD2i4nlXx46113vAmzeft/YnvuEZUA8KXAM5vgEvASBeQccopK69rhJp7iw9j39575LfxX6pK3Q9HfrtaQGM9XMWIq4fnfkIb2nTu4YHoehj/0VHpDTx+hLy08CACQmXRl+z6+kW0nFJw5lwghg+j4K3KVA9YJmzTEpgZ3POm1UCGrzL8/Pnd8uNi9jdS5LYFo2TeFfnvu607ZuwFZ1bFjSlZMR5nL6+JGnmUGZc24Q0XWzCyjAxLEjO1xqPVGnAeFfUgNYJ7IFpPZzcLdxQb77nY3AD9XtDyCKVhuTeiAlRWlqxoxu6SDIhUJWVMJb56mUosjk4iCgn2o/iJKLQBYUrpFzZ4Ev1B8S5wXxw6vGr6Fo9LoBPxNMS9TUp8Yjv0fc7w4OBcj6YIEoxXXA9Q0dUV2vt9+c3G27BI7Iw+6nPTb9qw/SV7+gPfuaeXm2zjVSd9ndRLAUuxARl0Gu+FHO4Q88/w6YWlvPw2iZrWsn/fmds7D4082BfW+pLl32DRzfvlCc+L8YnHxld1+JgRl/XhFbqBVahrZepbbqSm9R96gC6p9y1HWbIGGov7jHdcaTr3uhiP5+qZsRLW7sz8ZDAq+ut+RIDX/3/yLKL8VehgPYv965ETnon5FScU845jrtUq74HOjwFfMdWA31ncphe33y2jyGHNnLsvAZCnHT8XDYKztXLOjVqD8/3F4EV+/BaRN73XjRpOSL/7b/D/tsHTy1rTlzDsFYb6Heb9JwAAAP//AQAA//+YP5Y62QsAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xW34/bNgx+z18hYCj60rPjNutWow9Lk26XtemypF33qkiMo0WWXEpyLvvrB0p2ftxdVgx73FCgdyYpivz48dMJbYOcWLNRVTlgjO/d2zeryWo2RdUCkokxMHytQZZsw7WDAWM1N7yClbfIK5ho7hy4knkMMBDWeK4M4DIYr2oo2dEiT05JibWt3kMLumTKbOyAsRbQKWtKVmSj7NVAWrFLJbidambGea51dw0YgYfGK2u62pkJWg/ACznRwXlARwehBeNd6uKY/UU2yooXsQ1lHvftwhrGi9kKsAOBa233C1St0lARFLEKxrix5lDb4MbBb08A8UaNg1RgBMTbbxhlRAMeXOZakUnY8KB9Ck3XTGwwvmQF2YLfWlR/cmpwbiWUbKz3/ODGVMaAsbUyciwlgnMlG2bx34CxOMwF2lZJwJKGOeinN5a1ctTjQodKma6qD7wG13AB79UGxEFoiOb3qlZ+yU0FGL+pQCVgLATVGE3T1MA5B87tH60GjOWvQFgjk3MePPfKVMdiPsN6a+0uOn/jWsnr7g9WwhKcRyUobbQtwdmAAn4N1nNq1QuZwOz623rfuDLPi+ffRZCKcjQcFpeRv7SAqGQ/qDxx5ptHjz4fMKZqXkHJdt+7rBKYKZvTbG94o1yiS1tkz4s4D3Jo8AuEDSBCP7KPh6a/bWY8oOF6toift9Z5w+s0hbd3Z77TslANCF8COL8FLgEjKUDGWaasvKoQKu4t3o99e+eR38ZfqSp11x/5/WYJtfVwEyNu7p/7CW1o0rn7B6LrfvwnR6XX8PgR8tJagwgIC4u+ZKPRi2g5J9rMuUA87kfBG5WpDrBM2LohMDO443WjgQwPMvz8+d3q03L2D1LktgGjZN4W+R/7nTtl7GRltoh7UbJiOMxejogaeRQTlzbhDRc7MLKMDEtCMrHGo9UacB518ygognsgWk9m06U7SYr3XGynQP8vaXmE0rA6GLEAVFaWrKiH7tqyi1QlZUwlvnqZSixOTiIKyfKj+IkopwFhQumXNniS9l7XrnBfHDu8qbsWT0ugE/E0xL1NentmO/Z9yfDg4FJ1JggSjFdc91DR1Qu0d4fyq403YZnYGX3U57bbtH77S/b0B753T6832cSrzvo6q5cCVmILMug03is53DHm3+HTCUt5/QUSFa1l94ozd3Aeanm0L631Jcu/wqLph9UZz4vhmcfGt7P/zIjL+vjWTGEdqkqZ6pYbqWn9+x6gTep9y1GWrIba4iHjLVeazr0uhsO5emashI27MD/pjYp+uh8R4PW3T55FlB+E9taL2L8fOeGZmL/ghGLecsy1Wucd0Pkp4AFTDfi9xV16V7vdMooc1sy5+xIAedrxS9EgOBsr59yoDTjfXQxe5Ke/FfK687pBzQnpd/8P/r82eHpZK0VodwpD/fbz/gsAAP//AQAA//+EWFbivwsAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1TOMU/DMBAF4N2/wjtKDRIsllhaUFMhh4AYuh72pQny5YzPLuXfo9Ap69P3nt4ucg195vMUMFsNP6J2PA/TaQuCVhPSINYYH6sUzLLBC1CKuPFMxjOljLIK1WGWArPHfeaaOqBlBJZuU6UpKKW5gzV654hWu3+kOg5Y0/VCCzJaPbq31/Q0nb725+dj199//B7brSPX3t5cemfo8zA80AuM4ds/qj8AAAD//wEAAP//u+htOc8AAAA=" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1TOMU/DMBAF4N2/wjtKI4ZWxRILhlKGRIAgiPFkXyDgyxmfTQi/HoVOWZ++9/Rs4OLvE38PHpPRMImyPPbD2xUIGk1IvZi6dqFIxiQb/AGKATeOqXZMMaGsQnU3SobR4W3iElugZQSWblWkyii5Ooc1euSARjf/SLXsscTThSPIu9HdcQfb67kJ9OX3BxI+e563L6/Tbrj4sE+fYY+H5sZ2D79JLtUfAAAA//8BAAD//xCbiFLPAAAA" | 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 3d0b7386d3..542e800a31 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a469689c4e..7723b3a9a5 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 13b0a34fac..8871f07087 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -161,7 +161,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -253,7 +252,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 4fha382ZMFt2lpPdABWVSRUAXSADVKdCm9JSr6tfcJ4= + NodeupConfigHash: qvR0i6qa2s54ZANeceLJGjXi29mVBzQUchV6QUpzjCQ= __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 f609fbb963..c12848c29f 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -153,7 +153,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: ASd4TaLBK+cf8CS/o6jwOqfAgdHRdA03PldCEDintuI= + NodeupConfigHash: n0GsXVBKqotfXU3ZV0+tgjuIbRG3ryMK5jfoi8/5DFg= __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 4c9208cd29..f362a79ed8 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 2BnL9dTk5xfFuBtqUHFX/tfuqIJOLyu8gIyh35YR3RQ= +NodeupConfigHash: FXPW7J22BgGDsSSOlMFcjYEAp/GpcKW5D61tRB8AXdI= __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 c1a2b1a630..4323624b11 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 @@ -85,7 +85,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 178425a58d..46a31ae90b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 1f881cba1e..4458adf655 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -169,7 +169,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -263,7 +262,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: imk1UXoCCs6yiCc1fQQkdx0kEvXA0OMpylH1JztAa+w= + NodeupConfigHash: sWjOwigV1Op8L3/9Ua9YBkILaUUdJ7huisFgdb+xwGo= __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 e916ab59bd..8a60f0856b 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: HjHQyBAfOGm4wHwAqYAJiS+xtVgwTWq77woRSV9hd9k= +NodeupConfigHash: tyZRXcj0msz+D/eeKsIqBT9GMbqJUTwJ9LjfhZfX3LA= __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 3cfad0edda..ee89c7cd22 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: HjHQyBAfOGm4wHwAqYAJiS+xtVgwTWq77woRSV9hd9k= +NodeupConfigHash: tyZRXcj0msz+D/eeKsIqBT9GMbqJUTwJ9LjfhZfX3LA= __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 90a18df849..f2deca8aea 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: HjHQyBAfOGm4wHwAqYAJiS+xtVgwTWq77woRSV9hd9k= +NodeupConfigHash: tyZRXcj0msz+D/eeKsIqBT9GMbqJUTwJ9LjfhZfX3LA= __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 168d47982a..34d7bc043f 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 @@ -71,7 +71,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 0c075b5574..af41df6f88 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 0c075b5574..af41df6f88 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 0c075b5574..af41df6f88 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 3f7b3a967e..f146fd71a3 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 @@ -153,7 +153,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 5StgKu5eTk/zFpcb1W8qO9BWna8InTaJCmpUJg5Cdfk= + NodeupConfigHash: gXrxRhwYwi4yyEtndVrcy88O6zqWqB9UfgJBjcsH+Y0= __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 14be4d1693..54cbf4f2f6 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: SC3HPTwFUboxlBEsgbo2ZmqbbNzWP/I0Ah+c0K/91mQ= +NodeupConfigHash: naHuHaaY2TpNL18G+RfasEJOSaTEjeC7FvghQf5w1YU= __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 59d566829e..a58dff037a 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: SC3HPTwFUboxlBEsgbo2ZmqbbNzWP/I0Ah+c0K/91mQ= +NodeupConfigHash: naHuHaaY2TpNL18G+RfasEJOSaTEjeC7FvghQf5w1YU= __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 fe9db1e1a5..850b5fbd72 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: SC3HPTwFUboxlBEsgbo2ZmqbbNzWP/I0Ah+c0K/91mQ= +NodeupConfigHash: naHuHaaY2TpNL18G+RfasEJOSaTEjeC7FvghQf5w1YU= __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 0a1f6bc03a..2821199440 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 @@ -74,7 +74,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 6b04da25a5..ad3c16e752 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 6b04da25a5..ad3c16e752 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 6b04da25a5..ad3c16e752 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 38254da6d8..2862b0551f 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 5StgKu5eTk/zFpcb1W8qO9BWna8InTaJCmpUJg5Cdfk= +NodeupConfigHash: gXrxRhwYwi4yyEtndVrcy88O6zqWqB9UfgJBjcsH+Y0= __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 03bb51b0dc..e4bae8625c 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 1858112eca..425120d325 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 4fba06d426..0f64e54ca5 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: KlR627RcQK12hwGF4JRUPQQ6fd+fZcYpBBCBuRB8ASc= +NodeupConfigHash: ps29rTfAWDjTZjZk4aLQdA05bBY420JKxvYuRiDbmYU= __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 dc7bf1a225..e6542a52f1 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 @@ -64,7 +64,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 bf05608ce5..0df8ed307e 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index f9b4c1b316..fb3142ba26 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -153,7 +153,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 9lwlPzjo+xEdi8oVmYcF2j1iWMw44cFLp1Am3Oi05dg= + NodeupConfigHash: ZUKhUQKJZd2dcQr+MDQ7zGTqz+/MAKvk+obhwInVZRI= __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 d5ef3ba469..204db1d239 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 9lwlPzjo+xEdi8oVmYcF2j1iWMw44cFLp1Am3Oi05dg= +NodeupConfigHash: ZUKhUQKJZd2dcQr+MDQ7zGTqz+/MAKvk+obhwInVZRI= __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 95816de4c8..f75a4604bd 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 54be79c5d4..d42854247f 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 0a8f1c0d78..d64d9835d2 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 @@ -153,7 +153,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -246,7 +245,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: +CYbsRBHuruW0rq4BOzlpqWmllx7jtQEWNuiAndllsM= +NodeupConfigHash: UyWCRq3vfvwSpuJDdKKkHVC3aWlbHAfTq+roiudkbDw= __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 bf520d0de5..2cfd205c51 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 @@ -79,7 +79,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 0edf0fe9d5..fb9a098fac 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 @@ -13,7 +13,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 def4a3b589..bc22663669 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: fh3a/darXWDl3JlnzXAF14PrRQNRTwr7dP9rkBD7+Is= +NodeupConfigHash: pjulvSWrYUr+W9zPdxaLNf5sQtgsoZZ0HFNp/fNefVY= __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 17ed11b72a..5777d75a11 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: fh3a/darXWDl3JlnzXAF14PrRQNRTwr7dP9rkBD7+Is= +NodeupConfigHash: pjulvSWrYUr+W9zPdxaLNf5sQtgsoZZ0HFNp/fNefVY= __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 0d491f4295..9742e472af 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: fh3a/darXWDl3JlnzXAF14PrRQNRTwr7dP9rkBD7+Is= +NodeupConfigHash: pjulvSWrYUr+W9zPdxaLNf5sQtgsoZZ0HFNp/fNefVY= __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 d5522d8263..774145cf82 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 @@ -71,7 +71,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 49ad3cd033..12d6a34ea6 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 49ad3cd033..12d6a34ea6 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 49ad3cd033..12d6a34ea6 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 ebe569fd89..a32a8c4f68 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 @@ -71,7 +71,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 8dab8d038f..996a1e2077 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 8dab8d038f..996a1e2077 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 8dab8d038f..996a1e2077 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 b05ed8a259..4dbff68d77 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: wzNOVQcIIK0AS3B/BO3bhtYY3utaZopKkxKjbN9zS3A= +NodeupConfigHash: pGZGJ/r7U0pXUY6HvDJDScZt55RW0yOdmwX8lHrKFbk= __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 3972197db1..cd61a0035e 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: Master -NodeupConfigHash: wzNOVQcIIK0AS3B/BO3bhtYY3utaZopKkxKjbN9zS3A= +NodeupConfigHash: pGZGJ/r7U0pXUY6HvDJDScZt55RW0yOdmwX8lHrKFbk= __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 11890ecd83..e4f7278f9b 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: Master -NodeupConfigHash: wzNOVQcIIK0AS3B/BO3bhtYY3utaZopKkxKjbN9zS3A= +NodeupConfigHash: pGZGJ/r7U0pXUY6HvDJDScZt55RW0yOdmwX8lHrKFbk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ipv6-cloudipam/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/ipv6-cloudipam/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index b3f562fb3e..999dabef1a 100644 --- a/tests/integration/update_cluster/ipv6-cloudipam/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/ipv6-cloudipam/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: zYbO/e2M2Iy3fxtLkb+mOckni+m8gKTNLvqy5wTdQMA= +NodeupConfigHash: Ak0TU7MygiQGoWxfo1e/+WLzKmgbjlgWBmAgyKPNCyo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_cluster-completed.spec_content index 0a7038e85a..56b1b517e6 100644 --- a/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 8c1caf397b..b652d3e53c 100644 --- a/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ipv6-cloudipam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 0cdb0144fc..a21579d2cd 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ny8WT+mNhh2EuJfl7ypbCMAqTmQJhnle12ZLCUwmTV8= +NodeupConfigHash: GXafg6qlWh5J+kskGooK4e7zQGl0lq/bZsofH1TTLWc= __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 7c2c9ab30a..8fe7942be0 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 @@ -90,7 +90,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 6daf3dee33..fd6964bd86 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 319971d1fd..8f44f4a9cd 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 @@ -153,7 +153,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -252,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 0EyRTJpK9KrCfzoGEoHxH6tQPsXj3MzWPbb38lNx3wM= +NodeupConfigHash: FRFCRUdAc+VKAxvUVjCNxC9MVaqfUX89rznJSU9wVFU= __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 5117bebe83..79e69ca1e6 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 @@ -87,7 +87,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 2e1d296d89..d31af488da 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 86b262fb47..bd430de679 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 @@ -153,7 +153,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -252,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: nRugnx7H/BPkYUOEVmcwRp+i05mWyLIKWoq7qn9995c= +NodeupConfigHash: FjIGzfwSyzwa0X8knSlsVRjS7PoNokZ3kLx92RUVI3I= __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 a018b9f937..925d469af4 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 @@ -86,7 +86,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 132c0f3e2c..523e1b6862 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 dba96e47fd..c7aa4067e1 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 @@ -153,7 +153,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -252,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: /rCpPWCqNYg2l1GXjrzH5s66xP1VDUkEhwtbv4iJYWU= +NodeupConfigHash: 6rToKtWTZzYJK+YviGSrhaQ1+q5aSxO577Xm1GACOU4= __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 d864562f22..c2e10c34d1 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 @@ -79,7 +79,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 7ebd7ce09f..8c9b02b8f0 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 04dbe57038..98536ee33e 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -169,7 +169,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -261,7 +260,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: W7/wjoITwtdyVXX6BtfOESF2XD1PmsG+bvat01A/V3Y= + NodeupConfigHash: yUdSa4C8PzCit8V4ivh2O7J1JjMyI7ygAz96joTXc0I= __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 70898f9f10..0711a17d10 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -159,7 +159,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -251,7 +250,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 5StgKu5eTk/zFpcb1W8qO9BWna8InTaJCmpUJg5Cdfk= + NodeupConfigHash: gXrxRhwYwi4yyEtndVrcy88O6zqWqB9UfgJBjcsH+Y0= __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 014cfd68aa..6746ca42fa 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 @@ -158,7 +158,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -250,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 5StgKu5eTk/zFpcb1W8qO9BWna8InTaJCmpUJg5Cdfk= +NodeupConfigHash: gXrxRhwYwi4yyEtndVrcy88O6zqWqB9UfgJBjcsH+Y0= __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 accbe57cf9..ae78d270e7 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 @@ -69,7 +69,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 1858112eca..425120d325 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 d0e5bc3c70..0aa3804fae 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -153,7 +153,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: zYbO/e2M2Iy3fxtLkb+mOckni+m8gKTNLvqy5wTdQMA= + NodeupConfigHash: Ak0TU7MygiQGoWxfo1e/+WLzKmgbjlgWBmAgyKPNCyo= __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 1bd433e094..b1a2225539 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: zYbO/e2M2Iy3fxtLkb+mOckni+m8gKTNLvqy5wTdQMA= +NodeupConfigHash: Ak0TU7MygiQGoWxfo1e/+WLzKmgbjlgWBmAgyKPNCyo= __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 a7ecaf4a51..e2b3004d8e 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 8c1caf397b..b652d3e53c 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 e4a2814137..8273504bf5 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 @@ -153,7 +153,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -253,7 +252,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: PH9jtuZPVzee4/VkVBT2keb6Ewlgo5iMwvzSxqntoI0= +NodeupConfigHash: 4ENjflM3KY/1aErExzgsbiRYkFnCbJwDUrBb3m7L+U0= __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 d5eab79a62..145ad6d559 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 @@ -64,7 +64,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 b9cde08284..7750095970 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 3f7b3a967e..f146fd71a3 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -153,7 +153,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 5StgKu5eTk/zFpcb1W8qO9BWna8InTaJCmpUJg5Cdfk= + NodeupConfigHash: gXrxRhwYwi4yyEtndVrcy88O6zqWqB9UfgJBjcsH+Y0= __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 38254da6d8..2862b0551f 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 5StgKu5eTk/zFpcb1W8qO9BWna8InTaJCmpUJg5Cdfk= +NodeupConfigHash: gXrxRhwYwi4yyEtndVrcy88O6zqWqB9UfgJBjcsH+Y0= __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 de54b2d55d..d221f26eff 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 1858112eca..425120d325 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 1648d87ffa..2cf655ad2c 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 7e57c073c4..6defbde3fe 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 c92df746a2..14fa515798 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: UPW3etJDZvJybeZw7tBxz/1R65u8zXDWGycU5cuxZcY= +NodeupConfigHash: QA7EfQAYkgG5RL3kAjirfOthbN7tKKAeyoINoE4tNS8= __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 a6a0ac2838..9dd63a7c85 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 ff7b626460..bdd57fea3d 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 81dcc63ade..8efba9e5be 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: zFEe255DXZcM5AJbRJ15sJSktbhD3zIJ1+JX9l4GOYw= +NodeupConfigHash: ZHNxPIjRne+64JO0FLfhRNiXq5w4arKeyRgftlykS/A= __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 19cb3a853a..38dbb992b5 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: E3XByTEqoq24u0RUuiwk1z9v1aOJSZG1QOl/WsD9Tdw= +NodeupConfigHash: oFXRT7rBCjQNNNpttCqFy3zYkXWHtJp3tgijKTM8eZg= __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 b74bc0e233..b36843b5ca 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 @@ -62,7 +62,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 91b8b5971d..e008d1f56a 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 09daa7d413..1d3e7b7b97 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -153,7 +153,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= + NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __EOF_KUBE_ENV @@ -406,7 +405,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -498,7 +496,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= + NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __EOF_KUBE_ENV @@ -659,7 +657,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -751,7 +748,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= + NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 3b4669f0d6..ceb8f0e725 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= +NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 870b055a61..657d46c3bd 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= +NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 ca22a43a2f..23b749ff4a 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= +NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 baa5b22af4..372ddfc310 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 @@ -71,7 +71,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a2409aca78..0f7f1d369b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a2409aca78..0f7f1d369b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a2409aca78..0f7f1d369b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 09daa7d413..1d3e7b7b97 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 @@ -153,7 +153,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -245,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= + NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __EOF_KUBE_ENV @@ -406,7 +405,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -498,7 +496,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= + NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __EOF_KUBE_ENV @@ -659,7 +657,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -751,7 +748,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= + NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 3b4669f0d6..ceb8f0e725 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= +NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 870b055a61..657d46c3bd 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= +NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 ca22a43a2f..23b749ff4a 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: W4BBaOdm17QHqEE3z0mdDgdi2E12+ijfjv+tcfyXFyk= +NodeupConfigHash: UtRwm6jjdxmf/n4s6mfKu9StA43Mkoi5UIWgf54rjO8= __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 baa5b22af4..372ddfc310 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 @@ -71,7 +71,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a2409aca78..0f7f1d369b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a2409aca78..0f7f1d369b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a2409aca78..0f7f1d369b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 90c4bef3ec..604a5e3a54 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 @@ -154,7 +154,6 @@ - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -246,7 +245,7 @@ ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: sGrshxpFidkBKocZgsdNwpRH3cwwL2f5KPGr751qKmg= + NodeupConfigHash: 7205dTJ242jVp7sV7fgjLVYPJzqdy798mRVadF+8UR4= __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 24f888491f..1ce01b23b7 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: sGrshxpFidkBKocZgsdNwpRH3cwwL2f5KPGr751qKmg= +NodeupConfigHash: 7205dTJ242jVp7sV7fgjLVYPJzqdy798mRVadF+8UR4= __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 f3e867d34d..3e359d551c 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 52b91add80..5adcfdc9d9 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 09d722bb33..7ea125b7c1 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 @@ -155,7 +155,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -247,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: FzCpF+yF0cPmOxGl501tNmKOLgm6DaN78GDi94ewPMg= +NodeupConfigHash: SbyvJIbcbYPJ+WEwZXnsjyJDqEb3mH9uuL5SiSctyUs= __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 7878f3e768..90924aa2b5 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 @@ -66,7 +66,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a2bfc1d855..5a3a9b61f5 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 a372cc8ff4..a7d2e33fc6 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 @@ -154,7 +154,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -246,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: vzsI19SA9cfwASqka1Ok++hoE44ax9mZbLIf/IV4JKQ= + NodeupConfigHash: neJKfXJhHADg0OGM0iHc4oLl78kJvNmGWRTYbdOc7k0= __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 5f64ce70e9..ce66a4e0f8 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: vzsI19SA9cfwASqka1Ok++hoE44ax9mZbLIf/IV4JKQ= +NodeupConfigHash: neJKfXJhHADg0OGM0iHc4oLl78kJvNmGWRTYbdOc7k0= __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 2faf5bed06..474f264348 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 6c31be43a4..5d9ecbaee5 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 530f05894f..eff9a79a43 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: oaUp+GpSLqP4YziLInTmVruRidGft/MtfaEe+oCOrHg= +NodeupConfigHash: iXaiCzbWeQE+FMfZaHPxZlu7/INvAI5IMbnM9o3z7ao= __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 ec12a1cfe2..edfb5b1325 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 69b0efeac6..838c970c4b 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index d87775e764..acc85dfc0d 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -154,7 +154,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -246,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: xsyLB/5s9LvDrreBvPJiHjVa6r3MOTaiAPNIopoE9IM= + NodeupConfigHash: 6aBr70AAY5fAA9yNeKoMovPE+ee+/6QuxvvQCeJItj8= __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 262e565340..42857eeceb 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: xsyLB/5s9LvDrreBvPJiHjVa6r3MOTaiAPNIopoE9IM= +NodeupConfigHash: 6aBr70AAY5fAA9yNeKoMovPE+ee+/6QuxvvQCeJItj8= __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 d120f637fc..47ffc1d01c 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 4276c73129..2867f67d4c 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 3cf397520f..39e8c68d57 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: cWL/TcqqECIYP6Q95U40DP1U/gopnTqPQAaI5nSqZHM= +NodeupConfigHash: Qctv9BA4nnzXlUkUX4B2Fx27brvnZX76E7BVfqo40fY= __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 70c394511b..5f47f5c3c2 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 ac7054dd30..54e0caf9cf 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 8b4a5080e3..e0dc4a3205 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -154,7 +154,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -246,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: nadiHdRZPtGeMMKgxatd2qGQSWoAnPcoaaws/8yHyvE= + NodeupConfigHash: 5XZmDTN71x77DCwf2OE3isDaXVeIxtWq/v6pJ6Lhx5k= __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 7a37f44452..32a145c60a 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: nadiHdRZPtGeMMKgxatd2qGQSWoAnPcoaaws/8yHyvE= +NodeupConfigHash: 5XZmDTN71x77DCwf2OE3isDaXVeIxtWq/v6pJ6Lhx5k= __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 fbace88bf2..9e8724cb8c 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 b9ecac9d09..a947108381 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index 19e2faf983..54cc3dcfde 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -161,7 +161,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -251,7 +250,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: Gckoc9dgRZU/9P9+/CBjyoWcsRaD57u+NH9O40FRL8w= + NodeupConfigHash: qhES04aZ9XxwfJRWZXn4XuJ7+KB0omY6K9bKm4J0qZQ= __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 af30c80151..163c72d85b 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 @@ -159,7 +159,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -249,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Gckoc9dgRZU/9P9+/CBjyoWcsRaD57u+NH9O40FRL8w= +NodeupConfigHash: qhES04aZ9XxwfJRWZXn4XuJ7+KB0omY6K9bKm4J0qZQ= __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 12e5d1df38..6d9f1a4e73 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 @@ -72,7 +72,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 252f87ad25..ad75e437ee 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 @@ -10,7 +10,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index 4830a001b9..775e6a6056 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -156,7 +156,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -249,7 +248,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: FzU3IcKcYEj83I/oyjYHlOlrvoZ5LIxOTn5oXLAMcW4= + NodeupConfigHash: 6hDaUSfx0pAT3A2POKlKIRBmzNba4xyZ3dTs5nH+CSs= __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 f257306e0b..dc069dca64 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 @@ -154,7 +154,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -247,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: FzU3IcKcYEj83I/oyjYHlOlrvoZ5LIxOTn5oXLAMcW4= +NodeupConfigHash: 6hDaUSfx0pAT3A2POKlKIRBmzNba4xyZ3dTs5nH+CSs= __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 42b112e45f..54c87dbec3 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 @@ -75,7 +75,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 9b3983b7b1..89a003e2e3 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 f61d9434b6..adca02e043 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: qcuSl2Yd6pK4UEPMfxp/YBTscZiw64B9ZFjK/q9jPJ4= +NodeupConfigHash: eKW77f3vpQJyhsdw6dh9tOYks+H/pqkU6gdFTnkH4lg= __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 649d8441eb..3baad8676a 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 @@ -68,7 +68,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 5aa02199f4..45e031f1d5 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 b85cc5da26..0112fd8024 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: K+xqbn8lZupctxxbWNo7/88cZLtZCPbJ4C0MiFh0D1Y= +NodeupConfigHash: ChmN1NetJayHQKy5hZ+sFva9KF00eLpYQ4lKwdxyO1o= __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 801da82769..3e386fd846 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 219198bb40..6b05cd9887 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 24cfd3600b..3d703247f4 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 5KwANoDw3Vpv39EBt4qTSbBN6Y4gsoLAXVrCwbkjDWk= +NodeupConfigHash: kD/yNvXmw1VFqj2nyOGE7XoUHHvqmg1oBGQLYM2yqcw= __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 f54f907aa5..07e692c542 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 eb9e3c2ee1..40fac9be8a 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 2c0863be21..a1371225ee 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -242,7 +241,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: UIsuZJp+YDaoibHFWxR7EpINJgzHrW+JLLVOWWhYqLM= +NodeupConfigHash: uMQil33324IyW5dBzXJG/pxs5TmcDgL+E7toGkr5+4w= __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 3505202a6e..f35dd871ea 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 75b345faf5..bfdc623779 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 e60c0a4d77..fca4a5cb20 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: UalU3yjFMulOfxye4owypqGrPJPw0zbeCqD2S7sViq8= +NodeupConfigHash: jX4SZzfBvtnruk1/bokU+KPVaftqnMkzjh6NQUkI9F8= __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 c7f30d5646..b67342c72b 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 bdf4ee27b2..36f9732fc6 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 9ffcd49857..d71d628d71 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 @@ -161,7 +161,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -255,7 +254,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: bODSQDkZ0FXUPGB3zfZa+YDB1MwOxR/Qi41N7tmG/20= +NodeupConfigHash: 4pIe2uoOFBsucVNbeBsffF/vC5Scg1lIe9ihvFasbW4= __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 c0f26dd44e..322b40042e 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 @@ -73,7 +73,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 77e40f24e1..eee164d688 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 47a83818c9..480b298bed 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: KEapFyJ9XfKDU2bejo75xEBD0x+jBk/nFz/t1YRQFF0= +NodeupConfigHash: MX6tjYWzzArFdkgneHaLELmOtAmwPoIdAFgM1+rZwrY= __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 6b73270f4d..66105d3241 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 951dadaeb9..2fe0f0c0bb 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 9d8118d452..3e77b7b602 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 0ZrALKmFaH6Ax2sFM5Lg6wkVxL1Li1U9DHwmV4K5GWk= +NodeupConfigHash: X6kXI4FKE/NXedI0nAcYX/uI6F6p9PgacDBj/hKgCN0= __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 13556213e7..d4d3d3b99e 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 f3363075ba..b68c28fc6a 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 6206605bc1..f4361f117a 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Rwi9p3+UkODZQU58G0etxc3e2ibl2y2c0aqVYrxD5oY= +NodeupConfigHash: 8pPlZm/dCyKLwNg63v1IODdWzLyu8chBGiwpKhNGwbI= __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 292ae86cef..b214991fb4 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 @@ -65,7 +65,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 7195163bc0..476030675f 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 4fba06d426..0f64e54ca5 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 @@ -152,7 +152,6 @@ kubeAPIServer: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook @@ -244,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: KlR627RcQK12hwGF4JRUPQQ6fd+fZcYpBBCBuRB8ASc= +NodeupConfigHash: ps29rTfAWDjTZjZk4aLQdA05bBY420JKxvYuRiDbmYU= __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 314c070de9..a0eccc3c09 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 @@ -63,7 +63,6 @@ spec: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook 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 bf05608ce5..0df8ed307e 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 @@ -12,7 +12,6 @@ APIServerConfig: - NamespaceLifecycle - LimitRanger - ServiceAccount - - PersistentVolumeLabel - DefaultStorageClass - DefaultTolerationSeconds - MutatingAdmissionWebhook