Merge pull request #15436 from hakman/etcd-3.5.9

Update etcd to v3.5.9

Makefile

@@ -65,6 +65,9 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
 
 # We lock the versions of our controllers also
 # We need to keep in sync with:
+#   pkg/model/components/etcdmanager/model.go
+KOPS_COPY_TAG=1.27.0-alpha.2
+KOPS_COPY_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_COPY_TAG | awk '{print $$2}')
 #   upup/models/cloudup/resources/addons/dns-controller/
 DNS_CONTROLLER_TAG=1.27.0-alpha.2
 DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
@@ -112,7 +115,7 @@ nodeup-install: nodeup
 all-install: all kops-install channels-install nodeup-install
 
 .PHONY: all
-all: kops protokube nodeup channels ko-kops-controller-export ko-dns-controller-export ko-kube-apiserver-healthcheck-export
+all: kops protokube nodeup channels ko-kops-controller-export ko-dns-controller-export ko-kops-copy-export ko-kube-apiserver-healthcheck-export
 
 include tests/e2e/e2e.mk
 
@@ -305,6 +308,13 @@ dns-controller-push: ko-dns-controller-push
 ko-dns-controller-push:
 	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller" GOFLAGS="-tags=peer_name_alternative,peer_name_hash" ${KO} build --tags ${DNS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./dns-controller/cmd/dns-controller/
 
+.PHONY: kops-copy-push
+kops-copy-push-push: ko-kops-copy-push
+
+.PHONY: ko-kops-copy-push
+ko-kops-copy-push:
+	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-copy" ${KO} build --tags ${KOPS_COPY_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-copy/
+
 # --------------------------------------------------
 # development targets
 
@@ -541,6 +551,17 @@ ko-dns-controller-export-linux-amd64 ko-dns-controller-export-linux-arm64: ko-dn
 ko-dns-controller-export: ko-dns-controller-export-linux-amd64 ko-dns-controller-export-linux-arm64
 	echo "Done exporting dns-controller images"
 
+.PHONY: ko-kops-copy-export-linux-amd64 ko-kops-copy-export-linux-arm64
+ko-kops-copy-export-linux-amd64 ko-kops-copy-export-linux-arm64: ko-kops-copy-export-linux-%:
+	mkdir -p ${IMAGES}
+	KO_DOCKER_REPO="registry.k8s.io/kops" ${KO} build --tags ${KOPS_COPY_TAG} --platform=linux/$* -B --push=false --tarball=${IMAGES}/kops-copy-$*.tar ./cmd/kops-copy/
+	gzip -f ${IMAGES}/kops-copy-$*.tar
+	tools/sha256 ${IMAGES}/kops-copy-$*.tar.gz ${IMAGES}/kops-copy-$*.tar.gz.sha256
+
+.PHONY: ko-kops-copy-export
+ko-kops-copy-export: ko-kops-copy-export-linux-amd64 ko-kops-copy-export-linux-arm64
+	echo "Done exporting kops-copy images"
+
 .PHONY: version-dist
 version-dist: dev-version-dist-amd64 dev-version-dist-arm64 crossbuild
 	mkdir -p ${UPLOAD}/kops/${VERSION}/linux/amd64/
@@ -696,11 +717,28 @@ dev-upload-dns-controller: version-dist-dns-controller
 dev-upload-dns-controller-amd64 dev-upload-dns-controller-arm64: dev-upload-dns-controller-%: version-dist-dns-controller-%
 	${UPLOAD_CMD} ${UPLOAD}/ ${UPLOAD_DEST}
 
