Skip to content

Commit

Permalink
Merge pull request #9016 from justinsb/update_etcd_manager
Browse files Browse the repository at this point in the history
Update to etcd-manager 3.0.20200429
k8s-ci-robot authored Apr 30, 2020
2 parents e39ea8d + 35a42c3 commit 7193419
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pkg/model/components/etcd.go
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import (
"k8s.io/kops/upup/pkg/fi/loader"
)

const DefaultBackupImage = "kopeio/etcd-backup:3.0.20200307"
const DefaultBackupImage = "kopeio/etcd-backup:3.0.20200429"

// EtcdOptionsBuilder adds options for etcd to the model
type EtcdOptionsBuilder struct {
2 changes: 1 addition & 1 deletion pkg/model/components/etcdmanager/model.go
Original file line number Diff line number Diff line change
@@ -199,7 +199,7 @@ metadata:
namespace: kube-system
spec:
containers:
- image: kopeio/etcd-manager:3.0.20200307
- image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:
2 changes: 1 addition & 1 deletion pkg/model/components/etcdmanager/options.go
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error {
return nil
}

var supportedEtcdVersions = []string{"2.2.1", "3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.4.3"}
var supportedEtcdVersions = []string{"2.2.1", "3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3"}

func etcdVersionIsSupported(version string) bool {
version = strings.TrimPrefix(version, "v")
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
Original file line number Diff line number Diff line change
@@ -89,7 +89,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.20200307
image: kopeio/etcd-manager:3.0.20200429
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.20200307
image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:
Original file line number Diff line number Diff line change
@@ -89,7 +89,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.20200307
image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:
@@ -160,7 +160,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.20200307
image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ Contents:
env:
- name: ETCD_QUOTA_BACKEND_BYTES
value: "10737418240"
image: kopeio/etcd-manager:3.0.20200307
image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:
@@ -160,7 +160,7 @@ Contents:
env:
- name: ETCD_QUOTA_BACKEND_BYTES
value: "10737418240"
image: kopeio/etcd-manager:3.0.20200307
image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ Contents:
value: http://proxy.example.com
- name: no_proxy
value: noproxy.example.com
image: kopeio/etcd-manager:3.0.20200307
image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:
@@ -178,7 +178,7 @@ Contents:
value: http://proxy.example.com
- name: no_proxy
value: noproxy.example.com
image: kopeio/etcd-manager:3.0.20200307
image: kopeio/etcd-manager:3.0.20200429
name: etcd-manager
resources:
requests:

0 comments on commit 7193419

Please sign in to comment.