Update ETCD to v3.5.11
Change-Id: I198dca1209097de4d60a53a7568f0c4790679599
This commit is contained in:
parent
6ae2bcf4ba
commit
161bfc5cf2
|
@ -16,24 +16,16 @@
|
||||||
|
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- define "etcdreadinessProbeTemplate" }}
|
{{- define "etcdreadinessProbeTemplate" }}
|
||||||
exec:
|
httpGet:
|
||||||
command:
|
path: /readyz
|
||||||
- /bin/sh
|
port: {{ .Values.network.service_client.target_port }}
|
||||||
- -c
|
scheme: HTTPS
|
||||||
- |-
|
|
||||||
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: /livez
|
||||||
- /bin/sh
|
port: {{ .Values.network.service_client.target_port }}
|
||||||
- -c
|
scheme: HTTPS
|
||||||
- |-
|
|
||||||
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,9 +14,9 @@
|
||||||
|
|
||||||
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
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
|
|
|
@ -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,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
|
||||||
|
|
|
@ -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,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
|
||||||
|
|
|
@ -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,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
|
||||||
|
|
|
@ -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,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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -168,12 +168,15 @@ data:
|
||||||
$ref: '#/definitions/image'
|
$ref: '#/definitions/image'
|
||||||
etcd:
|
etcd:
|
||||||
$ref: '#/definitions/image'
|
$ref: '#/definitions/image'
|
||||||
|
etcdctl:
|
||||||
|
$ref: '#/definitions/image'
|
||||||
scheduler:
|
scheduler:
|
||||||
$ref: '#/definitions/image'
|
$ref: '#/definitions/image'
|
||||||
required:
|
required:
|
||||||
- apiserver
|
- apiserver
|
||||||
- controller-manager
|
- controller-manager
|
||||||
- etcd
|
- etcd
|
||||||
|
- etcdctl
|
||||||
- scheduler
|
- scheduler
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
required:
|
required:
|
||||||
|
|
|
@ -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,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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -329,7 +329,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:
|
||||||
|
@ -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:
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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/ctl,v3.4.0,calico-ctl
|
||||||
quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers
|
quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers
|
||||||
quay.io/calico/node,v3.4.0,calico-node
|
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
|
- name: List interfaces
|
||||||
command: ip addr show
|
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
|
- name: Generate configuration files
|
||||||
shell: |
|
shell: |
|
||||||
set -xe;
|
set -xe;
|
||||||
|
|
Loading…
Reference in New Issue