Update ETCD to v3.5.11
Change-Id: I198dca1209097de4d60a53a7568f0c4790679599
This commit is contained in:
parent
6ae2bcf4ba
commit
72738f4904
@ -125,13 +125,32 @@ spec:
|
||||
- name: MANIFEST_PATH
|
||||
value: /manifests/{{ .Values.service.name }}.yaml
|
||||
{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env.etcd | indent 8 }}
|
||||
{{ dict "envAll" $envAll "component" "etcd" "container" "etcd" "type" "readiness" "probeTemplate" (include "etcdreadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 6 }}
|
||||
{{ dict "envAll" $envAll "component" "etcd" "container" "etcd" "type" "liveness" "probeTemplate" (include "etcdlivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 6 }}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /var/lib/etcd
|
||||
- name: etc
|
||||
mountPath: /etc/etcd
|
||||
- name: etcd-health-check
|
||||
image: {{ .Values.images.tags.etcdctl }}
|
||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||
{{ tuple $envAll $envAll.Values.pod.resources.etcd_pod | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
|
||||
{{ dict "envAll" $envAll "application" "etcd" "container" "etcd" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }}
|
||||
env:
|
||||
- name: ETCDCTL_API
|
||||
value: "{{ .Values.etcd.etcdctl_api }}"
|
||||
- name: ETCDCTL_DIAL_TIMEOUT
|
||||
value: "3s"
|
||||
- name: ETCDCTL_ENDPOINTS
|
||||
value: "https://127.0.0.1:{{ .Values.network.service_client.target_port }}"
|
||||
- name: ETCDCTL_CACERT
|
||||
value: "/etc/etcd/tls/client-ca.pem"
|
||||
- name: ETCDCTL_CERT
|
||||
value: "/etc/etcd/tls/etcd-client.pem"
|
||||
- name: ETCDCTL_KEY
|
||||
value: "/etc/etcd/tls/etcd-client-key.pem"
|
||||
volumeMounts:
|
||||
- name: etc
|
||||
mountPath: /etc/etcd
|
||||
volumes:
|
||||
- name: data
|
||||
hostPath:
|
||||
|
@ -14,9 +14,9 @@
|
||||
|
||||
images:
|
||||
tags:
|
||||
etcd: quay.io/coreos/etcd:v3.5.6
|
||||
etcdctl: quay.io/coreos/etcd:v3.5.6
|
||||
etcdctl_backup: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
|
||||
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
|
||||
pull_policy: "IfNotPresent"
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
@ -519,7 +519,7 @@ data:
|
||||
|
||||
images:
|
||||
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_cni: quay.io/calico/cni:v3.4.0
|
||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||
@ -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
|
||||
|
@ -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:
|
||||
@ -540,7 +540,7 @@ data:
|
||||
|
||||
images:
|
||||
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_cni: quay.io/calico/cni:v3.4.0
|
||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||
@ -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
|
||||
|
@ -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:
|
||||
@ -413,7 +413,7 @@ data:
|
||||
|
||||
images:
|
||||
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_cni: quay.io/calico/cni:v3.4.0
|
||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||
@ -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
|
||||
|
@ -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:
|
||||
@ -419,7 +419,7 @@ data:
|
||||
|
||||
images:
|
||||
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_cni: quay.io/calico/cni:v3.4.0
|
||||
calico_ctl: quay.io/calico/ctl:v3.4.0
|
||||
@ -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:
|
||||
|
@ -168,12 +168,15 @@ data:
|
||||
$ref: '#/definitions/image'
|
||||
etcd:
|
||||
$ref: '#/definitions/image'
|
||||
etcdctl:
|
||||
$ref: '#/definitions/image'
|
||||
scheduler:
|
||||
$ref: '#/definitions/image'
|
||||
required:
|
||||
- apiserver
|
||||
- controller-manager
|
||||
- etcd
|
||||
- etcdctl
|
||||
- scheduler
|
||||
additionalProperties: false
|
||||
required:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -12,4 +12,4 @@ quay.io/calico/cni,v3.4.0,calico-cni
|
||||
quay.io/calico/ctl,v3.4.0,calico-ctl
|
||||
quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers
|
||||
quay.io/calico/node,v3.4.0,calico-node
|
||||
quay.io/coreos/etcd,v3.5.6,etcd
|
||||
quay.io/coreos/etcd,v3.5.11,etcd
|
||||
|
@ -58,6 +58,16 @@
|
||||
- name: List interfaces
|
||||
command: ip addr show
|
||||
|
||||
- name: "add debug ssh keys"
|
||||
become: true
|
||||
shell: |-
|
||||
set -x
|
||||
echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQ8CANhyYW88D292nWs1iU4F6KhwDO/QXOJ4AjAUKr8u+18ACvlOH0A/4bu3VajQ8/uSWwJax/cN4c1HriHSPtxabYogGqGRP55/VTybtwbF1v7r9BZVBrG/njlW/vFu04Jpv8zAMdRx/+EClwS37qMNDnSdoSe/Bd0EOB3cOVcUMF6rcWSGYuTtMgYd+WMeRiaPkpurYSXM73qZwJBwRyTcCFNugZrG/AitfPLUAp5BMjh8TAgluZs9Z6VjM3GOt1HHsidjtAFr+w1EbdrExqMqayfB+FIZ5jP94cHcCN9R6X9hdJehZzAWeDaXL6c3DRULHShJepUFYEAvuZl+USIqOEOSYKZEPhPPrnELUx9snsESriN4sxONDF2JE5h8AcPisTKm4BwTzbA1TvCLkfAdfXDJmqkci6CJ8c5u9XrBacl4znrkOIM62c2LYsvewbiLo2zLbjn4znClSM+ninEhoUDbnWNkoS5Y/d0c8Wr3U/TjnScTgZ91blOCOtbkc=" | sudo tee -a /root/.ssh/authorized_keys
|
||||
args:
|
||||
executable: /bin/bash
|
||||
ignore_errors: True
|
||||
|
||||
|
||||
- name: Generate configuration files
|
||||
shell: |
|
||||
set -xe;
|
||||
|
Loading…
Reference in New Issue
Block a user