From da4af999675872fafbe5178e6b2a552d34f740e5 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Tue, 5 Aug 2025 09:36:39 +0300
Subject: [PATCH] hack/update-expected.sh

---
 ...t-1a.masters.minimal.example.com_user_data |   2 +-
 ...s_s3_object_cluster-completed.spec_content |   2 +
 ...cdmanager-events-master-us-test-1a_content | 102 ++++++------------
 ...etcdmanager-main-master-us-test-1a_content | 102 ++++++------------
 ...ect_nodeupconfig-master-us-test-1a_content |   2 +
 ...t-1a.masters.minimal.example.com_user_data |   2 +-
 ...s_s3_object_cluster-completed.spec_content |   2 +
 ...cdmanager-events-master-us-test-1a_content | 102 ++++++------------
 ...etcdmanager-main-master-us-test-1a_content | 102 ++++++------------
 ...ect_nodeupconfig-master-us-test-1a_content |   2 +
 10 files changed, 138 insertions(+), 282 deletions(-)

diff --git a/tests/integration/update_cluster/minimal-1.33/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.33/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index a57b914f49..9e4ef9d8df 100644
--- a/tests/integration/update_cluster/minimal-1.33/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.33/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -130,7 +130,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: xbmJGssuIxsJRK9XhaKClsBg2o8f0AgSGPWoqHTTX7s=
+NodeupConfigHash: PtkgcAnStiVeR9dBVfWvjbyz7gMCuGX83Y49gsjcrqU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_cluster-completed.spec_content
index 55a2d26b71..bb62cf0372 100644
--- a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_cluster-completed.spec_content
@@ -170,6 +170,8 @@ spec:
     clusterDomain: cluster.local
     enableDebuggingHandlers: true
     evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
+    featureGates:
+      ImageVolume: "true"
     kubeconfigPath: /var/lib/kubelet/kubeconfig
     logLevel: 2
     podInfraContainerImage: registry.k8s.io/pause:3.9
diff --git a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 8c62093d11..5f038f79fa 100644
--- a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -38,80 +38,34 @@ spec:
       name: pki
     - mountPath: /opt
       name: opt
+    - mountPath: /opt/etcd-v3.4.13
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.4.3
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.5.0
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.1
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.13
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.17
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.21
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.3
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.4
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.6
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.7
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.9
+      name: etcd-v3-5-21
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
-  initContainers:
-  - args:
-    - --target-dir=/opt/kops-utils/
-    - --src=/ko-app/kops-utils-cp
-    command:
-    - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: kops-utils-cp
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.4.13
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.4.13
-    name: init-etcd-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.5.21
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.5.21
-    name: init-etcd-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.4.3
-    - --src=/opt/etcd-v3.4.13/etcd
-    - --src=/opt/etcd-v3.4.13/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.5.0
-    - --target-dir=/opt/etcd-v3.5.1
-    - --target-dir=/opt/etcd-v3.5.13
-    - --target-dir=/opt/etcd-v3.5.17
-    - --target-dir=/opt/etcd-v3.5.3
-    - --target-dir=/opt/etcd-v3.5.4
-    - --target-dir=/opt/etcd-v3.5.6
-    - --target-dir=/opt/etcd-v3.5.7
-    - --target-dir=/opt/etcd-v3.5.9
-    - --src=/opt/etcd-v3.5.21/etcd
-    - --src=/opt/etcd-v3.5.21/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -131,6 +85,14 @@ spec:
     name: pki
   - emptyDir: {}
     name: opt
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.4.13
+    name: etcd-v3-4-13
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.5.21
+    name: etcd-v3-5-21
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate
diff --git a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 9df1760835..00f2d43b97 100644
--- a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -38,80 +38,34 @@ spec:
       name: pki
     - mountPath: /opt
       name: opt
+    - mountPath: /opt/etcd-v3.4.13
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.4.3
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.5.0
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.1
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.13
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.17
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.21
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.3
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.4
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.6
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.7
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.9
+      name: etcd-v3-5-21
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
-  initContainers:
-  - args:
-    - --target-dir=/opt/kops-utils/
-    - --src=/ko-app/kops-utils-cp
-    command:
-    - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: kops-utils-cp
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.4.13
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.4.13
-    name: init-etcd-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.5.21
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.5.21
-    name: init-etcd-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.4.3
-    - --src=/opt/etcd-v3.4.13/etcd
-    - --src=/opt/etcd-v3.4.13/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.5.0
-    - --target-dir=/opt/etcd-v3.5.1
-    - --target-dir=/opt/etcd-v3.5.13
-    - --target-dir=/opt/etcd-v3.5.17
-    - --target-dir=/opt/etcd-v3.5.3
-    - --target-dir=/opt/etcd-v3.5.4
-    - --target-dir=/opt/etcd-v3.5.6
-    - --target-dir=/opt/etcd-v3.5.7
-    - --target-dir=/opt/etcd-v3.5.9
-    - --src=/opt/etcd-v3.5.21/etcd
-    - --src=/opt/etcd-v3.5.21/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -131,6 +85,14 @@ spec:
     name: pki
   - emptyDir: {}
     name: opt
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.4.13
+    name: etcd-v3-4-13
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.5.21
+    name: etcd-v3-5-21
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate
diff --git a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 8e686e57e6..33a5207092 100644
--- a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -287,6 +287,8 @@ KubeletConfig:
   clusterDomain: cluster.local
   enableDebuggingHandlers: true
   evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
