Update ETCD to v3.5.11
Change-Id: I198dca1209097de4d60a53a7568f0c4790679599
This commit is contained in:
parent
6ae2bcf4ba
commit
7c6407809e
1171
charts/etcd/armada-resources.yaml
Normal file
1171
charts/etcd/armada-resources.yaml
Normal file
File diff suppressed because it is too large
Load Diff
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -49,7 +49,7 @@ 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
|
||||||
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
|
||||||
|
@ -363,8 +363,8 @@ data:
|
|||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
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:
|
||||||
@ -519,7 +519,7 @@ data:
|
|||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
calico_etcd: quay.io/coreos/etcd:v3.5.6
|
calico_etcd: quay.io/coreos/etcd:v3.5.11
|
||||||
calico_node: quay.io/calico/node:v3.4.0
|
calico_node: quay.io/calico/node:v3.4.0
|
||||||
calico_cni: quay.io/calico/cni:v3.4.0
|
calico_cni: quay.io/calico/cni:v3.4.0
|
||||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||||
@ -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:
|
||||||
|
@ -38,7 +38,7 @@ 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
|
||||||
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
|
||||||
|
@ -400,8 +400,8 @@ data:
|
|||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
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:
|
||||||
@ -540,7 +540,7 @@ data:
|
|||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
calico_etcd: quay.io/coreos/etcd:v3.5.6
|
calico_etcd: quay.io/coreos/etcd:v3.5.11
|
||||||
calico_node: quay.io/calico/node:v3.4.0
|
calico_node: quay.io/calico/node:v3.4.0
|
||||||
calico_cni: quay.io/calico/cni:v3.4.0
|
calico_cni: quay.io/calico/cni:v3.4.0
|
||||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||||
@ -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:
|
||||||
|
@ -49,7 +49,7 @@ 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
|
||||||
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
|
||||||
|
@ -276,8 +276,8 @@ data:
|
|||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
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:
|
||||||
@ -413,7 +413,7 @@ data:
|
|||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
calico_etcd: quay.io/coreos/etcd:v3.5.6
|
calico_etcd: quay.io/coreos/etcd:v3.5.11
|
||||||
calico_node: quay.io/calico/node:v3.4.0
|
calico_node: quay.io/calico/node:v3.4.0
|
||||||
calico_cni: quay.io/calico/cni:v3.4.0
|
calico_cni: quay.io/calico/cni:v3.4.0
|
||||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||||
@ -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:
|
||||||
|
@ -49,7 +49,7 @@ 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
|
||||||
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
|
||||||
|
@ -282,8 +282,8 @@ data:
|
|||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
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:
|
||||||
@ -419,7 +419,7 @@ data:
|
|||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
calico_etcd: quay.io/coreos/etcd:v3.5.6
|
calico_etcd: quay.io/coreos/etcd:v3.5.11
|
||||||
calico_node: quay.io/calico/node:v3.4.0
|
calico_node: quay.io/calico/node:v3.4.0
|
||||||
calico_cni: quay.io/calico/cni:v3.4.0
|
calico_cni: quay.io/calico/cni:v3.4.0
|
||||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||||
@ -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:
|
||||||
|
@ -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
|
||||||
|
@ -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'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -35,7 +35,7 @@ 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
|
||||||
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
|
||||||
|
@ -303,8 +303,8 @@ data:
|
|||||||
filename: calico-etcd-bootstrap
|
filename: calico-etcd-bootstrap
|
||||||
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:
|
||||||
@ -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,7 +6,7 @@ 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_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
|
||||||
|
Loading…
Reference in New Issue
Block a user