From c3381e1e8720ee3993c2e8621f148dc45c8f6ce4 Mon Sep 17 00:00:00 2001 From: "SPEARS, DUSTIN (ds443n)" Date: Mon, 5 Feb 2024 10:32:50 -0500 Subject: [PATCH] Update ETCD to v3.5.11 Change-Id: I198dca1209097de4d60a53a7568f0c4790679599 --- .../templates/etc/_kubernetes-etcd.yaml.tpl | 22 +++++-------------- charts/etcd/values.yaml | 4 ++-- doc/source/configuration/genesis.rst | 2 +- examples/basic/Genesis.yaml | 3 ++- examples/basic/armada-resources.yaml | 8 +++---- examples/complete/Genesis.yaml | 3 ++- examples/complete/armada-resources.yaml | 8 +++---- examples/containerd/Genesis.yaml | 3 ++- examples/containerd/armada-resources.yaml | 8 +++---- examples/gate/Genesis.yaml | 3 ++- examples/gate/armada-resources.yaml | 8 +++---- .../manifests/auxiliary-kubernetes-etcd.yaml | 2 +- tests/unit/api/test_validatedesign.py | 2 +- tests/unit/builder_data/simple/Genesis.yaml | 3 ++- .../builder_data/simple/armada-resources.yaml | 8 +++---- .../bootstrap-armada-config.yaml | 4 ++-- .../gate/config-templates/genesis-config.yaml | 1 + tools/gate/default-config-env | 3 ++- 18 files changed, 46 insertions(+), 49 deletions(-) diff --git a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl index c4850bc1..8a2b963a 100644 --- a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl +++ b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl @@ -16,24 +16,14 @@ {{- $envAll := . }} {{- define "etcdreadinessProbeTemplate" }} -exec: - command: - - /bin/sh - - -c - - |- - export ETCDCTL_ENDPOINTS=https://$POD_IP:{{ .Values.network.service_client.target_port }} - etcdctl endpoint health - exit $? + httpGet: + path: /health + port: {{ .Values.network.service_client.target_port }} {{- end }} {{- define "etcdlivenessProbeTemplate" }} -exec: - command: - - /bin/sh - - -c - - |- - export ETCDCTL_ENDPOINTS=https://$POD_IP:{{ .Values.network.service_client.target_port }} - etcdctl endpoint status - exit $? + httpGet: + path: /health + port: {{ .Values.network.service_client.target_port }} {{- end }} # Strip off "etcd" from service name to get the application name # Note that application can either be kubernetes or calico for now diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml index 13f68342..e35ed508 100644 --- a/charts/etcd/values.yaml +++ b/charts/etcd/values.yaml @@ -14,8 +14,8 @@ images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" etcdctl_backup: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" 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 3544640a..122f49bb 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -45,7 +45,7 @@ Here is a complete sample document: kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.0 - etcd: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 7aa260ec..ba850c60 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -49,7 +49,8 @@ data: kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.0 - etcd: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index c9de117d..519cf2f4 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -363,8 +363,8 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: @@ -1071,8 +1071,8 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 8f1f601c..2d06375d 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -38,7 +38,8 @@ data: kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.0 - etcd: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 07f310f7..6ae62cb9 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -400,8 +400,8 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: @@ -1082,8 +1082,8 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index e6ebcdf1..51d32204 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -49,7 +49,8 @@ data: kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.0 - etcd: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 89c241cf..fba9e8f3 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -276,8 +276,8 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: @@ -883,8 +883,8 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index e6ebcdf1..51d32204 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -49,7 +49,8 @@ data: kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.0 - etcd: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index ed71d90e..d5dcd186 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -282,8 +282,8 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: @@ -889,8 +889,8 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml index 1d967c13..6ee6e770 100644 --- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml +++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml @@ -20,7 +20,7 @@ spec: {%- endwith %} - name: monitor - image: {{ config['Genesis:images.kubernetes.etcd'] }} + image: {{ config['Genesis:images.kubernetes.etcdctl'] }} command: - /bin/sh - -c diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 703e042f..b96567f7 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -107,7 +107,7 @@ VALID_DOCS = [ 'registry.k8s.io/kube-apiserver-amd64:v1.29.0', 'controller-manager': 'registry.k8s.io/kube-controller-manager-amd64:v1.29.0', - 'etcd': 'quay.io/coreos/etcd:v3.5.6', + 'etcd': 'quay.io/coreos/etcd:v3.5.11', 'scheduler': 'registry.k8s.io/kube-scheduler-amd64:v1.29.0' } }, diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index e276d410..dc8a8b76 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -35,7 +35,8 @@ data: kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.0 - etcd: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0 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 518a0969..fc73b2d9 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -303,8 +303,8 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: @@ -923,8 +923,8 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.6 - etcdctl: quay.io/coreos/etcd:v3.5.6 + etcd: quay.io/coreos/etcd:v3.5.11 + etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal" nodes: - name: n0 tls: diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml index 431870cd..82868de5 100644 --- a/tools/gate/config-templates/bootstrap-armada-config.yaml +++ b/tools/gate/config-templates/bootstrap-armada-config.yaml @@ -329,7 +329,7 @@ data: images: tags: etcd: ${IMAGE_ETCD} - etcdctl: ${IMAGE_ETCD} + etcdctl: ${IMAGE_ETCDCTL} nodes: - name: ${GENESIS_HOSTNAME} tls: @@ -965,7 +965,7 @@ data: images: tags: etcd: ${IMAGE_ETCD} - etcdctl: ${IMAGE_ETCD} + etcdctl: ${IMAGE_ETCDCTL} nodes: - name: ${GENESIS_HOSTNAME} tls: diff --git a/tools/gate/config-templates/genesis-config.yaml b/tools/gate/config-templates/genesis-config.yaml index 8d7f93a7..e42fee13 100644 --- a/tools/gate/config-templates/genesis-config.yaml +++ b/tools/gate/config-templates/genesis-config.yaml @@ -35,6 +35,7 @@ data: apiserver: ${IMAGE_APISERVER} controller-manager: ${IMAGE_CONTROLLER_MANAGER} etcd: ${IMAGE_ETCD} + etcdctl: ${IMAGE_ETCDCTL} scheduler: ${IMAGE_SCHEDULER} enable_operator: false files: diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 62c66d88..6f58c5ac 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -6,7 +6,8 @@ IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v3.4.0 IMAGE_CALICO_NODE=quay.io/calico/node:v3.4.0 IMAGE_COREDNS=coredns/coredns:1.9.4 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 -IMAGE_ETCD=quay.io/coreos/etcd:v3.5.6 +IMAGE_ETCD=quay.io/coreos/etcd:v3.5.11 +IMAGE_ETCDCTL=quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HELM=lachlanevenson/k8s-helm:v3.13.2 IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.29.0