+# dev-upload-kops-copy uploads kops-copy
+.PHONY: version-dist-kops-copy version-dist-kops-copy-amd64 version-dist-kops-copy-arm64
+version-dist-kops-copy: version-dist-kops-copy-amd64 version-dist-kops-copy-arm64
+
+version-dist-kops-copy-amd64 version-dist-kops-copy-arm64: version-dist-kops-copy-%: ko-kops-copy-export-linux-%
+	mkdir -p ${UPLOAD}/kops/${VERSION}/images/
+	cp -fp ${IMAGES}/kops-copy-$*.tar.gz ${UPLOAD}/kops/${VERSION}/images/kops-copy-$*.tar.gz
+	cp -fp ${IMAGES}/kops-copy-$*.tar.gz.sha256 ${UPLOAD}/kops/${VERSION}/images/kops-copy-$*.tar.gz.sha256
+
+.PHONY: dev-upload-kops-copy
+dev-upload-kops-copy: version-dist-kops-copy
+	${UPLOAD_CMD} ${UPLOAD}/ ${UPLOAD_DEST}
+
+.PHONY: dev-upload-kops-copy-amd64 dev-upload-kops-copy-arm64
+dev-upload-kops-copy-amd64 dev-upload-kops-copy-arm64: dev-upload-kops-copy-%: version-dist-kops-copy-%
+	${UPLOAD_CMD} ${UPLOAD}/ ${UPLOAD_DEST}
+
 # dev-upload-linux-amd64 does a faster build and uploads to GCS / S3
 .PHONY: dev-version-dist dev-version-dist-amd64 dev-version-dist-arm64
 dev-version-dist: dev-version-dist-amd64 dev-version-dist-arm64
 
-dev-version-dist-amd64 dev-version-dist-arm64: dev-version-dist-%: version-dist-nodeup-% version-dist-channels-% version-dist-protokube-% version-dist-kops-controller-% version-dist-kube-apiserver-healthcheck-% version-dist-dns-controller-%
+dev-version-dist-amd64 dev-version-dist-arm64: dev-version-dist-%: version-dist-nodeup-% version-dist-channels-% version-dist-protokube-% version-dist-kops-controller-% version-dist-kube-apiserver-healthcheck-% version-dist-dns-controller-% version-dist-kops-copy-%
 
 .PHONY: dev-upload-linux-amd64 dev-upload-linux-arm64
 dev-upload-linux-amd64 dev-upload-linux-arm64: dev-upload-linux-%: dev-version-dist-%

cmd/kops-copy/main.go

@@ -0,0 +1,81 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+
+	"k8s.io/klog/v2"
+)
+
+func copyFile(source, target string) error {
+	klog.Infof("Copying source file %q to target directory %q", source, target)
+
+	sf, err := os.Open(source)
+	if err != nil {
+		return fmt.Errorf("unable to open source file %q: %w", source, err)
+	}
+	defer sf.Close()
+
+	fi, err := sf.Stat()
+	if err != nil {
+		return fmt.Errorf("unable to stat source file %q: %w", source, err)
+	}
+
+	fn := filepath.Join(target, filepath.Base(source))
+	df, err := os.Create(fn)
+	if err != nil {
+		return fmt.Errorf("unable to create target file %q: %w", fn, err)
+	}
+	defer df.Close()
+
+	_, err = io.Copy(df, sf)
+	if err != nil {
+		return fmt.Errorf("unable to copy source file %q contents to target file %q: %w", source, fn, err)
+	}
+
+	if err := df.Close(); err != nil {
+		return fmt.Errorf("unable to close target file %q: %w", fn, err)
+	}
+	if err := os.Chmod(fn, fi.Mode()); err != nil {
+		return fmt.Errorf("unable to change mode of target file %q: %w", fn, err)
+	}
+
+	return nil
+}
+
+func main() {
+	if len(os.Args) < 3 {
+		log.Fatal("Usage: kops-copy SOURCE ... TARGET")
+	}
+
+	target := os.Args[len(os.Args)-1]
+
+	if err := os.MkdirAll(target, 0755); err != nil {
+		klog.Exitf("unable to create target directory %q: %v", target, err)
+	}
+
+	for _, src := range os.Args[1 : len(os.Args)-1] {
+		if err := copyFile(src, target); err != nil {
+			klog.Exitf("unable to copy source file %q to target directory %q: %v", src, target, err)
+		}
+	}
+}

hack/set-version

