From ea2105482fe2aebbf68c68747f64f28960c32e22 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Sun, 21 Mar 2021 12:18:19 -0400 Subject: [PATCH] WIP: Use etcd-manager built from etcdadm repo We can now use etcd-manager as built from the kubernetes-sigs/etcdadm repo. --- pkg/model/components/etcdmanager/model.go | 2 +- pkg/model/components/etcdmanager/tests/minimal/tasks.yaml | 4 ++-- .../etcdmanager/tests/old_versions_mount_hosts/tasks.yaml | 4 ++-- .../etcdmanager/tests/overwrite_settings/tasks.yaml | 4 ++-- .../components/etcdmanager/tests/pollinterval/tasks.yaml | 4 ++-- pkg/model/components/etcdmanager/tests/proxy/tasks.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index b36e27781d9b7..95320634272e9 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -172,7 +172,7 @@ metadata: namespace: kube-system spec: containers: - - image: kopeio/etcd-manager:3.0.20210228 + - image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index d96b6369ad74a..75a1121c02616 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -83,7 +83,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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: @@ -148,7 +148,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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml b/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml index 0547f5eb217ce..5e1a9d3d5eb17 100644 --- a/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml @@ -83,7 +83,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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: @@ -154,7 +154,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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index 8c0782bc5d312..11b432f0c30f9 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -86,7 +86,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: @@ -154,7 +154,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml index 064dd59ba1f88..a17f28b53a74e 100644 --- a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml @@ -83,7 +83,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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: @@ -148,7 +148,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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index 31e97aaa1269b..571b161a3c0a7 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -92,7 +92,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: @@ -172,7 +172,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: kopeio/etcd-manager:3.0.20210228 + image: gcr.io/k8s-staging-etcdadm/etcd-manager:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: requests: