diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index b5d6aedb94..43bc35cdc4 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -21,6 +21,7 @@ import ( "fmt" "strings" + "github.com/blang/semver/v4" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/klog/v2" @@ -179,7 +180,7 @@ metadata: spec: containers: - name: etcd-manager - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim resources: requests: cpu: 100m @@ -195,6 +196,8 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin hostNetwork: true hostPID: true # helps with mounting volumes from inside a container volumes: @@ -210,6 +213,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager type: DirectoryOrCreate name: pki + - name: bin + emptyDir: {} ` // buildPod creates the pod spec, based on the EtcdClusterSpec @@ -236,7 +241,45 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance } else { pod = podObject } + } + { + for _, etcdVersion := range etcdSupportedVersions() { + initContainer := v1.Container{ + Name: "init-etcd-" + strings.ReplaceAll(etcdVersion, ".", "-"), + Image: etcdSupportedImages[etcdVersion], + Command: []string{"/bin/sh"}, + Args: []string{ + "-c", + }, + VolumeMounts: []v1.VolumeMount{ + { + MountPath: "/opt", + Name: "bin", + }, + }, + } + // 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 { + return nil, fmt.Errorf("unable to remap container image %q: %w", initContainer.Image, err) + } + initContainer.Image = remapped + pod.Spec.InitContainers = append(pod.Spec.InitContainers, initContainer) + } + } + + { if len(pod.Spec.Containers) != 1 { return nil, fmt.Errorf("expected exactly one container in etcd-manager Pod, found %d", len(pod.Spec.Containers)) } @@ -246,13 +289,11 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance klog.Warningf("overloading image in manifest %s with images %s", bundle, etcdCluster.Manager.Image) container.Image = etcdCluster.Manager.Image } - } - // Remap image via AssetBuilder - { + // Remap image via AssetBuilder remapped, err := b.AssetBuilder.RemapImage(container.Image) if err != nil { - return nil, fmt.Errorf("unable to remap container image %q: %v", container.Image, err) + return nil, fmt.Errorf("unable to remap container image %q: %w", container.Image, err) } container.Image = remapped } diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go index cd9e890d5f..e147a23e8c 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -18,6 +18,7 @@ package etcdmanager import ( "fmt" + "sort" "strings" "k8s.io/klog/v2" @@ -53,8 +54,10 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error { if featureflag.SkipEtcdVersionCheck.Enabled() { klog.Warningf("etcd version %q is not known to be supported, but ignoring because of SkipEtcdVersionCheck feature flag", etcdCluster.Version) } else { - klog.Warningf("unsupported etcd version %q detected; please update etcd version. Use export KOPS_FEATURE_FLAGS=SkipEtcdVersionCheck to override this check", etcdCluster.Version) - return fmt.Errorf("etcd version %q is not supported with etcd-manager, please specify a supported version or remove the value to use the default version. Supported versions: %s", etcdCluster.Version, strings.Join(supportedEtcdVersions, ", ")) + klog.Warningf("Unsupported etcd version %q detected; please update etcd version.", etcdCluster.Version) + klog.Warningf("Use export KOPS_FEATURE_FLAGS=SkipEtcdVersionCheck to override this check.") + klog.Warningf("Supported etcd versions: %s", strings.Join(etcdSupportedVersions(), ", ")) + return fmt.Errorf("etcd version %q is not supported with etcd-manager, please specify a supported version or remove the value to use the recommended version", etcdCluster.Version) } } } @@ -62,14 +65,32 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error { return nil } -var supportedEtcdVersions = []string{"3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3", "3.4.13", "3.5.0", "3.5.1", "3.5.3", "3.5.4", "3.5.6"} +var etcdSupportedImages = map[string]string{ + "3.2.24": "registry.k8s.io/etcd:3.2.24-1", + "3.3.10": "registry.k8s.io/etcd:3.3.10-0", + "3.3.17": "registry.k8s.io/etcd:3.3.17-0", + "3.4.3": "registry.k8s.io/etcd:3.4.3-0", + "3.4.13": "registry.k8s.io/etcd:3.4.13-0", + "3.5.0": "registry.k8s.io/etcd:3.5.0-0", + "3.5.1": "registry.k8s.io/etcd:3.5.1-0", + "3.5.3": "registry.k8s.io/etcd:3.5.3-0", + "3.5.4": "registry.k8s.io/etcd:3.5.4-0", + "3.5.6": "registry.k8s.io/etcd:3.5.6-0", +} + +func etcdSupportedVersions() []string { + var versions []string + for etcdVersion := range etcdSupportedImages { + versions = append(versions, etcdVersion) + } + sort.Strings(versions) + return versions +} func etcdVersionIsSupported(version string) bool { version = strings.TrimPrefix(version, "v") - for _, v := range supportedEtcdVersions { - if v == version { - return true - } + if _, ok := etcdSupportedImages[version]; ok { + return true } return false } diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml index 569b0e48f0..2efd72181e 100644 --- a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml @@ -86,7 +86,7 @@ Contents: | --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -101,10 +101,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,6 +239,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -155,7 +274,7 @@ Contents: | --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -170,10 +289,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -191,6 +427,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index f7c3ebaf9d..f4ae804931 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -85,7 +85,7 @@ Contents: | --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -100,10 +100,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,6 +238,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -153,7 +272,7 @@ Contents: | --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -168,10 +287,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -189,6 +425,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index 536b6a00da..fb74b3fb25 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -88,7 +88,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -103,10 +103,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,6 +241,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -159,7 +278,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -174,10 +293,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -195,6 +431,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index 7a899bf00a..81cc6b29ff 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -94,7 +94,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -109,10 +109,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -130,6 +247,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -171,7 +290,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -186,10 +305,127 @@ Contents: | name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -207,6 +443,8 @@ Contents: | path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 1d465b5ac7..4563cacfb9 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 10f7d304ac..79788101e2 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e85c7891eb..d76f5d011e 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -21,7 +21,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -36,10 +36,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -57,6 +174,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index a5af8a512c..2b1f2c8d7a 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -21,7 +21,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -36,10 +36,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -57,6 +174,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 1736bc50a8..3c493c52ba 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 218c749dec..99219249d7 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index f63dba6266..0f8b9d8511 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander-custom.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index d2d1f1f6f4..ba8c2076ac 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander-custom.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index f096f215c3..b8692fd565 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 51972e4db3..b9934542ba 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ed78d73ab2..5e786ecb7d 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3e648ba754..857ac9d3ef 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index b5914402d8..c41555c3f7 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c139e12fe9..1e23c1950d 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 624122d36c..58ead6a783 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45cd46b43d..84dc58da40 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 624122d36c..58ead6a783 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45cd46b43d..84dc58da40 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index eb26d718ca..9f571ae37f 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/123.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 39796f4df7..36275d3947 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/123.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 0a073c326a..7ecadb05a4 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/docker.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 4b1ee6f7bb..fa3ea3edce 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/docker.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 03630f6113..26e5394217 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 03630f6113..26e5394217 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 03630f6113..26e5394217 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b3bd098431..169e002a3e 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index b3bd098431..169e002a3e 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index b3bd098431..169e002a3e 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 73d2e8b423..d9dc9ed737 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 73d2e8b423..d9dc9ed737 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 73d2e8b423..d9dc9ed737 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ada7d9ee34..e81a302307 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index ada7d9ee34..e81a302307 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index ada7d9ee34..e81a302307 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 053684075c..4880ab0e83 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externallb.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 09f8af4a40..b2f5067d85 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externallb.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 01633557d1..3bb49a42b4 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externalpolicies.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index f929303da0..ffb5b10d08 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externalpolicies.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 17215766d3..915dde204e 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 17215766d3..915dde204e 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 17215766d3..915dde204e 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 0c376d2cab..4ab6332129 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 0c376d2cab..4ab6332129 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index 0c376d2cab..4ab6332129 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index 28576bd2e3..99a25066ae 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content index 28576bd2e3..99a25066ae 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content index 28576bd2e3..99a25066ae 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index da50321ece..bce34a777b 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content index da50321ece..bce34a777b 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content index da50321ece..bce34a777b 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index c1470ad38d..4da416d405 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 66f1853b44..552e604c1f 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3bd94828c1..07a43652ce 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b6de2fa02e..2f4d9d3191 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3bd94828c1..07a43652ce 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b6de2fa02e..2f4d9d3191 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3bd94828c1..07a43652ce 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b6de2fa02e..2f4d9d3191 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3bd94828c1..07a43652ce 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b6de2fa02e..2f4d9d3191 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3bd94828c1..07a43652ce 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b6de2fa02e..2f4d9d3191 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 9f6ebd6b04..e4fb285e58 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -39,10 +39,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -60,6 +177,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 9981601ca1..741acefafb 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 47ac2f2dd1..12cc089aeb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 1fefb3f3ac..7207269e0e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 47ac2f2dd1..12cc089aeb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 1fefb3f3ac..7207269e0e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 47ac2f2dd1..12cc089aeb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 1fefb3f3ac..7207269e0e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 47ac2f2dd1..12cc089aeb 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 1fefb3f3ac..7207269e0e 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index a0396d75e3..ebe03d7d6a 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45b98afaf3..6c5e52df2c 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index abec332b9f..35ef62bea3 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-warmpool.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 908f33c50f..b736719c67 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-warmpool.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index b95417e40d..6d848574f4 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index f7cb2ca9e3..de25662210 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index b95417e40d..6d848574f4 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index f7cb2ca9e3..de25662210 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index c3055cf0fd..0c257cc3cc 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -19,7 +19,7 @@ spec: --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-ilb-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 47d5ceefb7..a731c28e15 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -18,7 +18,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-ilb-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index dcb8301e9f..247e62d935 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 16358cd73b..48a03074c6 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index dcb8301e9f..247e62d935 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 16358cd73b..48a03074c6 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index 25cff525c9..2fd655750d 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -19,7 +19,7 @@ spec: --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-private-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 1be76517d5..1f361d48eb 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -19,7 +19,7 @@ spec: --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-private-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index bc8d6d3097..e72ba85a57 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index bf3dba8382..3381ee9160 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index bc8d6d3097..e72ba85a57 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index bf3dba8382..3381ee9160 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content index 907f164765..60f204c2a8 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content @@ -21,7 +21,7 @@ spec: env: - name: HCLOUD_TOKEN value: REDACTED - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -36,10 +36,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -57,6 +174,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content index a1545bbbeb..953b1ee8e2 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content @@ -21,7 +21,7 @@ spec: env: - name: HCLOUD_TOKEN value: REDACTED - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -36,10 +36,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -57,6 +174,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6c743012bc..694d97dbd0 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 6c743012bc..694d97dbd0 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 6c743012bc..694d97dbd0 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 8d98c355ce..9a8c0b8adf 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 8d98c355ce..9a8c0b8adf 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index 8d98c355ce..9a8c0b8adf 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6c743012bc..694d97dbd0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index 6c743012bc..694d97dbd0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index 6c743012bc..694d97dbd0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 8d98c355ce..9a8c0b8adf 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 8d98c355ce..9a8c0b8adf 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index 8d98c355ce..9a8c0b8adf 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 8d9b38fda2..269d5b853d 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b27fe239ad..e33e1f0543 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 8d9b38fda2..269d5b853d 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b27fe239ad..e33e1f0543 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d2706d4d4e..9617997000 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-ip.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 19468fa4bd..fe028c8ee8 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-ip.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 4d684dc061..a5c4c97490 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-subnet.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 842a1afdff..71ab202bd7 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-subnet.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 1a447c2c1b..9f96e69046 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecalico.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index bd1a027e8f..a1531d470e 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecalico.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 840711e4ed..613a8aef0a 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7a7ec3a281..4f70813f80 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c69179c9ca..16071f98e9 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3cd8a096f4..71f59d6337 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c69179c9ca..16071f98e9 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3cd8a096f4..71f59d6337 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c69179c9ca..16071f98e9 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3cd8a096f4..71f59d6337 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content index 0d19591474..ef2cb5cef4 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/cilium --volume-provider=aws --volume-tag=k8s.io/etcd/cilium --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-cilium type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-cilium.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index f8e131019d..7cdeaf25ec 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index aa075a368a..652fef44b7 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 7a50fcdbe9..d84267282d 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns1.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 391d46ae1d..9b26c2dde0 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns1.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6099d392a1..54a7b2c3de 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns2.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5bedef309b..ccc50c8942 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns2.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 0fb35e8018..e766779868 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateflannel.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index e427b9875f..7f0e1dfb31 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateflannel.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 823be17afe..d0b2b64209 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatekopeio.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c831263709..0c4e309e33 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatekopeio.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d6cc19e78f..bca2517d06 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateweave.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 01569f8e0c..1a7ed6aac9 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateweave.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ffe60bc985..3d5c91b18f 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedsubnet.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c98301be45..b9632b3c67 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedsubnet.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index eaff991fcb..c55cd8f4b1 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedvpc.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 87fd7483b0..821641489b 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedvpc.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 47ac2f2dd1..12cc089aeb 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 1fefb3f3ac..7207269e0e 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -19,7 +19,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -34,10 +34,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -55,6 +172,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 385063fa26..d77cff85bd 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/unmanaged.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5becd5f9d8..f3ec4b269e 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/unmanaged.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6d1e92ae8f..43e6b1c894 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7bc7936a1e..205fc7a2e3 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -18,7 +18,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209 + image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: requests: @@ -33,10 +33,127 @@ spec: name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki + - mountPath: /opt + name: bin - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true hostPID: true + initContainers: + - args: + - -c + - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.2.24/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.2.24-1 + name: init-etcd-3-2-24 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.10/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.10/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.10-0 + name: init-etcd-3-3-10 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.3.17/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.3.17-0 + name: init-etcd-3-3-17 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.13-0 + name: init-etcd-3-4-13 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - mkdir -p /opt/etcd-v3.4.3/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl + /opt/etcd-v3.4.3/ + command: + - /bin/sh + image: registry.k8s.io/etcd:3.4.3-0 + name: init-etcd-3-4-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.0/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.0/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.0-0 + name: init-etcd-3-5-0 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.1/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.1/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.1-0 + name: init-etcd-3-5-1 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.3/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.3/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.3-0 + name: init-etcd-3-5-3 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.4/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.4/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.4-0 + name: init-etcd-3-5-4 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - -c + - cp /usr/local/bin/etcd /opt/etcd-v3.5.6/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.6/etcdctl + command: + - /bin/sh + image: registry.k8s.io/etcd:3.5.6-0 + name: init-etcd-3-5-6 + resources: {} + volumeMounts: + - mountPath: /opt + name: bin priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -54,6 +171,8 @@ spec: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate name: pki + - emptyDir: {} + name: bin - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml index 263ad97081..5d4e31b27c 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml @@ -15,12 +15,12 @@ spec: - etcdMembers: - instanceGroup: master-us-test-1a name: master-us-test-1a - version: 3.1.12 + version: 3.5.6 name: main - etcdMembers: - instanceGroup: master-us-test-1a name: master-us-test-1a - version: 3.1.12 + version: 3.5.6 name: events iam: {} kubernetesVersion: 1.22.0 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml index d708cc340f..dd5df42176 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml @@ -15,12 +15,12 @@ spec: - etcdMembers: - instanceGroup: master-us-test-1a name: master-us-test-1a - version: 3.1.12 + version: 3.5.6 name: main - etcdMembers: - instanceGroup: master-us-test-1a name: master-us-test-1a - version: 3.1.12 + version: 3.5.6 name: events iam: {} kubernetesVersion: 1.22.0 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml index 837dbfdf61..724257ec0c 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml @@ -17,12 +17,12 @@ spec: - etcdMembers: - instanceGroup: master-us-test-1a name: master-us-test-1a - version: 3.1.12 + version: 3.5.6 name: main - etcdMembers: - instanceGroup: master-us-test-1a name: master-us-test-1a - version: 3.1.12 + version: 3.5.6 name: events iam: {} kubernetesVersion: 1.22.0