@@ -56,6 +56,7 @@ KOPS_CI_VERSION=`grep 'KOPS_CI_VERSION\s*=' kops-version.go  |  awk '{print $3}'
 echo "KOPS_RELEASE_VERSION ${KOPS_RELEASE_VERSION} -> ${NEW_RELEASE_VERSION}"
 echo "KOPS_CI_VERSION ${KOPS_CI_VERSION} -> ${NEW_CI_VERSION}"
 
+sed -i.bak -e "s@KOPS_COPY_TAG=${KOPS_RELEASE_VERSION}@KOPS_COPY_TAG=${NEW_RELEASE_VERSION}@g" Makefile
 sed -i.bak -e "s@DNS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@DNS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile
 sed -i.bak -e "s@KOPS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@KOPS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile
 sed -i.bak -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_APISERVER_HEALTHCHECK_TAG=${NEW_RELEASE_VERSION}@g" Makefile
@@ -68,6 +69,7 @@ git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/ad
 git grep -l registry.k8s.io/kops/kops-controller | xargs -I {} sed -i.bak -e "s@kops-controller:${KOPS_RELEASE_VERSION}@kops-controller:${NEW_RELEASE_VERSION}@g" {}
 git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ | xargs -I {} sed -i.bak -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {}
 
+git grep -l registry.k8s.io/kops/kops-copy | xargs -I {} sed -i.bak -e "s@kops-copy:${KOPS_RELEASE_VERSION}@kops-copy:${NEW_RELEASE_VERSION}@g" {}
 git grep -l registry.k8s.io/kops/kube-apiserver-healthcheck | xargs -I {} sed -i.bak -e "s@kube-apiserver-healthcheck:${KOPS_RELEASE_VERSION}@kube-apiserver-healthcheck:${NEW_RELEASE_VERSION}@g" {}
 
 git grep -l "version..${KOPS_RELEASE_VERSION}" upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/ | xargs -I {} sed -i.bak -e "s@version: ${KOPS_RELEASE_VERSION}@version: ${NEW_RELEASE_VERSION}@g" {}

pkg/apis/kops/validation/validation.go

@@ -1419,19 +1419,12 @@ func validateEtcdStorage(specs []kops.EtcdClusterSpec, fieldPath *field.Path) fi
 }
 
 // validateEtcdVersion is responsible for validating the storage version of etcd
-// @TODO semvar package doesn't appear to ignore a 'v' in v1.1.1; could be a problem later down the line
 func validateEtcdVersion(spec kops.EtcdClusterSpec, fieldPath *field.Path, minimalVersion *semver.Version) field.ErrorList {
-	// @check if the storage is specified that it's valid
+	if spec.Version == "" {
-
+		return nil
-	if minimalVersion == nil {
-		v := semver.MustParse("0.0.0")
-		minimalVersion = &v
 	}
 
 	version := spec.Version
-	if spec.Version == "" {
-		version = components.DefaultEtcd3Version_1_20
-	}
 
 	sem, err := semver.Parse(strings.TrimPrefix(version, "v"))
 	if err != nil {
@@ -1440,7 +1433,7 @@ func validateEtcdVersion(spec kops.EtcdClusterSpec, fieldPath *field.Path, minim
 
 	// we only support v3 for now
 	if sem.Major == 3 {
-		if sem.LT(*minimalVersion) {
+		if minimalVersion != nil && sem.LT(*minimalVersion) {
 			return field.ErrorList{field.Invalid(fieldPath.Child("version"), version, fmt.Sprintf("minimum version required is %s", minimalVersion.String()))}
 		}
 		return nil

pkg/model/components/etcd.go

@@ -29,8 +29,7 @@ type EtcdOptionsBuilder struct {
 var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}
 
 const (
-	DefaultEtcd3Version_1_20 = "3.4.13"
+	DefaultEtcd3Version_1_22 = "3.5.9"
-	DefaultEtcd3Version_1_22 = "3.5.7"
 )
 
 // BuildOptions is responsible for filling in the defaults for the etcd cluster model

pkg/model/components/etcdmanager/model.go

@@ -22,7 +22,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/blang/semver/v4"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/klog/v2"
@@ -198,9 +197,21 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
   hostNetwork: true
   hostPID: true # helps with mounting volumes from inside a container
+  initContainers:
+  - args:
+    - /ko-app/kops-copy
+    - /opt/bin
+    command:
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
   volumes:
   - hostPath:
       path: /
@@ -214,7 +225,7 @@ spec:
       path: /etc/kubernetes/pki/etcd-manager
       type: DirectoryOrCreate
     name: pki
-  - name: bin
+  - name: opt
     emptyDir: {}
 `
 
