From dc48ca690552adc20a35528bf024882aa67e6efe Mon Sep 17 00:00:00 2001 From: Justin SB Date: Wed, 9 Dec 2020 09:30:44 -0500 Subject: [PATCH] Update etcd-manager to 20201209 Highlights: * Fix arm64 images, which were built with an incorrect base image. * Initial (experimental) Azure support Full change list: * Update Kops dependency for Azure Blob Storage support [#372](https://github.com/kopeio/etcd-manager/pull/372) * Exclude gazelle from tools/deb-tools [#373](https://github.com/kopeio/etcd-manager/pull/373) * Regenerate bazel in tools/deb-tools [#374](https://github.com/kopeio/etcd-manager/pull/374) * Release notes for 3.0.20201202 [#375](https://github.com/kopeio/etcd-manager/pull/375) * Remove travis CI [#377](https://github.com/kopeio/etcd-manager/pull/377) * Fix vendor generation for tools/deb-tools subproject [#376](https://github.com/kopeio/etcd-manager/pull/376) * Add script to verify image hashes [#380](https://github.com/kopeio/etcd-manager/pull/380) * Fix some incorrect base image hashes for arm64 [#379](https://github.com/kopeio/etcd-manager/pull/379) * Support Azure [#378](https://github.com/kopeio/etcd-manager/pull/378) * Add more descriptions to wait loops [#383](https://github.com/kopeio/etcd-manager/pull/383) * Rename fields in the azure client struct [#382](https://github.com/kopeio/etcd-manager/pull/382) * Fix small typo in code comment [#381](https://github.com/kopeio/etcd-manager/pull/381) --- 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 79694785a61ce..6ae60da9507a1 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.20201202" +const DefaultBackupImage = "kopeio/etcd-backup:3.0.20201209" // 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 542270250018e..1ee7c152eced2 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.20201202 + - image: kopeio/etcd-manager:3.0.20201209 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 ea7c6c92bafe4..d1a5be96921dd 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.20201202 + image: kopeio/etcd-manager:3.0.20201209 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.20201202 + image: kopeio/etcd-manager:3.0.20201209 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 a224f66b25b8a..3b4d1c4f52dce 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.20201202 + image: kopeio/etcd-manager:3.0.20201209 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.20201202 + image: kopeio/etcd-manager:3.0.20201209 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 b821facf5fc4f..07f2a5cb3b655 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.20201202 + image: kopeio/etcd-manager:3.0.20201209 name: etcd-manager resources: requests: @@ -145,7 +145,7 @@ Contents: env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: kopeio/etcd-manager:3.0.20201202 + image: kopeio/etcd-manager:3.0.20201209 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 d33cec92b126b..18c41b66fe2a2 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.20201202 + image: kopeio/etcd-manager:3.0.20201209 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.20201202 + image: kopeio/etcd-manager:3.0.20201209 name: etcd-manager resources: requests: