From 99f441ca8d18c9f9ef42997f13c551b27350f88e Mon Sep 17 00:00:00 2001 From: Justin SB Date: Sun, 21 Mar 2021 12:18:19 -0400 Subject: [PATCH 1/2] 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 ++-- pkg/model/components/etcdmanager/tests/proxy/tasks.yaml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index a7653b63159aa..8b31177455926 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -170,7 +170,7 @@ metadata: namespace: kube-system spec: containers: - - image: kopeio/etcd-manager:3.0.20210122 + - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 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 c5ea6892566e7..7209e0e0ff2da 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -80,7 +80,7 @@ Contents: - /bin/sh - -c - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997 --insecure=false --peer-urls=https://__name__:2381 --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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 name: etcd-manager resources: requests: @@ -139,7 +139,7 @@ Contents: - /bin/sh - -c - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996 --insecure=false --peer-urls=https://__name__:2380 --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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 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 7dc2427d3fb11..bb9d39aeb2c5a 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 @@ -80,7 +80,7 @@ Contents: - /bin/sh - -c - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-events --client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3997 --insecure=false --peer-urls=https://__name__:2381 --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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 name: etcd-manager resources: requests: @@ -145,7 +145,7 @@ Contents: - /bin/sh - -c - mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /etcd-manager --backup-store=memfs://clusters.example.com/minimal.example.com/backups/etcd-main --client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true --dns-suffix=.internal.minimal.example.com --etcd-insecure=true --grpc-port=3996 --insecure=false --peer-urls=https://__name__:2380 --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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 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 c05736cca8e86..a82f4e9c91b3d 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -83,7 +83,7 @@ Contents: env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 name: etcd-manager resources: requests: @@ -145,7 +145,7 @@ Contents: env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 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 04ccf014b724f..933181215f81a 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -89,7 +89,7 @@ Contents: value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 name: etcd-manager resources: requests: @@ -163,7 +163,7 @@ Contents: value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: kopeio/etcd-manager:3.0.20210122 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 name: etcd-manager resources: requests: From 2610aa66bad0b2bdb37aa66ddd31686f401d6df7 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 8 May 2021 07:11:02 +0300 Subject: [PATCH 2/2] Use etcd-backup built from etcdadm repo --- pkg/model/components/etcd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go index 555eb61180503..adea3fcc9aa41 100644 --- a/pkg/model/components/etcd.go +++ b/pkg/model/components/etcd.go @@ -24,7 +24,7 @@ import ( "k8s.io/kops/upup/pkg/fi/loader" ) -const DefaultBackupImage = "kopeio/etcd-backup:3.0.20210122" +const DefaultBackupImage = "k8s.gcr.io/etcdadm/etcd-backup:3.0.20210430" // EtcdOptionsBuilder adds options for etcd to the model type EtcdOptionsBuilder struct {