@@ -249,27 +260,19 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
 			initContainer := v1.Container{
 				Name:    "init-etcd-" + strings.ReplaceAll(etcdVersion, ".", "-"),
 				Image:   etcdSupportedImages[etcdVersion],
-				Command: []string{"/bin/sh"},
+				Command: []string{"/opt/bin/kops-copy"},
 				Args: []string{
-					"-c",
+					"/usr/local/bin/etcd",
+					"/usr/local/bin/etcdctl",
+					"/opt/etcd-v" + etcdVersion,
 				},
 				VolumeMounts: []v1.VolumeMount{
 					{
 						MountPath: "/opt",
-						Name:      "bin",
+						Name:      "opt",
 					},
 				},
 			}
-			// Add the command for copying the etcd binaries
-			var command string
-			if semver.MustParse(etcdVersion).GE(semver.MustParse("3.4.13")) {
-				// Newer images bundle a custom go based `cp` utility that recursively creates the necessary dirs
-				// https://github.com/kubernetes/kubernetes/pull/91171
-				command = "cp /usr/local/bin/etcd /opt/etcd-v" + etcdVersion + "/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v" + etcdVersion + "/etcdctl"
-			} else {
-				command = "mkdir -p /opt/etcd-v" + etcdVersion + "/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl /opt/etcd-v" + etcdVersion + "/"
-			}
-			initContainer.Args = append(initContainer.Args, command)
 			// Remap image via AssetBuilder
 			remapped, err := b.AssetBuilder.RemapImage(initContainer.Image)
 			if err != nil {

pkg/model/components/etcdmanager/options.go

@@ -69,7 +69,7 @@ var etcdSupportedImages = map[string]string{
 	"3.2.24": "registry.k8s.io/etcd:3.2.24-1",
 	"3.3.17": "registry.k8s.io/etcd:3.3.17-0",
 	"3.4.13": "registry.k8s.io/etcd:3.4.13-0",
-	"3.5.7":  "registry.k8s.io/etcd:3.5.7-0",
+	"3.5.9":  "registry.k8s.io/etcd:3.5.9-0",
 }
 
 func etcdSupportedVersions() []string {

pkg/model/components/etcdmanager/tests/interval/tasks.yaml

@@ -102,58 +102,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -172,7 +185,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd-events.log
         type: FileOrCreate
@@ -222,58 +235,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -292,7 +318,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd.log
         type: FileOrCreate

pkg/model/components/etcdmanager/tests/minimal/tasks.yaml

@@ -101,58 +101,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -171,7 +184,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd-events.log
         type: FileOrCreate
@@ -220,58 +233,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -290,7 +316,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd.log
         type: FileOrCreate

pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml

@@ -104,58 +104,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -174,7 +187,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd-events.log
         type: FileOrCreate
@@ -226,58 +239,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -296,7 +322,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd.log
         type: FileOrCreate

pkg/model/components/etcdmanager/tests/proxy/tasks.yaml

@@ -110,58 +110,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -180,7 +193,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd-events.log
         type: FileOrCreate
@@ -238,58 +251,71 @@ Contents: |
       - mountPath: /etc/kubernetes/pki/etcd-manager
         name: pki
       - mountPath: /opt
-        name: bin
+        name: opt
       - mountPath: /var/log/etcd.log
         name: varlogetcd
     hostNetwork: true
     hostPID: true
     initContainers:
     - args:
-      - -c
+      - /ko-app/kops-copy
-      - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /opt/bin
-        /opt/etcd-v3.2.24/
       command:
-      - /bin/sh
+      - /ko-app/kops-copy
+      image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+      name: kops-copy
+      resources: {}
+      volumeMounts:
+      - mountPath: /opt
+        name: opt
+    - args:
+      - /usr/local/bin/etcd
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.2.24
+      command:
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.2.24-1
       name: init-etcd-3-2-24
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+      - /usr/local/bin/etcdctl
-        /opt/etcd-v3.3.17/
+      - /opt/etcd-v3.3.17
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.3.17-0
       name: init-etcd-3-3-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.4.13
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
       image: registry.k8s.io/etcd:3.4.13-0
       name: init-etcd-3-4-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     - args:
-      - -c
+      - /usr/local/bin/etcd
-      - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+      - /usr/local/bin/etcdctl
+      - /opt/etcd-v3.5.9
       command:
-      - /bin/sh
+      - /opt/bin/kops-copy
-      image: registry.k8s.io/etcd:3.5.7-0
+      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-7
+      name: init-etcd-3-5-9
       resources: {}
       volumeMounts:
       - mountPath: /opt
-        name: bin
+        name: opt
     priorityClassName: system-cluster-critical
     tolerations:
     - key: CriticalAddonsOnly
@@ -308,7 +334,7 @@ Contents: |
         type: DirectoryOrCreate
       name: pki
     - emptyDir: {}
-      name: bin
+      name: opt
     - hostPath:
         path: /var/log/etcd.log
         type: FileOrCreate

tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data

@@ -135,7 +135,7 @@ etcdClusters:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     memoryRequest: 100Mi
-    version: 3.5.7
+    version: 3.5.9
   main:
     cpuRequest: 200m
     manager:
@@ -144,7 +144,7 @@ etcdClusters:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     memoryRequest: 100Mi
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content

@@ -42,7 +42,7 @@ spec:
         value: 90d
     memoryRequest: 100Mi
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events
     cpuRequest: 100m
@@ -57,7 +57,7 @@ spec:
         value: 90d
     memoryRequest: 100Mi
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content

@@ -37,7 +37,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events
     etcdMembers:
@@ -49,7 +49,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -40,58 +40,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -110,7 +123,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -40,58 +40,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -110,7 +123,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content

@@ -51,7 +51,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events
     etcdMembers:
@@ -63,7 +63,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content

@@ -49,7 +49,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/bastionuserdata.example.com/backups/etcd/events
     etcdMembers:
@@ -61,7 +61,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

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

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content

@@ -71,7 +71,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/backups/etcd/events
     etcdMembers:
@@ -83,7 +83,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   keyStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/pki

tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content

@@ -64,7 +64,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/cas-priority-expander.example.com/backups/etcd/events
     etcdMembers:
@@ -76,7 +76,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   keyStore: memfs://clusters.example.com/cas-priority-expander.example.com/pki

tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data

@@ -142,14 +142,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content

@@ -69,7 +69,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/complex.example.com/backups/etcd/events
     etcdMembers:
@@ -81,7 +81,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data

@@ -131,7 +131,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir
 
-echo "H4sIAAAAAAAA/+xWXW/bNhe+968g+qJ3tWQ3afpW6I1qZ4mW2PXkZNmuApo8lrlQpHZIKvF+/UBSsp00GTYMK3pRFGjM88Xz8ZyHYlI7PtFqLapsQEhNFa1gaTXSCiaSGgMmIxYdDEAx3DZWaNWZE+WkHIBlfCKdsYDGR4AWlA2/+mgYD4SsKLtzTQkWlA8zpVuTkQ+jTguq7Q2HRNEaMnJ6NZnezvJ5fnZa3k7z4vLX20/55OJ6sbwtT69O51fF53nnQkhLpQMfjwdRC2iEVhk5St4l70NpQn1zad25FeSLYgnYxoSolPp+gaIVEirgXe8JoUqrba2dyZ3dZGRNpQniRuSOC1AMQs+HxEdEBRZMYlqWcFhTJ200jddMtFM2I2Mvc3ajUfxBfeEzzSEjubynW5P7NAaErITiOecIxmRklIR/A0ICahaoW8EBMwIPFlBR6cev6EpCzmthfJ0L6SqhutTmtAbTUAaXYg1syyQE8aWohS2pqgDD2WcpGOSM+USDaBqrOMTlofxKS8BQwxKYVjwqZ85SK1S1S+YGVhut74LyZyoFf1k91xxKMBYF82GDrASjHTL4yWlLfamW8djRrr6NtY3J0nT89n3o1Dg7Ho3Gjy0/t4AoeD+tNK7L/551fTsgZA3UOoQzaqFbqsmymIkqlpvfLDPyykPkVdAV6goBYtPzm+W1QqiEX80DK1HTCjISNbhN7v5vEqFTj5shbYSJUGzHyduTMGuvkGAXCGtAhB4OV9umL6JQcfzFIhzPtbF+UcLh9OFAJ3V1CS3IjPjSEH53YOwGKAcMgAMeIBKj0qpCqKjV+NT29MEiPQ8/fVbioXf5ZVhCrS0Mg8Xwqd8ZatdEv6cOQfXU/tr41Gt43sVrB4QYYA5hodFm5Pj4KEgO8VsY43z/+wnTRiSia1jCdN34ZibwQOtGghd8EeHHm4vldVn8gxCpbkAJnrbj9Lf7O7OP2BF1sQjrlpHxaJScHHvEpeOQelywT5TdgeJZAO5RIKmJVha1lICzPXt6smLUgt+WSTEtzZ6urKVsMwX/f+l3kgkJy61iC0CheUbG9cj8JZGwmKoPG/P8cBLzHO+V80DHLzSRhVfKIUz8HaV2foN2xPl194rtujfsH5/9gskIagmBamIyB7JdTx9vjzPwmCgnCNy/YFT2Y/BXL9kGuJNxXl+3aLO7+t/V2hFQ9vIryCq/vlMUnrmI2RoLNd/JS61tRtK/g7bpfHmwFOPRgUaH74f+mHjg79+7KaxcVQlVnVPFpeeKvhBo4wtyTpFnpIZa4zahLRXS+30cj0Yz8UZpDmvzSPy6Fwr/1/yAAB/fvX4T+v2FaS99ZPufzNvPIi7WgvoJpC3FVIpV2g0p3Rt8gdhG80KtkXoqoUIBFs+Dp6HOQHaUnESfGVViDcZ2F4Jl6f4bJ607rSeTBrUFZi+8TnafBvtJ9NV0G+Gbt9OZjbNc36szpAx6ijoKDPWMaoLCCkblQnPj4WIGNfWRL74D9TtQv22g/gkAAP//AQAA///KG9Hm7w0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
+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/2zOwUrEMBDG8XueIvelW6peDHhwg+wWskupB8HbkE5rJcmETKLt24v0VNj7/8f3aUdl6BL9zAMmJeGXhXaFM6YbeFTSko8JmY+4gI8Oj5a80BTGeToBo5Ie/ciqru2mdmF9V7eBMwSL50Qlbise/m1VuMrIuWpgH/XkUElNISdynYOA4kYDlrgduQB/KWmW59NHa2OeWV+M/VzNw3XK703zdNArmEN//n7r3fUxta8v4g8AAP//AQAA//8oNJ5B9wAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml
 

tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content

@@ -47,7 +47,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/compress.example.com/backups/etcd/events
     etcdMembers:
@@ -59,7 +59,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content

@@ -55,7 +55,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/events
     etcdMembers:
@@ -67,7 +67,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content

@@ -47,7 +47,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/events
     etcdMembers:
@@ -59,7 +59,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -38,58 +38,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -108,7 +121,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content

@@ -47,7 +47,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/123.example.com/backups/etcd/events
     etcdMembers:
@@ -59,7 +59,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data

@@ -133,14 +133,14 @@ etcdClusters:
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
       env:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content

@@ -53,7 +53,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/docker.example.com/backups/etcd/events
     etcdMembers:
@@ -65,7 +65,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data

@@ -137,7 +137,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
@@ -148,7 +148,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data

@@ -137,7 +137,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
@@ -148,7 +148,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data

@@ -137,7 +137,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
@@ -148,7 +148,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content

@@ -55,7 +55,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://tests/existing-iam.example.com/backups/etcd/events
     etcdMembers:
@@ -75,7 +75,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 3,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-main_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 3,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }

tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content

@@ -39,58 +39,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -109,7 +122,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content

@@ -41,58 +41,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -111,7 +124,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd-events.log
       type: FileOrCreate

tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content

@@ -37,58 +37,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -107,7 +120,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content

@@ -39,58 +39,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -109,7 +122,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content

@@ -41,58 +41,71 @@ spec:
     - mountPath: /etc/kubernetes/pki/etcd-manager
       name: pki
     - mountPath: /opt
-      name: bin
+      name: opt
     - mountPath: /var/log/etcd.log
       name: varlogetcd
   hostNetwork: true
   hostPID: true
   initContainers:
   - args:
-    - -c
+    - /ko-app/kops-copy
-    - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /opt/bin
-      /opt/etcd-v3.2.24/
     command:
-    - /bin/sh
+    - /ko-app/kops-copy
+    image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2
+    name: kops-copy
+    resources: {}
+    volumeMounts:
+    - mountPath: /opt
+      name: opt
+  - args:
+    - /usr/local/bin/etcd
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.2.24
+    command:
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.2.24-1
     name: init-etcd-3-2-24
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl
+    - /usr/local/bin/etcdctl
-      /opt/etcd-v3.3.17/
+    - /opt/etcd-v3.3.17
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.3.17-0
     name: init-etcd-3-3-17
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.4.13
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
     image: registry.k8s.io/etcd:3.4.13-0
     name: init-etcd-3-4-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   - args:
-    - -c
+    - /usr/local/bin/etcd
-    - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl
+    - /usr/local/bin/etcdctl
+    - /opt/etcd-v3.5.9
     command:
-    - /bin/sh
+    - /opt/bin/kops-copy
-    image: registry.k8s.io/etcd:3.5.7-0
+    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-7
+    name: init-etcd-3-5-9
     resources: {}
     volumeMounts:
     - mountPath: /opt
-      name: bin
+      name: opt
   priorityClassName: system-cluster-critical
   tolerations:
   - key: CriticalAddonsOnly
@@ -111,7 +124,7 @@ spec:
       type: DirectoryOrCreate
     name: pki
   - emptyDir: {}
-    name: bin
+    name: opt
   - hostPath:
       path: /var/log/etcd.log
       type: FileOrCreate

tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data

@@ -137,7 +137,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
@@ -148,7 +148,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data

@@ -137,7 +137,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
@@ -148,7 +148,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data

@@ -137,7 +137,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
   main:
     manager:
       backupRetentionDays: 90
@@ -148,7 +148,7 @@ etcdClusters:
         value: 90d
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
-    version: 3.5.7
+    version: 3.5.9
 kubeAPIServer:
   allowPrivileged: true
   anonymousAuth: false

tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content

@@ -58,7 +58,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: main
-    version: 3.5.7
+    version: 3.5.9
   - backups:
       backupStore: memfs://clusters.example.com/existingsg.example.com/backups/etcd/events
     etcdMembers:
@@ -78,7 +78,7 @@ spec:
       - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
         value: 90d
     name: events
-    version: 3.5.7
+    version: 3.5.9
   externalDns:
     provider: dns-controller
   iam:

tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-events_content

@@ -1,4 +1,4 @@
 {
   "memberCount": 3,
-  "etcdVersion": "3.5.7"
+  "etcdVersion": "3.5.9"
 }