airship
/
promenade
Code Issues Proposed changes

Update ETCD to v3.5.11 

Change-Id: I198dca1209097de4d60a53a7568f0c4790679599
This commit is contained in:
SPEARS, DUSTIN (ds443n) 2024-02-05 10:32:50 -05:00
parent 6ae2bcf4ba
commit 76763e8c9c
18 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl
View File

@ -16,24 +16,14 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- define "etcdreadinessProbeTemplate" }} {{- define "etcdreadinessProbeTemplate" }}
exec: httpGet:
command: path: /health
- /bin/sh port: {{ .Values.network.service_client.target_port }}
- -c
- |-
export ETCDCTL_ENDPOINTS=https://$POD_IP:{{ .Values.network.service_client.target_port }}
etcdctl endpoint health
exit $?
{{- end }} {{- end }}
{{- define "etcdlivenessProbeTemplate" }} {{- define "etcdlivenessProbeTemplate" }}
exec: httpGet:
command: path: /health
- /bin/sh port: {{ .Values.network.service_client.target_port }}
- -c
- |-
export ETCDCTL_ENDPOINTS=https://$POD_IP:{{ .Values.network.service_client.target_port }}
etcdctl endpoint status
exit $?
{{- end }} {{- end }}
# Strip off "etcd" from service name to get the application name # Strip off "etcd" from service name to get the application name
# Note that application can either be kubernetes or calico for now # Note that application can either be kubernetes or calico for now

4
charts/etcd/values.yaml
View File

@ -14,8 +14,8 @@
images: images:
tags: tags:
etcd: quay.io/coreos/etcd:v3.5.6 etcd: quay.io/coreos/etcd:v3.5.11
etcdctl: quay.io/coreos/etcd:v3.5.6 etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
etcdctl_backup: "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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic

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

@ -45,7 +45,7 @@ Here is a complete sample document:
kubernetes: kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0
controller-manager: registry.k8s.io/kube-controller-manager-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 scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap

3
examples/basic/Genesis.yaml
View File

@ -49,7 +49,8 @@ data:
kubernetes: kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0
controller-manager: registry.k8s.io/kube-controller-manager-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 scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap

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

@ -1071,8 +1071,8 @@ data:
host_etc_path: /etc/etcd/kubernetes host_etc_path: /etc/etcd/kubernetes
images: images:
tags: tags:
etcd: quay.io/coreos/etcd:v3.5.6 etcd: quay.io/coreos/etcd:v3.5.11
etcdctl: quay.io/coreos/etcd:v3.5.6 etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
nodes: nodes:
- name: n0 - name: n0
tls: tls:

3
examples/complete/Genesis.yaml
View File

@ -38,7 +38,8 @@ data:
kubernetes: kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0
controller-manager: registry.k8s.io/kube-controller-manager-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 scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap

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

@ -1082,8 +1082,8 @@ data:
host_etc_path: /etc/etcd/kubernetes host_etc_path: /etc/etcd/kubernetes
images: images:
tags: tags:
etcd: quay.io/coreos/etcd:v3.5.6 etcd: quay.io/coreos/etcd:v3.5.11
etcdctl: quay.io/coreos/etcd:v3.5.6 etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
nodes: nodes:
- name: n0 - name: n0
tls: tls:

3
examples/containerd/Genesis.yaml
View File

@ -49,7 +49,8 @@ data:
kubernetes: kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0
controller-manager: registry.k8s.io/kube-controller-manager-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 scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap

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

@ -883,8 +883,8 @@ data:
host_etc_path: /etc/etcd/kubernetes host_etc_path: /etc/etcd/kubernetes
images: images:
tags: tags:
etcd: quay.io/coreos/etcd:v3.5.6 etcd: quay.io/coreos/etcd:v3.5.11
etcdctl: quay.io/coreos/etcd:v3.5.6 etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
nodes: nodes:
- name: n0 - name: n0
tls: tls:

3
examples/gate/Genesis.yaml
View File

