Skip to content

Commit

Permalink
Update etcd-manager to 20201209
Browse files Browse the repository at this point in the history
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 [kubernetes#372](kopeio/etcd-manager#372)
* Exclude gazelle from tools/deb-tools [kubernetes#373](kopeio/etcd-manager#373)
* Regenerate bazel in tools/deb-tools [kubernetes#374](kopeio/etcd-manager#374)
* Release notes for 3.0.20201202 [kubernetes#375](kopeio/etcd-manager#375)
* Remove travis CI [kubernetes#377](kopeio/etcd-manager#377)
* Fix vendor generation for tools/deb-tools subproject [kubernetes#376](kopeio/etcd-manager#376)
* Add script to verify image hashes [kubernetes#380](kopeio/etcd-manager#380)
* Fix some incorrect base image hashes for arm64 [kubernetes#379](kopeio/etcd-manager#379)
* Support Azure [kubernetes#378](kopeio/etcd-manager#378)
* Add more descriptions to wait loops [kubernetes#383](kopeio/etcd-manager#383)
* Rename fields in the azure client struct [kubernetes#382](kopeio/etcd-manager#382)
* Fix small typo in code comment [kubernetes#381](kopeio/etcd-manager#381)
  • Loading branch information
justinsb authored and Ciprian Hacman committed Dec 9, 2020
1 parent 6bbc4ba commit c3ca2ac
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pkg/model/components/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/etcdmanager/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit c3ca2ac

Please sign in to comment.