diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml index 14ad8293bf..b5f97e97a7 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml @@ -26,7 +26,7 @@ contents: | [plugins] [plugins."io.containerd.grpc.v1.cri"] - sandbox_image = "registry.k8s.io/pause:3.6" + sandbox_image = "registry.k8s.io/pause:3.9" [plugins."io.containerd.grpc.v1.cri".cni] conf_template = "/etc/containerd/config-cni.template" diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml index ef5335c686..25a7c268de 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml @@ -26,7 +26,7 @@ contents: | [plugins] [plugins."io.containerd.grpc.v1.cri"] - sandbox_image = "registry.k8s.io/pause:3.6" + sandbox_image = "registry.k8s.io/pause:3.9" [plugins."io.containerd.grpc.v1.cri".cni] conf_template = "/etc/containerd/config-cni.template" diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml index 7e2c69f6d5..8e7634ccd0 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="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --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,CSIMigrationAWS=true,ExperimentalCriticalPodAnnotation=true,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.6 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf" + DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --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,CSIMigrationAWS=true,ExperimentalCriticalPodAnnotation=true,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf" 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 072d7c5d03..53d20aea4b 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=external --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=CSIMigrationAWS=true,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.6 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf" + DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=external --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=CSIMigrationAWS=true,InTreePluginAWSUnregister=true --kubeconfig=/var/lib/kubelet/kubeconfig --pod-infra-container-image=registry.k8s.io/pause:3.9 --pod-manifest-path=/etc/kubernetes/manifests --protect-kernel-defaults=true --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/in-tree-cloud.config --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key --config=/var/lib/kubelet/kubelet.conf" HOME="/root" path: /etc/sysconfig/kubelet type: file diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go index f29a056be6..c84e756a5f 100644 --- a/pkg/model/components/kubelet.go +++ b/pkg/model/components/kubelet.go @@ -177,7 +177,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { // Prevent image GC from pruning the pause image // https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2040-kubelet-cri#pinned-images - image := "registry.k8s.io/pause:3.6" + image := "registry.k8s.io/pause:3.9" var err error if image, err = b.AssetBuilder.RemapImage(image); err != nil { return err diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data index d6c1518179..ab6bda3155 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data @@ -229,7 +229,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -250,7 +250,7 @@ masterKubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -265,7 +265,7 @@ ClusterName: additionalobjects.example.com ConfigBase: memfs://tests/additionalobjects.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: zotQWT9xs686IPfxJYs/z/y+2Et8IBcjslZT/wvQSng= +NodeupConfigHash: oyi0g5mOAZ/GaGGcsrTZO72NsCJFjJavIKue+IOkW/A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data index e7cf6e98d1..f3e5d08fc6 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -178,7 +178,7 @@ ConfigServer: - https://kops-controller.internal.additionalobjects.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: v9XWiXRBTWNSITcwuFA3CWPrGsrb7hdsJx+zxTNq0HU= +NodeupConfigHash: c5Q2SIf54gUmnn1tN49t/3mkjB47pel93/CQAo7hvgI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index 4ba4f7f7bc..3f06eeb86f 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -192,7 +192,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2ed0547a4a..020dd72c9b 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -272,7 +272,7 @@ KubeletConfig: node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/master: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content index 7d34253a10..ddd0f38867 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content @@ -43,7 +43,7 @@ KubeletConfig: kops.k8s.io/instancegroup: nodes-us-test-1a kubernetes.io/role: node node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data index 1c3f22c6cd..1d8b7ff4d9 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -155,7 +155,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer -NodeupConfigHash: VsBHuGU/pUfFhONF8ZOTtFBi+26/tvIyWv4ZlHjRo2k= +NodeupConfigHash: kSCdMp/gjLRgJzSElxpRrIDsHRkHYoR2yMeUTvyshEo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 183dd3d798..fd4c860c78 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -224,7 +224,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: KFhUMLKahQjxUyJaRBofM2m9Nr8Jp7VaGYpRkwYQFRo= +NodeupConfigHash: 2hk/XP+S4gkEXNYvU94yWg9JfIK7v2S1Uuc72c+KnlA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data index c90d7ec74c..138f363551 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -178,7 +178,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: qGuasZzBC1UvhGSHUsWuP1KS3yQFc7UEI+bBaQoy4yU= +NodeupConfigHash: qqMvOWLA7UFUqWONNc9G+iUfFB30mbyzWqZUwxw6Ts4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index 54f5ceefcb..44f3b68bc8 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -157,7 +157,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -181,7 +181,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content index 8b4ad62cb8..e66b39e012 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content @@ -170,7 +170,7 @@ KubeletConfig: nodeLabels: kubernetes.io/role: api-server node-role.kubernetes.io/api-server: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 3e72f77b47..d442f4ef6f 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,7 +268,7 @@ KubeletConfig: node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/master: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content index ccfaa71cee..e3f0e16c8d 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: nodeLabels: kubernetes.io/role: node node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 225b9c9f23..3106fa883a 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw= +NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index b3856b118f..e96886662b 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y= +NodeupConfigHash: d5MqA+uigYNyN9ngxi+YweS4KxwZLufmklba4URBOM8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content index bad3f82466..3b5bbb1882 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content @@ -171,7 +171,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -194,7 +194,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a79911d2f4..04f0555b40 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content index 4eced620fc..916804757a 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 63e32ce94d..1b33631285 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: bastionuserdata.example.com ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: RxDJ1J2oXmj4Px8npngc2eI642Qjbe/MqS5kg+snEAY= +NodeupConfigHash: mjEx2K5Ybwv0+x1YMnKdWsYGn5t7qBZWBoORkWJ7B1Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index 364b3919fc..7c0c374abc 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -148,7 +148,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -186,7 +186,7 @@ ConfigServer: - https://kops-controller.internal.bastionuserdata.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: EvHrG5qj5v/Fve1Vojh+7F6sw/e/d7tP4GpjQXIoVJU= +NodeupConfigHash: Fk47XGfSN8e8SvbZ0d3CQnQyRj4LLSW0RKnl3xq7pCo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content index 321edda2cd..dcbf62d7a2 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content index e6c1bc6847..fdbe355d97 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 60d8c638cd..26e6df0ea0 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content index b497bfc746..0b51b836fa 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data index 27a5afbc81..34f06e4920 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data @@ -222,7 +222,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -241,7 +241,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -256,7 +256,7 @@ ClusterName: cas-priority-expander-custom.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ZqM+RK7+bJrAova+ZGrfIqkNo7DhDmF79XFKUVRiHy8= +NodeupConfigHash: 0QWkxW3Vr6PUtzprxrAQ4iTWPo80jbQix9IAFrLHnRs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data index 133a4289ed..96393a057f 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node -NodeupConfigHash: RGK+8XQTlx3C7inK+OP+r0Pj1HXVUvlEjj2rr+Ju07I= +NodeupConfigHash: 1Q+oAfo0v+RLBV5GCay7T58jn7igSMli1j0ba+HPPQY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data index 412afb0fd2..b053267671 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node -NodeupConfigHash: RGK+8XQTlx3C7inK+OP+r0Pj1HXVUvlEjj2rr+Ju07I= +NodeupConfigHash: 1Q+oAfo0v+RLBV5GCay7T58jn7igSMli1j0ba+HPPQY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data index 421862caea..29b265fbe6 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RGK+8XQTlx3C7inK+OP+r0Pj1HXVUvlEjj2rr+Ju07I= +NodeupConfigHash: 1Q+oAfo0v+RLBV5GCay7T58jn7igSMli1j0ba+HPPQY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content index 318fadc943..4cbea3f452 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -187,7 +187,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -209,7 +209,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d1b8419b1b..c591232226 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content index 1d34faa520..edcfb84789 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content index 1d34faa520..edcfb84789 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content index 1d34faa520..edcfb84789 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data index a561db22c5..54b3e1bd4b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data @@ -222,7 +222,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -241,7 +241,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -256,7 +256,7 @@ ClusterName: cas-priority-expander.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: h5ZXlKpszyiWAiramWrBzuREmJiv/1MwWAJWLJnKyHA= +NodeupConfigHash: NoUGt4lv5jODIs8UcIk+sgyzOhxGwfRKEi5EMfXW0j8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data index 710da38550..434e13fe14 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node -NodeupConfigHash: 2NWUGb81jBvP3zHBOF6B6ylq2xil8VzhrmcEBgJEK4c= +NodeupConfigHash: zfb/0qjre91I+EN+4X9bsb8iDldq5Wx2PAKEwCSwbD8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data index 8ad6c07f20..1fb4b8305e 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node -NodeupConfigHash: 2NWUGb81jBvP3zHBOF6B6ylq2xil8VzhrmcEBgJEK4c= +NodeupConfigHash: zfb/0qjre91I+EN+4X9bsb8iDldq5Wx2PAKEwCSwbD8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data index ce137841a8..caef3e24d3 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2NWUGb81jBvP3zHBOF6B6ylq2xil8VzhrmcEBgJEK4c= +NodeupConfigHash: zfb/0qjre91I+EN+4X9bsb8iDldq5Wx2PAKEwCSwbD8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content index 5144424718..8ba79481c6 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -180,7 +180,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -202,7 +202,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5482e7084e..4fc9e20a3b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content index 97a7b033fb..6a19b9f3f6 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content index 97a7b033fb..6a19b9f3f6 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content index 97a7b033fb..6a19b9f3f6 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 e55b0184a8..64d02e8d98 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 @@ -238,7 +238,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -273,7 +273,7 @@ ClusterName: complex.example.com ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Krl22z/c80fddvh9gVkVx36gO3jTExB26QVmbNHkxkc= +NodeupConfigHash: WXHgaSWNiZgZDuXaleFp8ChsNM9KgZlve1lLOp+KzhY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index b137558de1..1ecb716220 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -148,7 +148,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -186,7 +186,7 @@ ConfigServer: - https://kops-controller.internal.complex.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: kcoLcg19T43P/TI08qaHgVCi7NzT9PN8Yvq8lHoScNw= +NodeupConfigHash: nqKc7rtUy7/gqhuWD7794tEZ6+Vq8cncOjX9IIXgFrk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content index 41e7949975..8a1e398908 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -195,7 +195,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -219,7 +219,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 864a1ccf4a..6ab1573bc6 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -274,7 +274,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content index ac7334aa32..d94ccb6e03 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 6c1a4cf8e3..64e361d0ad 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/+xW3W7bNhS+91MQHXpXS3aTZqvQG9XOEi2x68nJsl0FNHksc6FI7ZBU4j39QFKynTQZNgwrelEUaMzzx/PznY9iUjs+0WotqmxASE0VrWBpNdIKJpIaAyYjFh0MQDHcNlZo1ZkT5aQcgGV8Ip2xgMZHgBaUDb/6aBgPhKwou3NNCRaUDzOlW5OR96NOC6rtDYdE0Roycno1md7O8nl+dlreTvPi8rfbj/nk4nqxvC1Pr07nV8WneedCSEulAx+PB1ELaIRWGTlK3iXvQ2lCfXVp3bkV5ItiCdjGhKiU+n6BohUSKuBd7wmhSqttrZ3Jnd1kZE2lCeJG5I4LUAxCz4fER0QFFkxiWpZwWFMnbTSN10y0UzYjYy9zdqNR/El94TPNISO5vKdbk/s0BoSshOI55wjGZGSUhH8DQgJqFqhbwQEzAg8WUFHpx6/oSkLOa2F8nQvpKqG61Oa0BtNQBpdiDWzLJATxpaiFLamqAMPZZykY5Iz5RINoGqs4xOWh/EpLwFDDEphWPCpnzlIrVLVL5gZWG63vgvIXKgV/WT3XHEowFgXzYYOsBKMdMvjZaUt9qZbx2NGuvo21jcnSdPz2+9CpcXY8Go0fW35qAVHwflppXJfvnnV9OyBkDdQ6hDNqoVuqybKYiSqWm98sM/LKQ+RV0BXqCgFi0/Ob5bVCqIRfzQMrUdMKMhI1uE3ufjCJ0KnHzZA2wkQotuPk7UmYtVdIsAuENSBCD4erbdMXUag4/mIRjufaWL8o4XD6cKCTurqEFmRGfGkIfzgwdgOUAwbAAQ8QiVFpVSFU1Gp8anv6YJGeh58+K/HQu/w6LKHWFobBYvjU7wy1a6LfU4egemp/bXzqNTzv4rUDQgwwh7DQaDNyfHwUJIf4LYxxvv/9hGkjEtE1LGG6bnwzE3igdSPBCz6L8NPNxfK6LP5FiFQ3oARP23H6+/2d2UfsiLpYhHXLyHg0Sk6OPeLScUg9LthHyu5A8SwA9yiQ1EQri1pKwNmePT1ZMWrBb8ukmJZmT1fWUraZgv+/9DvJhITlVrEFoNA8I+N6ZP6WSFhM1YeNeb4/iXmO98p5oOMXmsjCK+UQJv6OUju/QTvi/LJ7xXbdG/aPz37BZAS1hEA1MZkD2a6nj7fHGXhMlBME7l8wKvsx+KuXbAPcyTivL1u02V3932rtCCh7+RVklV/fKQrPXMRsjYWa7+Sl1jYj6T9B23S+PFiK8ehAo8P3Q39MPPD3790UVq6qhKrOqeLSc0VfCLTxBTmnyDNSQ61xm9CWCun9PoxHo5l4ozSHtXkkft0Lhf9rfkSAD+9evwn9/sy0lz6y/V/m7WcRF2tB/QTSlmIqxSrthpTuDT5DbKN5odZIPZVQoQCL58HTUGcgO0pOos+MKrEGY7sLwbJ0/42T1p3Wk0mD2gKzF14nu0+D/ST6arqN8M3b6czGWa7v1RlSBj1FHQWGekY1QWEFo3KhufFwMYOa+sgX34D6DahfN1D/AgAA//8BAAD//+WvOXbvDQAA" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xWX2/bNhB/96cgOvStkewm7VahL6qdJVpi17OTZXsKaPIsc6FI7Ugq8T79cJRkO2k6bBhW9KEIEIt3x+P9+d2PFNoGObZmrcpswFjFDS9h6S3yEsaaOwcuYx4DDMAI3NZeWdOZMxO0HoAXcqyD84COPEADxsev3hu2C8ZWXNyFegEeDLmZ8K3L2LthpwXT9IZHzPAKMnZ6NZ7cTvNZfna6uJ3kxeVvtx/y8cX1fHm7OL06nV0VH2fdFsYargOQPxlFDaBT1mTsOHmTvIupKfPVhXUXVpDPiyVg0wbEtbb3c1SN0lCC7GrPGDfWbCsbXB78JmNrrl0U1yoPUoEREGt+xMgjGvDgEteIRMKaB+1b0/aYsQ3GZ2xEsuA3FtWfnBKfWgkZy/U937qcwhgwtlJG5lIiOJexYRL/BoxF1MzRNkoCZgwePKDhmtpv+EpDLivlKM+5DqUyXWgzXoGruYBLtQaxFRqi+FJVyi+4KQHjmqJUAnIhKNAomrRZHOLyUH5lNWDMYQnCGtkqp8Fzr0y5C+YGVhtr76LyF66V/Lx6ZiUswHlUgtxG2QKcDSjg52A9p1S9kG1Fu/w23tcuS9PR6+9jpUbZyXA4emz5sQFEJftupe24fPfs1tcDxtbAfUA44x66oRovi6kq23Tzm2XGXhBEXkRdYa4QoC16frO8NgilotE8sFIVLyFjrQa3yd0PLlE2Jdwc8Vq5ForNKHn9NvaaFBr8HGENiNDD4Wpb90kUpm1/MY/Lc+s8DUpcnD4c6LQtL6EBnTFKDeGPAM5vgEvACDiQESKtV16WCCX3Fp/anj545Ofxk6JSD/2WX48WUFkPR9Hi6Om+M7Shbvc93RBVT+2vHYVewfNbSDtgzIEICHOLPmMnJ8dRcojfwrlA9e87zGuVqK5gibBVTcVM4IFXtQYSfOLhp5uL5fWi+BcuUluDUTJtRunv93du77Ej6mIexy1jo+EweXtCiEtHMfR2wD5wcQdGZhG4x5GkxtZ4tFoDTvfsSWQluAealnExWbg9XXnPxWYC9H9BMymUhuXWiDmgsjJjo2ro/pZIRBsquW3jfPe2jXO0V84iHX+miCLeUgFhTGcsbKAJ2hHnl50rsaveUX/57AdMt6DWEKmmDeZAtqvp4+kJDh4T5RhB0g3Gdd8GOnopNiCDbvv1ZZN2u6P/W64dAWWfvwVFSeM7QUXMxdzWeajkTr6w1mcs/Sdom8yWB0MxGh5obHw/9MuEgL+/7yawCmWpTHnOjdTEFX0i0LQ3yDlHmbEKKovbhDdcadr3fjQcTtUrYyWs3SPxy16o6Nf9iADv37x8Fev9iWkvfWT7v/SbetEO1pxTB9KGY6rVKu2alO4NPkFsbWVh1siJSrgygMXz4Kl5cJAdx0dbbeWUG7UG57sDwYt0/8ZJq05LZFKj9SD8Bel09zTYd6LPppsIKt5O5zbBS3tvzpAL6CnqODLUM6oxKq8E13MrHcHFDSpOni++AfUbUL9uoP4FAAD//wEAAP//uEYSRu8NAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/2zOwUrEMBDG8XueIvelW6peDHhwg+wWskupB8HbkE5rJcmETKLt24v0VNj7/8f3aUdl6BL9zAMmJeGXhXaFM6YbeFTSko8JmY+4gI8Oj5a80BTGeToBo5Ie/ciqru2mdmF9V7eBMwSL50Qlbise/m1VuMrIuWpgH/XkUElNISdynYOA4kYDlrgduQB/KWmW59NHa2OeWV+M/VzNw3XK703zdNArmEN//n7r3fUxta8v4g8AAP//AQAA//8oNJ5B9wAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/2zOy07DMBCF4b2fwi+QGlBpkSU2tSouoWkEiMtysCcQsD2WxyY8PkJZRWL/fzrHeKquz/Q9OsxawsTC+MoFcwcBtbQUUkbmFf5ASB5XloIwFIfxfQeMWgYMA2ul7KwWofpX30QuEC1eZappXgnwZ5vKTUEuzSkso3vyqKWhWDL53kNE0ZHDmuYj18AfWsKtfWb7eH7yNb08HQ+vb+N2bTbr3dRuHrbd51m7P7RO+Yvj3f5S/AIAAP//AQAA//9FlrBE9wAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index 19f75d0820..8d4d2db1ef 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/2yST2/bMAzF7/4URIHeCttZt2IQeikSrA22DMGyYWfGohWishhQkrd8+0Fu3D9YT4b4e8R70nPnJdulhJ6dqQAGDOhol0TR0dJjjBQNJM1UPeY9eUpFhUHCaZAc73I6GOjRR6oAOqeSjyvlkdRAPMVEg32e/xBJBppyLp5blZFtEdLfRBrQTyTHRLr6vjOwaNv65mPd1ov2FZEBOZj5WHvppkUKuPe0on12joN7wGA96RwdgEbuEkt4QLUGBhpETzWOyL7s3S7adsNXQSz18c34ch5y+cYvSnT76fKKB3T/S+fpG20F0BOmrHSPiWJ5PoDlbr1hp1gi3f3eGbgoOS8mtg4/lWjrs+PCfgUlx+Wyr1Sli24qbYulgWZEbTzvm3NJzYugAvDivtFI3sCHCuAodh16xaWEhBxI1yW2gScbPdWPn2PN0hwxRzLX9c3TzgYD9xTT2ZBSN5looESxGc40FrFKoi59LcyvqMfs00sT82123YFsnh7vmcVDTlb+hHvFjrakLNbAdRvfR0vlxB36rdhYfpdY/QMAAP//AQAA//+ifSCJzQIAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/2yST2/bMAzF7/4URIHeCttZt2ETeikSrA22DMGyYWfGohWishhQkrd8+0Fu3D9YT4b4e8R70nPnJdulhJ6dqQAGDOhol0TR0dJjjBQNJM1UPeQ9eUpFhUHCaZAcb3M6GOjRR6oAOqeSjyvlkdRAPMVEg32a/xBJBppyLp5blZFtEdLfRBrQTyTHRLr6vjOwaNv64/u6rRftCyIDcjDzsfbSTYsUcO9pRfvsHAd3j8F60jk6AI3cJZZwj2oNDDSInmockX3Zu1m07Yavgljq46vx5Tzk8o1flOjmw+UVD+j+l87TV9oKoCdMWekOE8XyfADL3XrDTrFEuv29M3BRcl5MbB1+KtHWZ8eF/QpKjstlX6hKF91U2hZLA82I2njeN+eSmmdBBeDFfaORvIF3FcBR7Dr0iksJCTmQrktsA482eqofPsWapTlijmSu68+POxsM3FNMZ0NK3WSigRLFZjjTWMQqibr0tTC/oh6zT89NzLfZdQeyeXq8JxYPOVn5E+4UO9qSslgD1218Gy2VE3fot2Jj+V1i9Q8AAP//AQAA///Wu4yjzQIAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/6yUS4+qSBzF934K9ua2CIpgchcFFFgoyEu49A6heCiP4qGlZj78pOlJbibTmUwmzYLFOanf4p9fjlK1t9Tu23uZ4n7LxHSYKdVtGHFvxTXeMklbkx4Pwxt+xDWp8FvS1jOlbbIy93B/x/12xjAKUHA/llmZxCMetswfM4ZhmB8fnwx1ZDEKdH2kIQX4cEqn3kRIPl8UBbhlDiiSQY5MjQCrk1XR8lSRAyfPBKyueJ3uoTOvOlBW6AmYcv7QLuA0QeTcCmRg+mo4LqM6eJ7rgH3/ZY4RB+muSCzzAqn1ArypJvSoAhp+ZK/f2QSZiguITDeiGojUwHFUSJd9GhpVUq+rVA9eh9AqTI1S1YmMffuOintiAQfKsgPUCeJRQD1gyMDSEP/qWf8qXvshFO/0kpnkZRyr0BGFpXDX+ciOuQ7kaBOs2j3NAvaJ8uUEuYzznZCt7AW92sD2bT9ziYSeYruDUKOsAigEILYUEwKq5pEauKwNnN1CBo4Kcqh/HhaIOlieUkihvKCOZgJTBplId8704CjLEdQsnX8FFz85VAZVB2O12EtqsNm3xQn8Bfnn5QELgSymLJ9FHN2Ee5IdOalDnLQmN05ZJbEEykA/ktxLxAky1s7QCX3yGHl/3p/XomQH44ut6SLZ+4/jVch3nKIo8+cue3L058/f3kBL/dqa/2vVvfZi9giqqP61/16rfJP72qqP4tusMjVBW8XvKcGseyLP5zWWSUjflYaes6yI9COdZ4Pgpofbqds4ilUb9QJ2mwkShsdXaUZqiSTvnFREnQtOabAWDztCgtM3WnVANRGAe7FVsBOaAs2HJAxG3pHOzb9aFTjBY22exhtAGNs3W2rXy8dIfM4TtHtWisYKKY+m+lRTkjcnlbsNRRJo9hjj9iDp2U2Mo9XekHHX5ev2Uq262m384vJfrBqmJRs+puwHU4wjGbaLxbUlw4+kbca+rSrcv5XNiPsmrt6+msQtL4niYoaaYYybBOt9eyOfA9q0KR7+XrhthbeM1aZ49vG7kc893cVDsWUO0SZJEuVKLGTA5xwdloVe67sMm1d+8FbqxtVIj7k4ldDP2Z8AAAD//wEAAP//otWHQL4FAAA=" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/6yUS4+ySBiF9/4K9qZbREUw6cVLFSDYIDfhwx1yE+QOWmrmx0+kJ/kymc5kMmkWLM5JPYs3Tw4q6mtkdPUti+JuQwWkn6Di2g9xpwdlvKHCumy6uO/f43tQNkX8HtblBNVVkqV23N3ibjOhKAQo7oYsycJgiPsN9ceEoijq7fUJoqzoFBItR5EUBI44pmOvKYpwyhECK0uBKAKkiiY1oLcC5nQbcwwcbA1oGdmtbCunBTZFAZEDaEJ6l3I4jBAh1V0BNAd7w9wv3cepdOnjL23wGZFsz6Gu5SLRn7DQcEj2GIj3yp6/sxEyFjn4muUTCXzsmiYWybyLPLUIy1URye7z09PPmkQINn11Vx+V8y3UwRQFwQQ8QmwCxAZVAF1SFs+Odi7cpes97kbyRGue6r7wTI6dszd54RsB00KqrN1lvSOJSz+UdD5C8mG6ZZOlMSMXAwzHcBKr4ZUHV29FUSI0AiICBDrSRCA49bFr0QaY25kAJoZUlL8OC5wM80MkElGYEVPSQBMg4cjWHB/sBcEXJV1ePN3cCT8LleBeXc52PHbXu/p8gL8g/7w80CIIXEQvEp8ha2/XJHuGbxWGXzVXBi3DgIfMlfdNaofcCBlKs2/ZLrwPC2fanVYcb7jDky7JLNw59/2FTbcMQmj62CYPhnx8/PZG1PH31vxfq26lHdB7KPzy1+5nrXI05nurXsWPWaVJrLQMjlET09aheTwugdB45IgqckqSsy/vyTTpWSv6vB7atYn0Ui1nYrseIZ63f2aajzOFt09h0eApa2YqrS/Etmncww9a9amUDQtWbmDYstVZmfah5w4Lkz9V/2qVa7r3lXYYrqDEsXE1+Ho1vw+Nw9isdEsyTl0q6F4VX2rywvqAmWt/Dl3JGIK4/uTl5MoF/nKnCnHbpqs6L5ZtaVXOOf8vVvXjkvWvKXujzsPQ9JvZ7FI3/VtYV0NXF0XcvWfVEHdVULx/N4mbBc9xs4lS9UNQhbHc1dfma0CrOor7vxdWXcQbSq+jePL6XZuvPd0G/XlD2TQ+2Ypa9n1mr0/WMR8Qs8VcefHq04BmbXtcRcKcl2BPPiZ/AgAA//8BAAD//0B9gJq+BQAA" | 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_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content index 8713070b8d..3d3c3ea0ee 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f1f814e70d..e75483d59f 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content index 2bc9245cbf..1b1e401ac6 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index 71507ea108..c552f32369 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: QIs3DsGk11J5GCJj/S5iKEngoRq+nrdZYHMk8sU4gXA= +NodeupConfigHash: iqQyu3HS9EWX0wah8wCb5yoTDYOcqdYWZCud1dPBQP0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data index 36c861f268..36e563f083 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: IOZZwq0vQmyD5xXlgQxIQK+wU3/0+tZVjwQoWioY+ac= +NodeupConfigHash: Os7bU/JHurv4KhpI5nVsiMKCIJsiWdr5kqZKhfvvmdY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content index 27d52803cf..806094cc70 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -197,7 +197,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 30da48bdff..b92ff1f65a 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content index 4efbffef3c..40153fb6a7 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index 92132f3251..5bfef96c3f 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: WYbYhRDOiO97liwzYUdX/7JoIxKFP8v7OsosF/w4qAg= +NodeupConfigHash: mL0CgZH+RQQdMpSzJHSeBoYc0/KZIDb1EncRcf0L3hA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data index 3911ec48e0..bae967cee1 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: prr4YPhRRH5SdPi89IKxEK1XiThRWr1lm26ocUiIPfk= +NodeupConfigHash: lNB5So46mRXw94JTDcu1A3rF8x4t6kzRKR//6GW62x8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content index 67d8999f31..0789f359d0 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 7c9d0ba6ec..8ef39cc4bb 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content index 9549a7bf4c..7ff20d9ce1 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 7fc9f702e2..04781d13ed 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: 123.example.com ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DRoCIAxpxQIUwxN0eT9QnTUkZDuCYe7IFR36p5GEnwk= +NodeupConfigHash: iEB7Ln5BIw81tqpNIz3OANdpuvecdKzzwX840Fdv1es= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data index 848adacca3..ca3d8bcb1f 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.123.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: bpteDDaR4ZeYRWFIw/oOSSQO0WbuqmV15JkwElpcOLw= +NodeupConfigHash: KQ/Dq8rX3N5yHJMyMzpbxoxAfkGNYUdeRvOqAzFrBTE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index c8b89f922e..8cdcee0769 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -188,7 +188,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -211,7 +211,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a1c6126003..284e09af68 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content index a476bad7d9..7480a627b9 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data index 1c83435d32..5dd9a7ddd8 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data @@ -225,7 +225,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -246,7 +246,7 @@ masterKubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -261,7 +261,7 @@ ClusterName: docker.example.com ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: j/HryyCqU8VeX4EAPmUjvNJD4e8X+qDnhRkeL0Hx2Sw= +NodeupConfigHash: B4rKa5UHBPimd0zJlarGgvyZOYJt4DbnnE3JA6+LI+Y= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data index a127743410..62916ea827 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -178,7 +178,7 @@ ConfigServer: - https://kops-controller.internal.docker.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: K1Xwhgmx+E2A1CAAezihtmv2R1GN1zx375FSKsP7I8s= +NodeupConfigHash: zcPFmwdF7f/eNik3wdq0K+kfIf5L1uwT+zs9/HYStd4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content index d8629bc841..4c54b8f418 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -198,7 +198,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d38b4851ed..45ea236b88 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/master: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content index edb3a2bd6d..6fde0b829a 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: nodeLabels: kubernetes.io/role: node node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 673330a9ac..9505805b2a 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 2LdV67Za+XwI/QgANVKHDCGr2X42U+U8jHSr82iCXMM= +NodeupConfigHash: egWYlOz3Z0EC9KSGqYKtFzGTsXtFAeYsn5GCORfBz04= __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 bf3961bdef..b9aa3c6ff6 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: qe7zrCuquuatXA7ZnOau58Stkgj2kCX0CuEgwKlM2cA= +NodeupConfigHash: 049S+Di0UZNVXFYKP1rWeyYoBEUUIyUZRqRVtGWRGQA= __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 a7a129d076..dfe7f7b98d 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: G4OiBZhvkXDDpxTGzVm052sZ0sentez2SaeNZEZNUmw= +NodeupConfigHash: 2BpUwPjNDKcro8FnkbedILsu4B2E9Yw4s+3XuDjZLFM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index a7e30b017a..62319fa1aa 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.existing-iam.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: oWB4OjZKI9D+dbNYt5dqE+HBwhdX6i/6QluH3vFEaTs= +NodeupConfigHash: CkH+amJumpDjeO1MqdOAeaSr5B9jfijrrcje9Cb543o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content index 671a6d559a..5c374597fc 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content @@ -182,7 +182,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -205,7 +205,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 734737c45c..152de84583 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index a5b90ce567..9368a8f8f8 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 6e147e9bd9..bb7bfd5e09 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content index 785b4b0522..3dc632ce34 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 1046e41c3d..482f69dfaf 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: iGciuqPOrec7vUlNTVr+ui58UCMwKgT5v2LH63pQ8Ek= +NodeupConfigHash: b0yB6njvl9fK69k5+Tl5eoZsgzoithdFmslPxFedxMk= __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 de78fa8405..7df987cd52 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: 4N14+D9opx+MdHpzKUlQCUNwGVin4ebZLSIaxVT95Pk= +NodeupConfigHash: ohty4ITWVRZJN7K5P5dslNUtSg0FkS/UgvVJlJblUv8= __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 73afbb94bd..170ee241aa 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: Wxck0+9MLZ6M4JiPYvAQCNCuHskosxQUfB+x0Dy05J4= +NodeupConfigHash: Cu7mP7u7vmOAouEw5NLyDeg7uqYJZILDzgmyVwUr3SQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index bad064679d..d4e2b933fe 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.existingsg.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: +10Agf0cV4TW3ZfTW1rfFj9MqpfZE2JGWmfflWeaQ0c= +NodeupConfigHash: ToTWOpUxumLuqNZw8NUTplxohQi0otUINpmpQP14Lfs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content index eed4a3ee20..74bf0e275c 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content @@ -185,7 +185,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -208,7 +208,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 084d063bd4..c3052a2fc2 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 7890b5a444..5a455c5073 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index ae03cb259c..9667b25e8f 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content index 1e9a5882d7..ba8dd8d188 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 cf47df5ec7..0a329484e6 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 4SekX4naYQ607iwmpJUls+wgigGpx4PRODGEkzw5xFQ= +NodeupConfigHash: CcTwkgwAzn4wcJrP+6nmYq6IZJ58ka4Z84WwinIk3I0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data index b3856b118f..e96886662b 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y= +NodeupConfigHash: d5MqA+uigYNyN9ngxi+YweS4KxwZLufmklba4URBOM8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content index 8dc3a55581..b915662369 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 67cf1b0c32..15589fb934 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content index 4eced620fc..916804757a 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 225b9c9f23..3106fa883a 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw= +NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index b3856b118f..e96886662b 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y= +NodeupConfigHash: d5MqA+uigYNyN9ngxi+YweS4KxwZLufmklba4URBOM8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content index 36372f4ac2..fe706116df 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -190,7 +190,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a79911d2f4..04f0555b40 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content index 4eced620fc..916804757a 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 061bd8083e..6a87f63448 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Yg+cIYg3FAuXTMO1BKGmgl9bq8qmZKeMsgkZyUZQgvY= +NodeupConfigHash: TtMrqZcxn/81EzcGX8nMLY+d/m6xiYoxFwQdEw8EEV8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index 0c47f30335..8d0b2d420b 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.externallb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cfcqTdfAgL9Gb9m9dtKN/FayZkwcXocHL3Mn1KKmli0= +NodeupConfigHash: dJ+dU61UyJaJ66VN9p29dgNctTDMuKHuyTHjK28HSg4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content index 137df52f54..542167af5d 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 3e630fbd2e..c1d1bae2f4 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content index 979a1f1471..6460c57c8e 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 213659611f..c21782eb3f 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 @@ -225,7 +225,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: externalpolicies.example.com ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: blHB21oDGWpFYd+TMKlSdlMlvNR2WDsWTuIedhf6/JQ= +NodeupConfigHash: w2FB4S/PEQ8c3xk58nodE9yzPDRamh9obqceiTU1XTI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index 8b926aef71..b6d8ff252c 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.externalpolicies.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: lMANRIKaIC+nWW4cPKrWi18A/a6YUd1jl1jb6ZQXQV0= +NodeupConfigHash: vx0PmQlG28QvvQS8nBTG4z1jPvaEOMtKDmrwarH6e8M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content index 9f291ae719..ed3fd536fd 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content @@ -183,7 +183,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -206,7 +206,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 6a0e0c7663..351b222e0e 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,7 +268,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content index c1f3e8cc26..9666a8f15a 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 f7be182aec..c71cfdf8f2 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: YQc1hXd7dENaIuohvFyMS05Oqq+XNBdb+hEC6aSym2w= +NodeupConfigHash: FbXFAEfSdtRchzoiMcdpsCpIogjtmwb2YV2U5q3LiPE= __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 0b478bf693..b920b5b3df 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: AxnhFDHVRBOzwcc5uvWbRCbJRwyKK1A7VZIwL14fQXI= +NodeupConfigHash: iXG+AN/N9WvwkZYHu0M7F1DDKthKyAACoL7ty10WHuA= __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 9ce34098d7..bf558b3b33 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: GbzmGSXatkw8CoPgm8c4qAu05A1PvPIlAzfOU1SLYrU= +NodeupConfigHash: lxyRC09AAH52n+TGoyTNL+IBb0G6pqki7kMq0wSpGuw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data index 1b4537c544..4cedca15f9 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.ha.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: EArLqtw1PAlFkT+newQWsPwTQ5fWmRefvdtKj9xqfzo= +NodeupConfigHash: W81XIuHhM6r2FJkKB9ZGfo2rl2IclfJ0PeknqBqWfOk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content index 238f5814ac..3f5f295a1e 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content @@ -182,7 +182,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -205,7 +205,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 62799ca9ab..fdd0677dab 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 9d51ea315b..aa02f1814e 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 872be5caf5..afe015d629 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content index f0358a6f2f..eaa0660951 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content index ecb8ee092c..ae7e941262 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content @@ -178,7 +178,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -200,7 +200,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index db97bed690..00bc47b781 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content index 9270399797..aef921f4bd 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content index 2aa4029210..8f4ac50c71 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content index f879242346..fe1f1308a2 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 2be54644c9..8cd968c71d 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 @@ -223,7 +223,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -241,7 +241,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: zdStJ9CnPdQABjYS4yDuQHfOFH0m/nZn1GGpbiGQm3Y= +NodeupConfigHash: ZcQAqIP5pVRyBVug/TW63Lk4mUB8k43SVU6AeK663gc= __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 3801e0cdaa..68a51ecc9b 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 @@ -223,7 +223,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -241,7 +241,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: ControlPlane -NodeupConfigHash: 54s9ji6iml7v752AUpo2yV7MSA85CF1VGCJipnHUQvk= +NodeupConfigHash: 4gaMIWU6Rbwxfe0N7HVyPNnFWYRp1QV/AVjn/VgYUXc= __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 3a79236768..28e47fdf2b 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 @@ -223,7 +223,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -241,7 +241,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: ControlPlane -NodeupConfigHash: 7XT1qZHSZTU8YokUHquXUKLMqpShOpe/7cNdMOrOt/Q= +NodeupConfigHash: KOC9exX1t4FCY8ln2FCTI+ara9HernwTs/rltSDzhMA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index b30e8aed70..d48f19caf1 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.ha-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PagZ5O7Rk3NltzLMBQgwbOPKC18IlqwMApfvk9IHwqw= +NodeupConfigHash: 2JsOlEJ1IO21F6f1usiyPGShh7zITA3plMcmulzdOkQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 225b9c9f23..3106fa883a 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw= +NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index b3856b118f..e96886662b 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y= +NodeupConfigHash: d5MqA+uigYNyN9ngxi+YweS4KxwZLufmklba4URBOM8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index 10976ed607..3d8d9c3bda 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -195,7 +195,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -218,7 +218,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a79911d2f4..04f0555b40 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content index 4eced620fc..916804757a 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data index 4de4b59857..67ffafb4b5 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-default InstanceGroupRole: Node -NodeupConfigHash: ZsyRXNTcsN02HN1lnql5L9Wfrsx+ql+60AqopDiQcXc= +NodeupConfigHash: alIlLHM8J3JvnLX1c04ciIvirwY+SZ5lRabv27CQkTw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data index 8f2919fe22..f3476eac8d 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-single-machinetype InstanceGroupRole: Node -NodeupConfigHash: ypeDIQWeZlJi16sJs2ROYNRqQPAp1cGb+FNFf5sXHnE= +NodeupConfigHash: C7FBkiMGw2CvMl+h/jBcO1izVh3JoU+wXi2FLfM3hWA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 1b85e79e31..01cc608f55 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: O90Xwsy8GO+sYQm8DcKw4XMTebrvOCgjJVoupSg82jc= +NodeupConfigHash: HB40NGq8es7y6+kYT6SzxCHO3tfW/AApAkdv6SHrb4g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data index 893c78e1c6..5bada6cbc1 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jRcAZM0dfnzEtl00xLvFlgwbttjW8pI3/4OZp8Kp4bg= +NodeupConfigHash: Ky4LNQAwz/l4H8nSY2YGmZUaG0bRUacdvIoE7qSRWvo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content index 647888df8f..d962c117be 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content @@ -169,7 +169,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -192,7 +192,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content index 3a864b35ac..5017b5b2ec 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content @@ -45,7 +45,7 @@ KubeletConfig: nodeLabels: karpenter.sh/provisioner-name: karpenter-nodes-default node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content index 974e749028..175cef0e91 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content @@ -41,7 +41,7 @@ KubeletConfig: nodeLabels: karpenter.sh/provisioner-name: karpenter-nodes-single-machinetype node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4e77bab85f..5c76961b41 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content index 9151fae085..c0efca15fd 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 4962179782..74d6775b35 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 @@ -224,7 +224,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -244,7 +244,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: kduHoVvcEPTEVwhiNbHV4JYFxFa8CEDu8ASeSjXSyjU= +NodeupConfigHash: rZ6RVWavd7OV5/j2+tBLdkdK1D2bzEUesyU1Bx+sMnI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index b76d141179..caf1f66a78 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Ms1i+rXVqBEEA50wUgNWkHYHFRM7CPQsHSZO+l8mIjk= +NodeupConfigHash: G3J4qB2epjAiVVxg9mY/DW225i/K1+XJcmcN59zCIqQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index d5bd8a57b7..8466781266 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -187,7 +187,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -210,7 +210,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0eed6dbe0d..dc80dca2a1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content index 8ddaf0162f..3fb3cc309b 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 597041f7d7..924a87d291 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -225,7 +225,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -246,7 +246,7 @@ masterKubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -261,7 +261,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: TWK6qcwDVWK05V0VoQucWrt9mljH/p+0t7MasEREvu4= +NodeupConfigHash: 8bXUDBN8oDp7KOvDrKM0DTHg6w4E98egZbqdfm0Zq9o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data index e744bb5b05..ce81abb874 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -178,7 +178,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: p1LBFuS6tWxgW/6CVxfKT9IOMipv8QFUuFyBuvAKmdY= +NodeupConfigHash: 3sPSUqrD3UNRxAJOapiRT+mPkxa3jTlQwM3fybZfZ0I= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content index 7943672c54..8083d3ff2f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content @@ -188,7 +188,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -212,7 +212,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 28e461ab1a..855d11acf8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -270,7 +270,7 @@ KubeletConfig: node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/master: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content index d7d8d5ae44..a04ea02961 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content @@ -42,7 +42,7 @@ KubeletConfig: nodeLabels: kubernetes.io/role: node node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e3f23fb84b..97b1f843e1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -224,7 +224,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -244,7 +244,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: JEIeyU+hWbNSAAoJM5zZOirPW7w7s4aNGJTFjPfUWRU= +NodeupConfigHash: 307jSCj6OYd0UHy5j/2E33K4Bko3/ia/zP1SwQ2i6kc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data index 6c70de6035..1aaa629e07 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ahxVk0bZA2yHqMHNw0lEh5h+LORMBPYaycNUh1Ku2JU= +NodeupConfigHash: Qh7cEBuyb7j0PFeuYqICSFPY98rL9u5M6dOs67X/GOM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index b93fc2ed7c..679ffa42dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -188,7 +188,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -211,7 +211,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 686ea75ac3..1c6f9731d0 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content index 705c818d29..6933074670 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index f0e65609ae..932f9be168 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -224,7 +224,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -244,7 +244,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: MmBQSJeBAbsGVrHpHv0xeMgZdh0i79qsvKoLaS/FQvQ= +NodeupConfigHash: JUGToPDpcibHcyeIWfKYIq89KegCyyXAKv0+XGXPfFY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data index 73b1bb6cf2..5ed16e0fe9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 0iyC5pvvzNYY6UjiSI811A2x9oZK+mBc2NTj0gM3DGw= +NodeupConfigHash: FWzNaD48wm+snBDJGEUd1hB1iVj/4dSOBY3mJyx57zE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index 689e3d373c..b416959b3c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -187,7 +187,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -210,7 +210,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index aa8e4bf319..5f9a4dcbd1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content index 32cdcb5e3b..dcd3eec692 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 57be549f18..655ed9dfd2 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -224,7 +224,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -244,7 +244,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LMPqMKlALyb9Q45AivieeinsOPsmEdks15NkU2rlgyM= +NodeupConfigHash: aRp7puWLIxVPNngAzKoQ5S2SrPOUFWJTPgFCSufmBX4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data index d2c0ed30f2..f0157a1f87 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: O8Uepex+P1PHuIjgWiSSCQCFGm4dCvYsoC7ZPLvNruM= +NodeupConfigHash: PHakWTCvcwfaDzkj2lQY3dy609KhY0sVH+IpOQcroCU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 4a66467730..8b1328495e 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -194,7 +194,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -217,7 +217,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e7d77573aa..30423dee64 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content index 4a3ee457d1..55704ca3f9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 91be5afc4a..d837e7d8ec 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 @@ -224,7 +224,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -244,7 +244,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: vnUcWIikdFsAWLuORvNS8pz9qitNDRpD5L1iMk8EDqY= +NodeupConfigHash: /zjy6DoRGLSJQorIGau0uORTLPLq0Acf8uCGp9v8DTw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index b76d141179..caf1f66a78 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Ms1i+rXVqBEEA50wUgNWkHYHFRM7CPQsHSZO+l8mIjk= +NodeupConfigHash: G3J4qB2epjAiVVxg9mY/DW225i/K1+XJcmcN59zCIqQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index 063a62bf00..8dc537c40a 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -186,7 +186,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -209,7 +209,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5c08e40727..4f0972ceca 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content index 8ddaf0162f..3fb3cc309b 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content index 5a533febf2..d98508d032 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content @@ -181,7 +181,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -203,7 +203,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 4af2567db7..63f32e6949 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -264,7 +264,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content index 9675b5dddf..9dbe805156 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script index fa5796af62..41cc01349f 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script @@ -216,7 +216,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -234,7 +234,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -249,7 +249,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: 325mEhvqdIoIxAW2h5aASS/dYODu4lkxfLsIs1cQtAY= +NodeupConfigHash: 42pY30jvbUjyevyabEkevx5jis3pDCep6Czs7KmrTTk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script index 2d4c1c28b2..40c589b196 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RRFxqlOTfXlPy5BuT3DmosHOVwx8B4Yc3HY4TYs+abU= +NodeupConfigHash: g+DAdzuVwV62FlOoJPtZ9xM9ygBZnmOEijZwb0AKQds= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 91be5afc4a..d837e7d8ec 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 @@ -224,7 +224,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -244,7 +244,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: vnUcWIikdFsAWLuORvNS8pz9qitNDRpD5L1iMk8EDqY= +NodeupConfigHash: /zjy6DoRGLSJQorIGau0uORTLPLq0Acf8uCGp9v8DTw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index b76d141179..caf1f66a78 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Ms1i+rXVqBEEA50wUgNWkHYHFRM7CPQsHSZO+l8mIjk= +NodeupConfigHash: G3J4qB2epjAiVVxg9mY/DW225i/K1+XJcmcN59zCIqQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index 920b80a061..55d13d6fa3 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -187,7 +187,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -210,7 +210,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5c08e40727..4f0972ceca 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content index 8ddaf0162f..3fb3cc309b 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ba64b5f805..43d60fabe0 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -229,7 +229,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -250,7 +250,7 @@ masterKubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -265,7 +265,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: YjNsXTKzljGWjbCGhYgI0rKZbmVgoaTwDtgeEGQUOQE= +NodeupConfigHash: zpQADfYPuMopWvx7zwGAiGGoWDzG0ZZEXtYi+njIqvc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data index 34dfde58fd..6dd5713b2d 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -178,7 +178,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: joqP9y/sQWaleutOu4u5b7c4ZCZhWPkdkf6SFIf1Sns= +NodeupConfigHash: r9iOM51+CsfNozVf5pK7R8nXzYmcRewJCLMZfc3TnXQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content index 662b21cfe3..c1c770b874 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -192,7 +192,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5ae8e6d470..2840a6e4cd 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -270,7 +270,7 @@ KubeletConfig: node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/master: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content index d70ca8665a..f1a95711e0 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content @@ -43,7 +43,7 @@ KubeletConfig: kops.k8s.io/instancegroup: nodes-us-test-1a kubernetes.io/role: node node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 7ea4208d10..25fcbeab93 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -227,7 +227,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -247,7 +247,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -262,7 +262,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: GTmyxHLxY4dMkGoFneYGGG5uekT6tZG9n7e3bJ5nbV8= +NodeupConfigHash: IlIQMbnnilXOBrxHOlD5peJpCA9/boNmnFTUaDk8d2w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data index 23592ce6cc..63db3595c7 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ntEKKYRXFHWZew4/uSAb89jQqKCIZUkTulO5nzl7DGg= +NodeupConfigHash: 0ol6SAF7kXIfBDCRgK4W8K/FER+jjAozxvg6tWDSYvo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index 380216cf9a..ea7ac6b46a 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -198,7 +198,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 78175afb14..ab38a07da1 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content index 942ef5b999..b2ef853e52 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content @@ -41,7 +41,7 @@ KubeletConfig: nodeLabels: kops.k8s.io/instancegroup: nodes-us-test-1a node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ae97fea256..859e02d15c 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -227,7 +227,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -247,7 +247,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -262,7 +262,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: +uc3VRHCu1WUn+oRm2fw69p63ItS4JL4RQTLe81WtWM= +NodeupConfigHash: iPIYVnHV3VGUE6wQicukCu7+UKiIZx5ByKQ/9M2hbBE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data index d5875451cb..b848cda071 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: WRhP79F6brGpdVmRzjHBMmKNfrs86MoyVhTf4b2WHjQ= +NodeupConfigHash: M2ozzaOe5Brfzgw2SBuV5g+Jf37NzYIm7717lbVc2nQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index b39d041f9b..ab7c00be31 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -173,7 +173,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -197,7 +197,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e85a8532c4..fb4125a29d 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content index 19865258b3..9da5f52fe7 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content @@ -41,7 +41,7 @@ KubeletConfig: nodeLabels: kops.k8s.io/instancegroup: nodes-us-test-1a node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 791c1a018b..b8d772492c 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -227,7 +227,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -247,7 +247,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -262,7 +262,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 1mcBMqcOG/8x5FGk9YjYGO1pZdxGc3bLXHquWHOtSI0= +NodeupConfigHash: 6t/GWNntsnf1AlLasg6TBeppMaH2NVg4NUik3SznZvA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data index 76d2b62d53..7470e3cca6 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: XR2CT363R0cxF08p+6LUoWc7nNCWGboqAFdjvCW5Wus= +NodeupConfigHash: +pSPPMrLxPV0U/xLVb6g3rAHZZVZv0A66Sle95NWgtc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index 0797f17788..518a9cbd30 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -173,7 +173,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -197,7 +197,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0b26f214cf..e2406b164c 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content index f792bcab84..4e2347682a 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content @@ -41,7 +41,7 @@ KubeletConfig: nodeLabels: kops.k8s.io/instancegroup: nodes-us-test-1a node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 153bb887cc..f1cdea1597 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -242,7 +242,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -257,7 +257,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: scwzgK4UiJl8mANofnjcDHsjbHQQNGda9MDQDcUStIE= +NodeupConfigHash: uQmaxBDLrA6ekU6l0Yxl2IS3G5+JQJx4fqkC5/ZkqWY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data index 8cb35962c2..c1768e095c 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: itEap0izxTtrfCRWU53FXVF/HWUsOjLQV3W73GHzhyc= +NodeupConfigHash: CBB3U1evV35AbX+K4adLwtT+0BlHoohLZphxatrLb1Y= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content index a28447354a..970e0deff0 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content @@ -169,7 +169,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -192,7 +192,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d5fc2a23aa..94efe08f3c 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content index 4382495503..75a6400ce6 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content @@ -42,7 +42,7 @@ KubeletConfig: nodeLabels: kops.k8s.io/instancegroup: nodes-us-test-1a node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 722e9b74f2..e85b4071c9 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -227,7 +227,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -247,7 +247,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -262,7 +262,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: eqXdxQZGsWxsNId4XBJahfVxhKrgVJo0qFk1J8g+Tuw= +NodeupConfigHash: fNjrWZlEy2F0+wcQPDAqSrbSOl8xlBxY2K/9i1kv5EQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data index 9f14e77fc8..59a7ea523f 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: QY3CF/l6Jra5wZwacioPoQNgup+fL+8BZ/O3yc7cN+8= +NodeupConfigHash: Nx6srXc1G6kxTRqEjERq/2YsChTJq0MhV9G2etI42UA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index accee8c53a..4a2d107f8c 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -172,7 +172,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -196,7 +196,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a8879e9f3f..fa39732e43 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content index cf3925f01c..950d50f82d 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -41,7 +41,7 @@ KubeletConfig: nodeLabels: kops.k8s.io/instancegroup: nodes-us-test-1a node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data index 16cd4c455a..c7333d4142 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data @@ -234,7 +234,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -254,7 +254,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -269,7 +269,7 @@ ClusterName: minimal-etcd.example.com ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: HCk88G/gHWHACqhfNtkOfvtPkwaVOHxPr97ixvqV19s= +NodeupConfigHash: oISD1zRZMir+06/2Hw13WWwCfPvnHOTzVwbRlDPZEoY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data index 916653bd8f..16c0dba30f 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal-etcd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: aGg+Xrg2ZWjlOGywoZzIWj/5EYBnVaC+v4Lk0BepIkI= +NodeupConfigHash: V0GlrSEd75q8PR8ksim10tPdIU59CgIUQRmleJZZHQ8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content index 3bf165d3c1..870c75f302 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content @@ -173,7 +173,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -196,7 +196,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 450ff7fc6b..9c82e3752a 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content index 0f9095c708..e3ab51b52c 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 7deef47c8d..95488ec858 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 @@ -229,7 +229,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -249,7 +249,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -264,7 +264,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 4SekX4naYQ607iwmpJUls+wgigGpx4PRODGEkzw5xFQ= +NodeupConfigHash: CcTwkgwAzn4wcJrP+6nmYq6IZJ58ka4Z84WwinIk3I0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index b3856b118f..e96886662b 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y= +NodeupConfigHash: d5MqA+uigYNyN9ngxi+YweS4KxwZLufmklba4URBOM8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content index 72824fed91..b9a374fed0 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content @@ -172,7 +172,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -195,7 +195,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 67cf1b0c32..15589fb934 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content index 4eced620fc..916804757a 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 38c5dd0014..d4310a4cbf 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -225,7 +225,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: yZpD1R5xTpzBcEeyoJbFsG6pbJgnAB3DDzAvTWAb5L8= +NodeupConfigHash: wQmqMo5nckX3lcvPTtuyBIIiZngji+sdROxEVj9KrxA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2d3546f23e..8c37c755f1 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 7gBbN1io5bE7oczyoIEcEF86p4AvABPE7hormeyJGtw= +NodeupConfigHash: B4gXj/xhjCF0icLhKwkufLmyaRg06oaNYnTwQhigwNM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content index ea4cfa5c10..72bd7f6c8d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -198,7 +198,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 44e2f933fd..8fc41b5433 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content index bef9a7a48c..ebcb8360a2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index c4bd803b3a..e85c6e957e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -225,7 +225,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: imFrt0N3J/RlGkI0MAiUUHLjTYE8FsdE2LuOin8PzG8= +NodeupConfigHash: AaHEMCqR1vO/F81lpqM1P/XS4RMkGW7gU7xW9uYsPME= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 1802071a55..8470c13c45 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 8Drpu/riG04+/Rnj2domVAEgfNJ59lvX/fPhT5mLBcQ= +NodeupConfigHash: bE/FzD/ESVFWG9OBVHh3yHF66cipT3RQWYR7iWmhDhs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content index 7426f737b1..82f92431e4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -198,7 +198,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c396e4eb60..ee3794f3d8 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content index e999416b65..80742f7695 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 66fc6ad7cd..10f86caf8f 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -225,7 +225,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tzyDb8RW5zKmocwRToo4rtFUkyyMZyU+KK+J/Yhlflc= +NodeupConfigHash: JHPpfbsIPJTW0SP5UW6NvuEJ/h2i8tdpIXSqfezNDAk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 3e453194e2..da93677311 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xkq6xvdWZJjO91MGloMgnbNQU+R0KylELTgwPQ0wvKs= +NodeupConfigHash: wLWr2VzvYaaIRKAaHpdv/bB8MfWkeSizcsk7F/bCdqU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content index a63bcf4458..2aeda6960c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -198,7 +198,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0f28a30d18..a559bbcaa7 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content index 25727553fe..918d724193 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 66fc6ad7cd..10f86caf8f 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 @@ -225,7 +225,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tzyDb8RW5zKmocwRToo4rtFUkyyMZyU+KK+J/Yhlflc= +NodeupConfigHash: JHPpfbsIPJTW0SP5UW6NvuEJ/h2i8tdpIXSqfezNDAk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 3e453194e2..da93677311 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xkq6xvdWZJjO91MGloMgnbNQU+R0KylELTgwPQ0wvKs= +NodeupConfigHash: wLWr2VzvYaaIRKAaHpdv/bB8MfWkeSizcsk7F/bCdqU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content index dea8e34ac5..5ce31603e1 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -198,7 +198,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0f28a30d18..a559bbcaa7 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content index 25727553fe..918d724193 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 03069630b0..9e69fd780a 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -222,7 +222,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -241,7 +241,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -256,7 +256,7 @@ ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com ConfigBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: AbMATywXLFMOSd0NL+yj++qWBnYERmV4eESLYWrWJZg= +NodeupConfigHash: 7q+QZYqAxtyVkoVfE2mYSA5fqApfkreAAcSQ2mZZgWQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 4249754bac..cdca5e889f 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -138,7 +138,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: GfZ5rPW9IA1otaZJEQP/wNLJJeTyQTCAPWeBKC7fp2U= +NodeupConfigHash: rWIdXWhwjO5oxyb1JlcXoyi7ia//pFoLMcZd3xMx2Lo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content index c279b612e7..c73e38b8ae 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -163,7 +163,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -185,7 +185,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 1290ab2505..d3c6168fe0 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content index fbe80cc113..2af02e406e 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 14ad9c2b3c..07df3aaafb 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal-warmpool.example.com ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: RgOSmG2PTd7Yq18sy3UJe6jhParDo6XPqYzy3XrYg6c= +NodeupConfigHash: xOZ3B8wnlnKtr58wVR/LeI5N00SY6xInI4RdNngMeQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index ace89ff1c1..b4facb194a 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal-warmpool.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: n2pd1x+RceYtlzVyoiNOxnGejm5hoU5YTceFEy1yWxc= +NodeupConfigHash: Oqy9xFkPV00p9PKfm3qICiwEyR5FhqYga3+aNIlwRzg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content index 916e88743a..8b1295882f 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 46530cf546..252a98dc50 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content index cdd48c9430..dd81c876cd 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content @@ -41,7 +41,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 76e0a31e42..5c426ab147 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 @@ -218,7 +218,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -236,7 +236,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ls4y0MnitZ7M7k7jjECDzyE6Xv6RkQ2wXQpYqpVOoEM= +NodeupConfigHash: Fpnr65NWckLM46Jjfpf5NOia6oLMjoIrxg6dv04NTFU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index b1df303300..a2f4b3881e 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -137,7 +137,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -175,7 +175,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 72Ms8WK/aTXRvvHcrobYf2ucLeBTbVtnMSVuYeFBbIY= +NodeupConfigHash: wDe2vIRRaH+OpMGTjXZMklLt6o/vWq89xr+AaL4iJyo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content index 10c5c2c39f..f54a841af1 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content @@ -159,7 +159,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -180,7 +180,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 61aa0bb483..c5302677e4 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content index 86b18d04e4..84cdcef01e 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content index e6a9f21653..5d213e7e07 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content @@ -162,7 +162,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -184,7 +184,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 7acfcd8abd..b03760976b 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content index bbeb9faa1d..68ab716a8f 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 791fc77078..a42b32f213 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 @@ -215,7 +215,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -233,7 +233,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -248,7 +248,7 @@ ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: NrrSCmtp2nI/oI8RJKL8Rgwr02lpU4phJxXl6yMlTTw= +NodeupConfigHash: A129imrAo4mFxX+l2zZ8EBGD6lWhhZO0nfGzqyqiFIw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 11e67b6dbd..1a45a36342 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: +WsOVIuidJ9JnEK/IKV6qGOMy2xSbEAPcBY/Cit2A7Y= +NodeupConfigHash: RPnDfBlPDptw8NH+jcG6Jr9abaZyE6IhgqYLSZndc1w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content index 946f2d065a..f7040d1ad0 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -163,7 +163,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -185,7 +185,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 3ba6a71a16..f08a796e2d 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content index ba90d5d4cc..fd179bc30d 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 77505f618c..4630c853c9 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -215,7 +215,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -233,7 +233,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -248,7 +248,7 @@ ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: M8i+AXNikNzSB1HqtiGs1zSl1TPOaPukDLUahmw9viQ= +NodeupConfigHash: tv8bxYz1hCsk9K+bsU6IOETGMCLNoaPXKHcH+5FtE2M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 033c0d914a..ad8a2a6dbb 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 1cfYdFzwbUwENfJbW6MVxqxQILfQma+cm4Ca2e9LszY= +NodeupConfigHash: /+jPDzQwkzlkecuuqA9M/pnnQb7W9jwfJbaRe+tweeo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content index c807ef066d..0199436033 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -188,7 +188,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index e5924458ee..348e5f44dd 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content index 86a1ac8583..3af59b683b 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script index 024b5618c3..137465e284 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script @@ -215,7 +215,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -233,7 +233,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -248,7 +248,7 @@ ClusterName: minimal-gce-ilb.example.com ConfigBase: memfs://tests/minimal-gce-ilb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: uLvfuqngiDIxFtBYmk91Fc4s5+fyjM368nDFcNcnYYw= +NodeupConfigHash: kYDxi9CQz1pOsyZ4Cu8AttY3tzNaUNwqWdxl+M+T8Zg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script index bafd845817..cd972120f1 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-ilb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xVCn7tvpx0V7qytFOAXp1HFrvn0NhsHfK8rxNFB3ko4= +NodeupConfigHash: Kmjr7u3ZLTHsyplxGpDcS0vlsk4UwFdVsH1i3iLLEZs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content index 7b530b6d3a..ceae02c5d7 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -188,7 +188,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index aced80856b..02ac838090 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index bbb4c3638e..ba52cf9193 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 3b32fb336e..8bc09848d8 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -215,7 +215,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -233,7 +233,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -248,7 +248,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: jT+AhIAfUuvNLQ+UiyduEOMzaqPcBLewzbuLTIpjGb4= +NodeupConfigHash: +O6sjXij0Y2eoc76w1YtPUDAxRfSbDQnvUOgq9x7NIw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index a89a7043d2..678251b95a 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 45wSOgsSDfRQ67U3qAfamGSNr4r0USMR8SL/dnW3c6g= +NodeupConfigHash: nIQ/4VIoYWiwQvI4qLGzoXNIXijfXqsXp/HXME33Eyo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content index eecce816e2..a931495da0 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -162,7 +162,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -184,7 +184,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index aced80856b..02ac838090 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index bbb4c3638e..ba52cf9193 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 3b32fb336e..8bc09848d8 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -215,7 +215,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -233,7 +233,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -248,7 +248,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: jT+AhIAfUuvNLQ+UiyduEOMzaqPcBLewzbuLTIpjGb4= +NodeupConfigHash: +O6sjXij0Y2eoc76w1YtPUDAxRfSbDQnvUOgq9x7NIw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index a89a7043d2..678251b95a 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 45wSOgsSDfRQ67U3qAfamGSNr4r0USMR8SL/dnW3c6g= +NodeupConfigHash: nIQ/4VIoYWiwQvI4qLGzoXNIXijfXqsXp/HXME33Eyo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content index 04cee6f3eb..4bccb0fd58 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -188,7 +188,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 09772883c6..5c0ff4aedc 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content index a0f18765c6..59010d2b12 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script index 2c1c10ce56..591ddfa012 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script @@ -215,7 +215,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -233,7 +233,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -248,7 +248,7 @@ ClusterName: minimal-gce-plb.example.com ConfigBase: memfs://tests/minimal-gce-plb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: kU6IhwwBg06N+xO0O0+aA16WKhhuh1m0FMOESJI5dRo= +NodeupConfigHash: jNPgRRW2w9KMhwaiHGyRl/mrhYxvO36EEvvLH/nrnp4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script index a9c1890110..90f3337d67 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-plb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: YOvsA0LLKU5nLtmCUjrrWuUDNhBtTgpj9A7VxgZPUCM= +NodeupConfigHash: MvQCIva6H9JLLSgoehcswIey3EWErZlnHKSFGhcvwqI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content index f4bb421179..5a7d1237d3 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content @@ -162,7 +162,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -184,7 +184,7 @@ spec: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 08a6a8d506..f1ffca7ca1 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,7 +263,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content index cf3e3aa13e..c37e388a9e 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 1311057e60..61f8ba179c 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 @@ -215,7 +215,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -233,7 +233,7 @@ masterKubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -248,7 +248,7 @@ ClusterName: minimal-gce-private.example.com ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: dHTgqt70/+OXIbarfSC6TPRKjU4nPc+Z1yzRUnKfnpc= +NodeupConfigHash: iN67c4k7pZ5i7Dy/amchSeb9VswSpqKj2q1OEYVFV2s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index 9a98b8509a..1565a0cb98 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -136,7 +136,7 @@ kubelet: hairpinMode: promiscuous-bridge kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -174,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-private.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Y4siienVMamIm7jhv4/stUoh04gJFDsVOcZVPGmI6zM= +NodeupConfigHash: nNOr5VMgckDCWWgLGHg+c/4qtpax1NgVjJ2uHNEVGAY= __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 9515ba8ee0..07ead208be 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 1PUiVdbKfNt42heq9MedmlqOXRuFEOEuLasC7TWJIIQ= +NodeupConfigHash: loYmiB+q6Y7r4N08h2tFvrzfPtOEg2/7TLjXb2v0AP0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data index 72e57c1f44..d6a5aca091 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -154,7 +154,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: QwPtzN3lbFjX5VAwxKkZbAUSz/2M2nlrK9yds8Obh6Y= +NodeupConfigHash: IuHgNVVgHVIxYm9CZevCcgAcOs781mWev0vWD+NhSYM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content index d42db346c9..51b8ff4fc2 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content @@ -165,7 +165,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -188,7 +188,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8a65f175f0..509d38dde5 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content index 95a7c873d1..ff526bced3 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content @@ -65,7 +65,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index baf0b5760c..8bc7072e5b 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: bqgzaAoMjqe4ecCVWbXyw7bMwmsOL/mtAdOGbCRWrzs= +NodeupConfigHash: rRbRk1RbbVU1R+fChoKLSRZy/0A5fdx1iSrheldLm8s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data index 72e57c1f44..d6a5aca091 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -154,7 +154,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: QwPtzN3lbFjX5VAwxKkZbAUSz/2M2nlrK9yds8Obh6Y= +NodeupConfigHash: IuHgNVVgHVIxYm9CZevCcgAcOs781mWev0vWD+NhSYM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content index 6c72e3e772..5eb507786c 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9d968d517c..43f9c5e340 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content index 95a7c873d1..ff526bced3 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -65,7 +65,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content index 74467d0f3f..9f00c64148 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content @@ -155,7 +155,7 @@ spec: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ spec: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content index 8bb2a2cb1f..007b940957 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content @@ -260,7 +260,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content index 8b460c419b..a6dccba954 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content @@ -37,7 +37,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data index 429078bb0e..ceb40bee5a 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data @@ -215,7 +215,7 @@ kubelet: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -232,7 +232,7 @@ masterKubelet: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -247,7 +247,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-fsn1 InstanceGroupRole: ControlPlane -NodeupConfigHash: 5pZ6X4hcSGaih6FFJoqIJ6bPdH+r0ZpGIKKPnvGriEI= +NodeupConfigHash: YzyTWIAuYX4R2Q2kWcgIiymNyLQf3QQkjFkcvHnDRM4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data index 45961afd4d..b8c578e2e8 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data @@ -135,7 +135,7 @@ kubelet: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -173,7 +173,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes-fsn1 InstanceGroupRole: Node -NodeupConfigHash: uf+DUChkf7KJEiWf+hyWBiIMG/51VD78TpguhJGGFOA= +NodeupConfigHash: 1RsQ36U1h3Aj+sJ4ESSsoZtsKZXvAtUgF9Aez2VkQyM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content index c55e2f24a9..48b166ebce 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content @@ -149,7 +149,7 @@ spec: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -170,7 +170,7 @@ spec: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content index 386f6613db..77c6663113 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content @@ -256,7 +256,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content index da014335ff..72188ca837 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content @@ -37,7 +37,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data index ded26f2256..ece8128420 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data +++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data @@ -217,7 +217,7 @@ kubelet: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -234,7 +234,7 @@ masterKubelet: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -249,7 +249,7 @@ ClusterName: scw-minimal.k8s.local ConfigBase: memfs://tests/scw-minimal.k8s.local InstanceGroupName: control-plane-fr-par-1 InstanceGroupRole: ControlPlane -NodeupConfigHash: jKEtxsHZO5+OHL66/MYUPT34T8z6YjE5BJVgH6JYxRA= +NodeupConfigHash: FmRPx+bq82phZfN/chCDgrJSYQWtID17d9stamPAz6s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data index 17a67b8c05..5733aa7836 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data +++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data @@ -138,7 +138,7 @@ kubelet: evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -176,7 +176,7 @@ ConfigServer: - https://kops-controller.internal.scw-minimal.k8s.local:3988/ InstanceGroupName: nodes-fr-par-1 InstanceGroupRole: Node -NodeupConfigHash: l6ITXtzPONIgO+uyEAe0rYXGYgBVjPkJ9/Ov2xKxX/U= +NodeupConfigHash: gkG+XyeiX3GAi1s4adzicFnfOkZ/AxpBl0ii4qxaWAs= __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 1a9c76ee1e..14ca2ced25 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: M0fBsZX0zp0t/fhJEfzB/RlLNlE331COokwrJ6QCRB8= +NodeupConfigHash: I/SReCbiEC/Uefzr72HLUiBFpWka0K0zaPEuXazDoJg= __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 6840a0b0a6..f13be00295 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: O+pGStyQXJ7Qfrl4xCQf5gb0fmYT0l5/S4vkYwME+VI= +NodeupConfigHash: mLvCL6PfGuOpkLfrqaOlUgNpIh/VBA9eBl2XT1mFlRE= __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 e01672b0fd..7d3c9f0d7a 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: VdmnVBn9Ts2c/2AuX+c0vivj5J6m470bVQKClVpm5bQ= +NodeupConfigHash: WTGuLQGw2TmyfF5iAKQiz4OAdQ3hYWFkGCvlrbvAgq0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 1c350ba16d..fa15061fcd 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xav+zYd94DNkY5u0fKxaOYL/H78vCaxOMwSYA8mpezg= +NodeupConfigHash: 2FpLwwWsxxFuGBArRiXDLrpOU0CLc4uRJayvrANXob8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content index 864dd32411..8e32766e9f 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content @@ -182,7 +182,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -205,7 +205,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 404f687373..d6a0f5c712 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 0357033155..1772e12a3e 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index cc0dcdfd4c..fa48620c5c 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content index 5ffcdbdb9e..f892bedbf3 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 1a9c76ee1e..14ca2ced25 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: M0fBsZX0zp0t/fhJEfzB/RlLNlE331COokwrJ6QCRB8= +NodeupConfigHash: I/SReCbiEC/Uefzr72HLUiBFpWka0K0zaPEuXazDoJg= __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 6840a0b0a6..f13be00295 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: O+pGStyQXJ7Qfrl4xCQf5gb0fmYT0l5/S4vkYwME+VI= +NodeupConfigHash: mLvCL6PfGuOpkLfrqaOlUgNpIh/VBA9eBl2XT1mFlRE= __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 e01672b0fd..7d3c9f0d7a 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 @@ -231,7 +231,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -251,7 +251,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: VdmnVBn9Ts2c/2AuX+c0vivj5J6m470bVQKClVpm5bQ= +NodeupConfigHash: WTGuLQGw2TmyfF5iAKQiz4OAdQ3hYWFkGCvlrbvAgq0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 1c350ba16d..fa15061fcd 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xav+zYd94DNkY5u0fKxaOYL/H78vCaxOMwSYA8mpezg= +NodeupConfigHash: 2FpLwwWsxxFuGBArRiXDLrpOU0CLc4uRJayvrANXob8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content index 864dd32411..8e32766e9f 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content @@ -182,7 +182,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -205,7 +205,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 404f687373..d6a0f5c712 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 0357033155..1772e12a3e 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index cc0dcdfd4c..fa48620c5c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content index 5ffcdbdb9e..f892bedbf3 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index b934124325..47e3c995b9 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Olxo/iCnCYjoKdTjwWRM0mlqerLkrYSB1yIDpEQkTxU= +NodeupConfigHash: zk+nda7ekqigl4j2xjDbA5M1HPNDwlR/gnn2/ghL5vs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index e5f2467b76..6f143978d9 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: LHbtLGBKSJGZKF6vJGwgd6QF2o9AzOI4n+xSkyFxYGA= +NodeupConfigHash: 6sNdn/+HCawooHLYubppIqQKEASpaeLuiFLfg4Yn0uI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content index f1fbd1a5de..baf2946f7a 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -167,7 +167,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -190,7 +190,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0b8afbbb5d..127d1ddcb6 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content index 20ba32cfb2..cca1eeac33 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index 9b2ad589a3..9d3a8f6f0a 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: HawEqLsO5KmxEyWacLleRPUrvc0Kous+MaYI7ZUTGu4= +NodeupConfigHash: PZLkFB/7xPa0fR7vUaXSHYdlJ5ACxzrKj7FEEJzjGVw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index e5f2467b76..6f143978d9 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: LHbtLGBKSJGZKF6vJGwgd6QF2o9AzOI4n+xSkyFxYGA= +NodeupConfigHash: 6sNdn/+HCawooHLYubppIqQKEASpaeLuiFLfg4Yn0uI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content index 37d129cc32..466dba8abe 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 75d5872574..dd97b35152 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content index 20ba32cfb2..cca1eeac33 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 6f5b242a40..3097e70d7e 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: p8BaPZKCsyDRs02crWh4A2YfLaKpY3ZBMVpIDHF5NZo= +NodeupConfigHash: 1g1QOOOGCRlpxDMXUi5k3tp7uIT2RwpYgwEkr1uyCUQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data index a8c7e23a26..3d14ce76bd 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: oHu0Ffuu25EI2ZdD22GmczarTzEeIuMwpZVyLDDn8vA= +NodeupConfigHash: qrjTVQWa0mziCNqkthHyZIjFDGGFjDpZZx/GUzbMjL0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index d0e89b8b28..fe64c34825 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -169,7 +169,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -192,7 +192,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d982d6e953..9d24cf15fe 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content index 499489544c..ce84f06a68 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content @@ -41,7 +41,7 @@ KubeletConfig: nodeLabels: kops.k8s.io/gpu: "1" node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 26e1626e35..180c9166a8 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: private-shared-ip.example.com ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: TXTZwquCAH62q9FV1qoeIkwXL+YVXT2D+oL/bsFelG4= +NodeupConfigHash: IBIiZ4EJty1b0DspGXGLBekYn78C1WdCDdmH5oMay54= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index bff3e87c10..9a3adcfcab 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.private-shared-ip.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: csAOVD7MKX97FOt/YeL+EIBoLA5fN9ZTuw6Mjd1dRcs= +NodeupConfigHash: UAQcdd+EtibcDbzwm6cw8laULAccZvVQtrCD1u4p+vM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content index 8490b4471d..78a1d334f6 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index ea5f7bc4bc..f28f3517e3 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content index b59bd24290..6b4b5a003a 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 36b96bcf5d..0a8232c529 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: private-shared-subnet.example.com ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: emtryZbJcW3ux0E+L3rrPHwQ8clYD651RZ22ZrrSJz8= +NodeupConfigHash: 2MgFGmPSSZ/mq1EM0z3ljMrW+244FlfJRKb0jUSEsR4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index 707fdf5153..0636296521 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.private-shared-subnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: VTTbHs5+QF7unbkMYiy5wMUPAqurejfI5y4gT+BAfc8= +NodeupConfigHash: Wc8PxE+VOq5tnfQ84kNy6BrWv/szadKfPUahdbPFbiM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content index 5c34d9b0d6..d7523c8b7e 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e4e6deb395..37971b46e9 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content index bb613a4ca4..813e551fca 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 3c0f015439..caa48dea62 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privatecalico.example.com ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 4zAKJ4H8rG7iKUSBFammVc6XWE1hwEnpSrGzgY6+UW0= +NodeupConfigHash: SEyXC5Crgh2KaszgK18Rwf4VwndwUDNgwyVffzJd7F4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index d7e06a51e5..685a3a87b9 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privatecalico.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ysqqSsFhy64tzvCgMd2mxETrR2zrJwTfwWBxH6RMBtI= +NodeupConfigHash: jPMMcgO9MooX1PDL+eH7D5wM9zDXZGvsDJo90yav3pk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content index bfee9c6a3e..1b1cc91aba 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content @@ -169,7 +169,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -193,7 +193,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index bc9123a537..5a10881a30 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content index 25c2c8e0b9..50914d1d53 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 739b76072c..45250d3247 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privatecanal.example.com ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: SAQArkSz9fAJet9q25bXhmh9vw4ha/nKQB7BZ6By3pU= +NodeupConfigHash: y+P15y/QlCKDVIsk804ow4aatcG0A5dY2eNxiaRuYv4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index bcdbe5d3e3..72086bf48d 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privatecanal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ddMndU7m0axkgUrwLCWKWIAEIB+w/Lsp1nHhI5Gv9OY= +NodeupConfigHash: vsLHkpVfA1+Fu7/PsV5uLJYeHB+jup79EN1dHF6JdSE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content index 18cc55910b..7f5137b8eb 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 05a1314a80..20c3c1cc4c 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content index ec1c431536..77c0aa9ac1 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 105de6b13c..98a87ad745 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: I95bPNMeuAg62sR/yCtXsBnuOsEsbUmZIcezB/O39p4= +NodeupConfigHash: igYk3HfUtIJRB0NS1LVrozpy1nIB5AVOU6ZdcOR9eKY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 297cee7675..d3acfb7c92 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: u6FlpkakLgdiBjQHZ4+S8DBj+rWFLoWX3vSsOzc5UHM= +NodeupConfigHash: UBGltvoAiEEzA6EWyV50VtSiZaogS6tWvyjf7am3NPo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content index e7c2d2b595..fe98841f1b 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 7c92603352..08636d60d1 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content index 353d9b47d5..0ca9529f99 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 96f96019b8..b142f2cea0 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 8Nxi5ImiyQVfRbrQ5TyY3tAUp7LC3GQWsyTc2GU2hls= +NodeupConfigHash: zb5IH6b2AqHrXvZ3bwBT53VnXhQnE/6PAPj33mBBf9Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 9510908ab3..b62cd33a5a 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: nU0ehjpyBdYrrSIWsywVI22dHapb31wW6YxeP8vipyY= +NodeupConfigHash: DM4AysnhH5Yro55zXT4PBLLu/4Kl8RLIVilih4T1xLk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content index 10e1f0f45b..b6543f7bbc 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 65dd1d4708..3b488d6efd 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content index 62cfcfca4f..988a70195f 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 847e4ebcbd..4229455478 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: /oElx9KwUPLY653eQolwzoNw8jTORn9KbvrOuZby27g= +NodeupConfigHash: 1J2TdtHBgQxKE2CHnGqGZUoP5dHelG4leq3P4nfDhrw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index f92f7d677f..bb5fb3c13c 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ifW04cp9jbM/63UhQJRIDBD07ciy75nGK0TPJBD6pD0= +NodeupConfigHash: SuPl7c1/cSTBnYGP/FNiRnWQnbYycOIUp6fw9p75sNA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content index 00b25aad85..54fb8dd212 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -171,7 +171,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -194,7 +194,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a03c713b5f..a144702263 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content index 9fad219c09..c8b72d4dbe 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 42b14a36ff..ed3291baae 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 @@ -230,7 +230,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -250,7 +250,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -265,7 +265,7 @@ ClusterName: privateciliumadvanced.example.com ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: BwyH7+97sEYBSsf9TfipcV0wiD5I6bhSIAjwhUZAiMc= +NodeupConfigHash: Ynj2EN+tUO5YXTMDAiuRyYH+TKe7JCueY+Y1pxAZwYU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index b63169d601..798e658060 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privateciliumadvanced.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: DbJny4v/z3uSq6eN6r7TNpZd0Sms0pal8OOhTRsztzU= +NodeupConfigHash: 6uccrE6GdYrCQVv9a/2BvDE6zyuVsWiQRttZWj3hOBs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content index d76523dc78..6d353071f6 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content @@ -181,7 +181,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -204,7 +204,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b46fa0966b..31ef178b17 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -332,7 +332,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content index 66a0ea4675..d2eb6f7061 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content @@ -60,7 +60,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 3dd2bd4ed1..bc931c86fc 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 @@ -224,7 +224,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: privatedns1.example.com ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: sPTsUjcrPcWUj1bKt0t0dZGon6wWe7EjNC1UkqGl4wg= +NodeupConfigHash: o4y8EmBv12exLhOyO7r8fq3ZdF2AY3v3yy1QOGdT91A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index e769f0548c..8779f9b0e4 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -178,7 +178,7 @@ ConfigServer: - https://kops-controller.internal.privatedns1.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: L1Tx70p0KK5EYfSzoaL5/OEoQuPibe3YPwZ+8DgF+HM= +NodeupConfigHash: OQVolkOKHllG4ToRe+nK5ATq+1QMsWml9ZItnjOTTNs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 81786a144f..9c1e8e2fdc 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -162,7 +162,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -186,7 +186,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d5b6bb1ef6..6156f2b275 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/master: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content index 4bae3e075b..8edb7a75bd 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: nodeLabels: kubernetes.io/role: node node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 9537552ae9..bd2c8bf144 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privatedns2.example.com ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: nwRh9CIwzGxAsG0TVkf+8BaZ130jlvkuCqvunr1j/eg= +NodeupConfigHash: +858DCqczlkNe7+PP2L6tRIazSbD+CqA1Zay7LVStkw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index cd4841be40..c64ef7d91a 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privatedns2.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: TKAsYEgaA45kLtL5B1FM0UwIXanWEcqd2pZpD/Jtzmw= +NodeupConfigHash: TVPu3gVGoypumBUmSLX5j7xBskmvJ2pu0PXlxNuoDSU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content index 302522fa0c..071306c409 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 20c08b2aea..f5b08e4ed4 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content index edf2972ef8..7beece935d 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 133ee5326d..079affe517 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privateflannel.example.com ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 1adoM5g8RUNJ67zEEJFP6vF9hd53GoFm5k7JMHef1Yc= +NodeupConfigHash: xEDUxV9E3VC0LiNTo7GZ4ke1T28ZrASs66EXmM5Mrvw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index 55a47fb8de..4274208434 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privateflannel.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: J4Gf0utPR/kWHxp6nrzgkgIEezjf4pP+cAWzAvqYH24= +NodeupConfigHash: uhETzbRgIEh2PPiPFgEsOIuV4qLj4N3ETVR9JBt6YDU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index a26695b01f..d2aa085652 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5ade80d071..7a0e7efcac 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content index f159a368ee..9c3c98952c 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 e82e0ee972..267a74b2f2 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: privatekopeio.example.com ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tufJzrMS9D05lbNFs68faA6BeSf5e/jDBFuSij7u0qM= +NodeupConfigHash: ra5Gs5+TC2cD3Mp9+76oQw7S0zPIN0wL/Ng8GHqokgk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index 36a6700fcd..d034d1ee70 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.privatekopeio.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: lDHNbpYixaLfjQ5L01+MLfh7H7WNFYyyYEeeV87c9p0= +NodeupConfigHash: c8XIRJdHf/n8gNcEexfrO88hluwwiG5rTElr1VTwOLw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content index 49a78c16f8..2e577d09a4 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4641707850..a44cdcf7a5 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content index b539acbeb7..8aba94f7c3 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 0d9d4e6a3f..5eca2f99e5 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 @@ -224,7 +224,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: privateweave.example.com ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: hxBY39lKI4eo119+5Wdid/+qy/X2MNMJUe4BZnz2C78= +NodeupConfigHash: rNA78SiuIXSsxqg8VR3v7nVCAvxFd4tXGvmJT5ZFR7s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index b344d448e0..1b23b4664e 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -140,7 +140,7 @@ kubelet: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -178,7 +178,7 @@ ConfigServer: - https://kops-controller.internal.privateweave.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2zpo3YGwUiYABue1lgLyAmznhfR9zvPyYJkF51jYcps= +NodeupConfigHash: JWsz1eFTXS3WjLjgzoAxb/ne6UMcpoXyi7sCh/C0SzA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content index 95b612229c..def14b607f 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content @@ -159,7 +159,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -183,7 +183,7 @@ spec: kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 52cce6d968..0e691adb2f 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/master: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content index 3a001c6af8..eb62622a0a 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: nodeLabels: kubernetes.io/role: node node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 b8cc97cc54..81ff441f3e 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 @@ -224,7 +224,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -244,7 +244,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oiGPzJUUmjMyrL/5MgIWB+8SA7Wb0fCZ+AzFdpwE5rM= +NodeupConfigHash: Jm1iFIf670x6t+W1MrRBb8Bgpn67XrVfKrvcR1FSa5Y= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index d03ea8ac51..5a36e30c2d 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: EOgU4HX3sYLnU5Agg3BwBG12sY9Hr/SluIaQp66icgc= +NodeupConfigHash: dnaRHC6CowJvLJNeWemp5W1XmrPWif2s1R8hp2sDwsc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content index fff6b41534..6398781af6 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -169,7 +169,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -192,7 +192,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8d1e48b5a8..6991cbddb6 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,7 +267,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content index 79f94c56c7..fa9c09341b 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 0955da2e6d..a2c9a0731f 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: sharedsubnet.example.com ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: pUcfj3mLzZYXnq+YW04YVYJNHY3PNzr3MHf5F8Otkq8= +NodeupConfigHash: i74nPuJdEtKH8LZK3m9VNxLcc8qOPJsJHJuZsWxv3ps= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index 5218f411aa..562c2ae50a 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.sharedsubnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: gBmt5FOVljz3NBhRYmwJO9JfveJZXzuMBnWKhwT0c9c= +NodeupConfigHash: EoVGGfAW1LO0GxuJsHSlVUozPcCU/Dh7fWh5EWNfDC0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content index 243b4e5c8f..3a4bfc4fad 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index da6ec451f1..41616ebb10 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content index bec7a02392..6e5ad7498e 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 8949b16fa1..bb33962d42 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: sharedvpc.example.com ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: MT0Ex2OTXXlOe7quhCuPCURxJk5L1VepeyuazWOQQ64= +NodeupConfigHash: 0MV+k3hUI3SpHgIn+W1ScsRy1I8s/84OS1ulThgY6Vw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index 2765525e5a..90ffba15ff 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.sharedvpc.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: POaxrGsrWHwC6/JGerTZK/3AVU/rlfOS7q4dw2JSzDc= +NodeupConfigHash: d1O7Msh7YG61O30P7V9a9miYsq+qQuKAbvZTK1Jr5zQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content index 125a24c5a7..cda23ecca4 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 559f0e5830..18af5fa9f1 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content index 6e674e7aa6..072e0008e7 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 66fc6ad7cd..10f86caf8f 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -225,7 +225,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -245,7 +245,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tzyDb8RW5zKmocwRToo4rtFUkyyMZyU+KK+J/Yhlflc= +NodeupConfigHash: JHPpfbsIPJTW0SP5UW6NvuEJ/h2i8tdpIXSqfezNDAk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 3e453194e2..da93677311 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xkq6xvdWZJjO91MGloMgnbNQU+R0KylELTgwPQ0wvKs= +NodeupConfigHash: wLWr2VzvYaaIRKAaHpdv/bB8MfWkeSizcsk7F/bCdqU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content index f452e85ccd..efd22c5ed3 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -174,7 +174,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -198,7 +198,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0f28a30d18..a559bbcaa7 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -265,7 +265,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content index 25727553fe..918d724193 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -39,7 +39,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 54e4107154..3fdbc96b0a 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: unmanaged.example.com ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6VlwmvUYvD0W4LqOIWQsBatD+XhBHld6SBjpeyGzM40= +NodeupConfigHash: I1nKmiLXCuhLPjK0SDZEzvkX7Kyym8eypfkTrQqTX0U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index 7e7fdc473b..b64b47f38f 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.unmanaged.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 1RtU/JPvDNJTdbhGfIkUC27+ReALmNbgQUJY65XX37s= +NodeupConfigHash: r5LfhW6DRMsXM7UaKccHljZFz0XXECvMix9/qg2UxR8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content index a28248858a..a28df22362 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content @@ -168,7 +168,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -191,7 +191,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c472b06c4c..2fb684f12e 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content index b9ad1cd638..6706977981 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true 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 225b9c9f23..3106fa883a 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 @@ -223,7 +223,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -243,7 +243,7 @@ masterKubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw= +NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index b3856b118f..e96886662b 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -139,7 +139,7 @@ kubelet: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -177,7 +177,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y= +NodeupConfigHash: d5MqA+uigYNyN9ngxi+YweS4KxwZLufmklba4URBOM8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content index 7d4908917d..dff1846961 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content @@ -166,7 +166,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true @@ -189,7 +189,7 @@ spec: InTreePluginAWSUnregister: "true" kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a79911d2f4..04f0555b40 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -266,7 +266,7 @@ KubeletConfig: kops.k8s.io/kops-controller-pki: "" node-role.kubernetes.io/control-plane: "" node.kubernetes.io/exclude-from-external-load-balancers: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content index 4eced620fc..916804757a 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content @@ -40,7 +40,7 @@ KubeletConfig: logLevel: 2 nodeLabels: node-role.kubernetes.io/node: "" - podInfraContainerImage: registry.k8s.io/pause:3.6 + podInfraContainerImage: registry.k8s.io/pause:3.9 podManifestPath: /etc/kubernetes/manifests protectKernelDefaults: true registerSchedulable: true