Update ETCD to v3.5.11
Change-Id: I198dca1209097de4d60a53a7568f0c4790679599
This commit is contained in:
parent
6ae2bcf4ba
commit
76763e8c9c
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -20,7 +20,7 @@ spec:
|
||||
{%- endwith %}
|
||||
|
||||
- name: monitor
|
||||
image: {{ config['Genesis:images.kubernetes.etcd'] }}
|
||||
image: {{ config['Genesis:images.kubernetes.etcdctl'] }}
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
|
@ -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'
|
||||
}
|
||||
},
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -328,8 +328,8 @@ data:
|
||||
filename: calico-etcd-bootstrap
|
||||
images:
|
||||
tags:
|
||||
etcd: ${IMAGE_ETCD}
|
||||
etcdctl: ${IMAGE_ETCD}
|
||||
etcd: quay.io/coreos/etcd:v3.5.6
|
||||
etcdctl: quay.io/coreos/etcd:v3.5.6
|
||||
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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user