@ -49,7 +49,8 @@ data:
kubernetes: kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0
controller-manager: registry.k8s.io/kube-controller-manager-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 scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap

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

@ -889,8 +889,8 @@ data:
host_etc_path: /etc/etcd/kubernetes host_etc_path: /etc/etcd/kubernetes
images: images:
tags: tags:
etcd: quay.io/coreos/etcd:v3.5.6 etcd: quay.io/coreos/etcd:v3.5.11
etcdctl: quay.io/coreos/etcd:v3.5.6 etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
nodes: nodes:
- name: n0 - name: n0
tls: tls:

2
promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml
View File

@ -20,7 +20,7 @@ spec:
{%- endwith %} {%- endwith %}
- name: monitor - name: monitor
image: {{ config['Genesis:images.kubernetes.etcd'] }} image: {{ config['Genesis:images.kubernetes.etcdctl'] }}
command: command:
- /bin/sh - /bin/sh
- -c - -c

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

@ -107,7 +107,7 @@ VALID_DOCS = [
'registry.k8s.io/kube-apiserver-amd64:v1.29.0', 'registry.k8s.io/kube-apiserver-amd64:v1.29.0',
'controller-manager': 'controller-manager':
'registry.k8s.io/kube-controller-manager-amd64:v1.29.0', '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' 'scheduler': 'registry.k8s.io/kube-scheduler-amd64:v1.29.0'
} }
}, },

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

@ -35,7 +35,8 @@ data:
kubernetes: kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0 apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.0
controller-manager: registry.k8s.io/kube-controller-manager-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 scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.0
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap

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

@ -923,8 +923,8 @@ data:
host_etc_path: /etc/etcd/kubernetes host_etc_path: /etc/etcd/kubernetes
images: images:
tags: tags:
etcd: quay.io/coreos/etcd:v3.5.6 etcd: quay.io/coreos/etcd:v3.5.11
etcdctl: quay.io/coreos/etcd:v3.5.6 etcdctl: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
nodes: nodes:
- name: n0 - name: n0
tls: tls:

6
tools/gate/config-templates/bootstrap-armada-config.yaml
View File

@ -328,8 +328,8 @@ data:
filename: calico-etcd-bootstrap filename: calico-etcd-bootstrap
images: images:
tags: tags:
etcd: ${IMAGE_ETCD} etcd: quay.io/coreos/etcd:v3.5.6
etcdctl: ${IMAGE_ETCD} etcdctl: quay.io/coreos/etcd:v3.5.6
nodes: nodes:
- name: ${GENESIS_HOSTNAME} - name: ${GENESIS_HOSTNAME}
tls: tls:
@ -965,7 +965,7 @@ data:
images: images:
tags: tags:
etcd: ${IMAGE_ETCD} etcd: ${IMAGE_ETCD}
etcdctl: ${IMAGE_ETCD} etcdctl: ${IMAGE_ETCDCTL}
nodes: nodes:
- name: ${GENESIS_HOSTNAME} - name: ${GENESIS_HOSTNAME}
tls: tls:

1
tools/gate/config-templates/genesis-config.yaml
View File

@ -35,6 +35,7 @@ data:
apiserver: ${IMAGE_APISERVER} apiserver: ${IMAGE_APISERVER}
controller-manager: ${IMAGE_CONTROLLER_MANAGER} controller-manager: ${IMAGE_CONTROLLER_MANAGER}
etcd: ${IMAGE_ETCD} etcd: ${IMAGE_ETCD}
etcdctl: ${IMAGE_ETCDCTL}
scheduler: ${IMAGE_SCHEDULER} scheduler: ${IMAGE_SCHEDULER}
enable_operator: false enable_operator: false
files: files:

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

@ -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_CALICO_NODE=quay.io/calico/node:v3.4.0
IMAGE_COREDNS=coredns/coredns:1.9.4 IMAGE_COREDNS=coredns/coredns:1.9.4
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 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_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v3.13.2 IMAGE_HELM=lachlanevenson/k8s-helm:v3.13.2
IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.29.0 IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.29.0