airship
/
promenade
Code Issues Proposed changes

Uplift etcd to v3.4.13 

Change-Id: I1e4452f3bd9ff434b0b68ddbbdc63c9d600f6932
This commit is contained in:
Phil Sphicas 2021-01-15 20:03:26 +00:00
parent e2324e7db8
commit 023e7d4d7d
14 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/etcd/values.yaml
View File

@ -14,8 +14,8 @@
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
etcdctl_backup: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_bionic"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic

2
doc/source/configuration/genesis.rst
View File

@ -50,7 +50,7 @@ Here is a complete sample document:
kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6
etcd: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6
files:
- path: /var/lib/anchor/calico-etcd-bootstrap

2
examples/basic/Genesis.yaml
View File

@ -53,7 +53,7 @@ data:
kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6
etcd: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6
files:
- path: /var/lib/anchor/calico-etcd-bootstrap

10
examples/basic/armada-resources.yaml
View File

@ -364,8 +364,8 @@ data:
filename: calico-etcd-bootstrap
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:
@ -520,7 +520,7 @@ data:
images:
tags:
calico_etcd: quay.io/coreos/etcd:v3.4.3
calico_etcd: quay.io/coreos/etcd:v3.4.13
calico_node: quay.io/calico/node:v3.4.0
calico_cni: quay.io/calico/cni:v3.4.0
calico_ctl: quay.io/calico/ctl:v3.4.0
@ -1065,8 +1065,8 @@ data:
host_etc_path: /etc/etcd/kubernetes
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:

2
examples/complete/Genesis.yaml
View File

@ -41,7 +41,7 @@ data:
kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6
etcd: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6
files:
- path: /var/lib/anchor/calico-etcd-bootstrap

10
examples/complete/armada-resources.yaml
View File

@ -401,8 +401,8 @@ data:
filename: calico-etcd-bootstrap
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:
@ -541,7 +541,7 @@ data:
images:
tags:
calico_etcd: quay.io/coreos/etcd:v3.4.3
calico_etcd: quay.io/coreos/etcd:v3.4.13
calico_node: quay.io/calico/node:v2.6.5
calico_cni: quay.io/calico/cni:v1.11.2
calico_ctl: quay.io/calico/ctl:v1.6.2
@ -1077,8 +1077,8 @@ data:
host_etc_path: /etc/etcd/kubernetes
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:

2
examples/containerd/Genesis.yaml
View File

@ -53,7 +53,7 @@ data:
kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6
etcd: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6
files:
- path: /var/lib/anchor/calico-etcd-bootstrap

10
examples/containerd/armada-resources.yaml
View File

@ -277,8 +277,8 @@ data:
filename: calico-etcd-bootstrap
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:
@ -414,7 +414,7 @@ data:
images:
tags:
calico_etcd: quay.io/coreos/etcd:v3.4.3
calico_etcd: quay.io/coreos/etcd:v3.4.13
calico_node: quay.io/calico/node:v3.4.0
calico_cni: quay.io/calico/cni:v3.4.0
calico_ctl: quay.io/calico/ctl:v3.4.0
@ -876,8 +876,8 @@ data:
host_etc_path: /etc/etcd/kubernetes
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:

2
examples/gate/Genesis.yaml
View File

@ -53,7 +53,7 @@ data:
kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6
etcd: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6
files:
- path: /var/lib/anchor/calico-etcd-bootstrap

10
examples/gate/armada-resources.yaml
View File

@ -283,8 +283,8 @@ data:
filename: calico-etcd-bootstrap
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:
@ -420,7 +420,7 @@ data:
images:
tags:
calico_etcd: quay.io/coreos/etcd:v3.4.3
calico_etcd: quay.io/coreos/etcd:v3.4.13
calico_node: quay.io/calico/node:v3.4.0
calico_cni: quay.io/calico/cni:v3.4.0
calico_ctl: quay.io/calico/ctl:v3.4.0
@ -882,8 +882,8 @@ data:
host_etc_path: /etc/etcd/kubernetes
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:

2
tests/unit/api/test_validatedesign.py
View File

@ -111,7 +111,7 @@ VALID_DOCS = [
'controller-manager':
'k8s.gcr.io/kube-controller-manager-amd64:v1.18.6',
'etcd':
'quay.io/coreos/etcd:v3.4.3',
'quay.io/coreos/etcd:v3.4.13',
'scheduler':
'k8s.gcr.io/kube-scheduler-amd64:v1.18.6'
}

2
tests/unit/builder_data/simple/Genesis.yaml
View File

@ -38,7 +38,7 @@ data:
kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6
etcd: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6
files:
- path: /var/lib/anchor/calico-etcd-bootstrap

8
tests/unit/builder_data/simple/armada-resources.yaml
View File

@ -304,8 +304,8 @@ data:
filename: calico-etcd-bootstrap
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:
@ -918,8 +918,8 @@ data:
host_etc_path: /etc/etcd/kubernetes
images:
tags:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
etcd: quay.io/coreos/etcd:v3.4.13
etcdctl: quay.io/coreos/etcd:v3.4.13
nodes:
- name: n0
tls:

2
tools/gate/default-config-env
View File

@ -5,7 +5,7 @@ IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2
IMAGE_CALICO_NODE=quay.io/calico/node:v2.6.5
IMAGE_COREDNS=coredns/coredns:1.6.4
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
IMAGE_ETCD=quay.io/coreos/etcd:v3.4.3
IMAGE_ETCD=quay.io/coreos/etcd:v3.4.13
IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0
IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.18.6