From 28f184f68aab493b70d512f0848567e164b22bc8 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Fri, 22 Jan 2021 16:01:03 -0500 Subject: [PATCH] etcd-manager: Update to 3.0.20210122 Upstream changes: * Release notes for 3.0.20201209 * Handling hanging list command from etcd client during reconciliation loop * Update dependencies to match kOps 1.19 * Include IPs in peer certificates * Use etcd v3.4.13 in tests * Eager-broadcast leadership on every leader iteration * Update Go to 1.15.7 --- pkg/model/components/etcd.go | 2 +- 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 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go index 6ae60da950..dd434f8d90 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.20201209" +const DefaultBackupImage = "kopeio/etcd-backup:3.0.20210122" // EtcdOptionsBuilder adds options for etcd to the model type EtcdOptionsBuilder struct { diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index 2907c7bef5..502531d836 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -171,7 +171,7 @@ metadata: namespace: kube-system spec: containers: - - image: kopeio/etcd-manager:3.0.20201209 + - image: kopeio/etcd-manager:3.0.20210122 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 a6636499ac..33ead928f4 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -74,7 +74,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.20201209 + image: kopeio/etcd-manager:3.0.20210122 name: etcd-manager resources: requests: @@ -131,7 +131,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.20201209 + image: kopeio/etcd-manager:3.0.20210122 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 017426fa16..e037963be9 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 @@ -74,7 +74,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.20201209 + image: kopeio/etcd-manager:3.0.20210122 name: etcd-manager resources: requests: @@ -137,7 +137,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.20201209 + image: kopeio/etcd-manager:3.0.20210122 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 1237fdcdc3..b499148ddf 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -77,7 +77,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: kopeio/etcd-manager:3.0.20201209 + image: kopeio/etcd-manager:3.0.20210122 name: etcd-manager resources: requests: @@ -137,7 +137,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: kopeio/etcd-manager:3.0.20201209 + image: kopeio/etcd-manager:3.0.20210122 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 37692cdb81..62e846201e 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -83,7 +83,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: kopeio/etcd-manager:3.0.20201209 + image: kopeio/etcd-manager:3.0.20210122 name: etcd-manager resources: requests: @@ -155,7 +155,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: kopeio/etcd-manager:3.0.20201209 + image: kopeio/etcd-manager:3.0.20210122 name: etcd-manager resources: requests: