From 023e7d4d7dca3827184064844144f227703ff2e9 Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Fri, 15 Jan 2021 20:03:26 +0000 Subject: [PATCH] Uplift etcd to v3.4.13 Change-Id: I1e4452f3bd9ff434b0b68ddbbdc63c9d600f6932 --- charts/etcd/values.yaml | 4 ++-- doc/source/configuration/genesis.rst | 2 +- examples/basic/Genesis.yaml | 2 +- examples/basic/armada-resources.yaml | 10 +++++----- examples/complete/Genesis.yaml | 2 +- examples/complete/armada-resources.yaml | 10 +++++----- examples/containerd/Genesis.yaml | 2 +- examples/containerd/armada-resources.yaml | 10 +++++----- examples/gate/Genesis.yaml | 2 +- examples/gate/armada-resources.yaml | 10 +++++----- tests/unit/api/test_validatedesign.py | 2 +- tests/unit/builder_data/simple/Genesis.yaml | 2 +- tests/unit/builder_data/simple/armada-resources.yaml | 8 ++++---- tools/gate/default-config-env | 2 +- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml index e87263c3..5973f8d3 100644 --- a/charts/etcd/values.yaml +++ b/charts/etcd/values.yaml @@ -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 diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index fc8b8fd0..dcf5163c 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -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 diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 49e14226..3cd6abd8 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -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 diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 63c949fc..b25150c7 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -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: diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index cf4638fd..0195beb6 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -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 diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index cc38d3a4..392b0148 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -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: diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 91aec827..e0dfe0c4 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -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 diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 791f30fa..5a56f378 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -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: diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index 91aec827..e0dfe0c4 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -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 diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index 415e71d4..d24bc17a 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -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: diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 11767750..0067b685 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -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' } diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 3d193971..6968d38b 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -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 diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index 4503712c..5761b81e 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -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: diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 2f2b1081..a06f9dff 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -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