+  featureGates:
+    ImageVolume: "true"
   kubeconfigPath: /var/lib/kubelet/kubeconfig
   logLevel: 2
   nodeLabels:
diff --git a/tests/integration/update_cluster/minimal-1.34/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.34/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 691ab7018f..4e96361ddf 100644
--- a/tests/integration/update_cluster/minimal-1.34/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.34/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -130,7 +130,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: U8Cc2occS9dwCHbAn8DC5s6yGK9OvKSeMOHSbbuEEls=
+NodeupConfigHash: 7LXIccGeBgv+GPtggY8yFTHYgeCSqNF8ybqN0ho9Hrk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_cluster-completed.spec_content
index 39ee19f023..899b8383ad 100644
--- a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_cluster-completed.spec_content
@@ -169,6 +169,8 @@ spec:
     clusterDomain: cluster.local
     enableDebuggingHandlers: true
     evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
+    featureGates:
+      ImageVolume: "true"
     kubeconfigPath: /var/lib/kubelet/kubeconfig
     logLevel: 2
     podInfraContainerImage: registry.k8s.io/pause:3.9
diff --git a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
index 8c62093d11..5f038f79fa 100644
--- a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -38,80 +38,34 @@ spec:
       name: pki
     - mountPath: /opt
       name: opt
+    - mountPath: /opt/etcd-v3.4.13
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.4.3
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.5.0
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.1
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.13
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.17
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.21
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.3
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.4
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.6
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.7
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.9
+      name: etcd-v3-5-21
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
-  initContainers:
-  - args:
-    - --target-dir=/opt/kops-utils/
-    - --src=/ko-app/kops-utils-cp
-    command:
-    - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: kops-utils-cp
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.4.13
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.4.13
-    name: init-etcd-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.5.21
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.5.21
-    name: init-etcd-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.4.3
-    - --src=/opt/etcd-v3.4.13/etcd
-    - --src=/opt/etcd-v3.4.13/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.5.0
-    - --target-dir=/opt/etcd-v3.5.1
-    - --target-dir=/opt/etcd-v3.5.13
-    - --target-dir=/opt/etcd-v3.5.17
-    - --target-dir=/opt/etcd-v3.5.3
-    - --target-dir=/opt/etcd-v3.5.4
-    - --target-dir=/opt/etcd-v3.5.6
-    - --target-dir=/opt/etcd-v3.5.7
-    - --target-dir=/opt/etcd-v3.5.9
-    - --src=/opt/etcd-v3.5.21/etcd
-    - --src=/opt/etcd-v3.5.21/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -131,6 +85,14 @@ spec:
     name: pki
   - emptyDir: {}
     name: opt
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.4.13
+    name: etcd-v3-4-13
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.5.21
+    name: etcd-v3-5-21
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate
diff --git a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
index 9df1760835..00f2d43b97 100644
--- a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -38,80 +38,34 @@ spec:
       name: pki
     - mountPath: /opt
       name: opt
+    - mountPath: /opt/etcd-v3.4.13
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.4.3
+      name: etcd-v3-4-13
+    - mountPath: /opt/etcd-v3.5.0
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.1
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.13
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.17
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.21
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.3
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.4
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.6
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.7
+      name: etcd-v3-5-21
+    - mountPath: /opt/etcd-v3.5.9
+      name: etcd-v3-5-21
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
-  initContainers:
-  - args:
-    - --target-dir=/opt/kops-utils/
-    - --src=/ko-app/kops-utils-cp
-    command:
-    - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: kops-utils-cp
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.4.13
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.4.13
-    name: init-etcd-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --target-dir=/opt/etcd-v3.5.21
-    - --src=/usr/local/bin/etcd
-    - --src=/usr/local/bin/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:v3.5.21
-    name: init-etcd-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.4.3
-    - --src=/opt/etcd-v3.4.13/etcd
-    - --src=/opt/etcd-v3.4.13/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-4-13
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
-  - args:
-    - --symlink
-    - --target-dir=/opt/etcd-v3.5.0
-    - --target-dir=/opt/etcd-v3.5.1
-    - --target-dir=/opt/etcd-v3.5.13
-    - --target-dir=/opt/etcd-v3.5.17
-    - --target-dir=/opt/etcd-v3.5.3
-    - --target-dir=/opt/etcd-v3.5.4
-    - --target-dir=/opt/etcd-v3.5.6
-    - --target-dir=/opt/etcd-v3.5.7
-    - --target-dir=/opt/etcd-v3.5.9
-    - --src=/opt/etcd-v3.5.21/etcd
-    - --src=/opt/etcd-v3.5.21/etcdctl
-    command:
-    - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
-    name: init-etcd-symlinks-3-5-21
-    resources: {}
-    volumeMounts:
-    - mountPath: /opt
-      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -131,6 +85,14 @@ spec:
     name: pki
   - emptyDir: {}
     name: opt
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.4.13
+    name: etcd-v3-4-13
+  - image:
+      pullPolicy: IfNotPresent
+      reference: registry.k8s.io/etcd:v3.5.21
+    name: etcd-v3-5-21
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate
diff --git a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 087245415f..03e29fcf81 100644
--- a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -287,6 +287,8 @@ KubeletConfig:
   clusterDomain: cluster.local
   enableDebuggingHandlers: true
   evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
+  featureGates:
+    ImageVolume: "true"
   kubeconfigPath: /var/lib/kubelet/kubeconfig
   logLevel: 2
   nodeLabels: