mirror of https://github.com/kubernetes/kops.git
Merge pull request #9237 from hakman/etcd-manager-update
Update etcd-manager to 3.0.20200531
This commit is contained in:
commit
d55e28f0ab
|
@ -24,7 +24,7 @@ import (
|
||||||
"k8s.io/kops/upup/pkg/fi/loader"
|
"k8s.io/kops/upup/pkg/fi/loader"
|
||||||
)
|
)
|
||||||
|
|
||||||
const DefaultBackupImage = "kopeio/etcd-backup:3.0.20200527"
|
const DefaultBackupImage = "kopeio/etcd-backup:3.0.20200531"
|
||||||
|
|
||||||
// EtcdOptionsBuilder adds options for etcd to the model
|
// EtcdOptionsBuilder adds options for etcd to the model
|
||||||
type EtcdOptionsBuilder struct {
|
type EtcdOptionsBuilder struct {
|
||||||
|
|
|
@ -158,7 +158,7 @@ metadata:
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: kopeio/etcd-manager:3.0.20200527
|
- image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
|
|
@ -89,7 +89,7 @@ Contents:
|
||||||
--v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
|
--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
|
--volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
|
||||||
> /tmp/pipe 2>&1
|
> /tmp/pipe 2>&1
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
@ -154,7 +154,7 @@ Contents:
|
||||||
--v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
|
--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
|
--volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
|
||||||
> /tmp/pipe 2>&1
|
> /tmp/pipe 2>&1
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
|
|
@ -89,7 +89,7 @@ Contents:
|
||||||
--v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
|
--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
|
--volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
|
||||||
> /tmp/pipe 2>&1
|
> /tmp/pipe 2>&1
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
@ -160,7 +160,7 @@ Contents:
|
||||||
--v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
|
--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
|
--volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
|
||||||
> /tmp/pipe 2>&1
|
> /tmp/pipe 2>&1
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
|
|
@ -92,7 +92,7 @@ Contents:
|
||||||
env:
|
env:
|
||||||
- name: ETCD_QUOTA_BACKEND_BYTES
|
- name: ETCD_QUOTA_BACKEND_BYTES
|
||||||
value: "10737418240"
|
value: "10737418240"
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
@ -160,7 +160,7 @@ Contents:
|
||||||
env:
|
env:
|
||||||
- name: ETCD_QUOTA_BACKEND_BYTES
|
- name: ETCD_QUOTA_BACKEND_BYTES
|
||||||
value: "10737418240"
|
value: "10737418240"
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
|
|
@ -98,7 +98,7 @@ Contents:
|
||||||
value: http://proxy.example.com
|
value: http://proxy.example.com
|
||||||
- name: no_proxy
|
- name: no_proxy
|
||||||
value: noproxy.example.com
|
value: noproxy.example.com
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
@ -178,7 +178,7 @@ Contents:
|
||||||
value: http://proxy.example.com
|
value: http://proxy.example.com
|
||||||
- name: no_proxy
|
- name: no_proxy
|
||||||
value: noproxy.example.com
|
value: noproxy.example.com
|
||||||
image: kopeio/etcd-manager:3.0.20200527
|
image: kopeio/etcd-manager:3.0.20200531
|
||||||
name: etcd-manager
|
name: etcd-manager
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
|
Loading…
Reference in New Issue