Include etcd image repository when using kubeadm etcd deployment mode (#5725)

pull/5773/head
Florent Monbillard 2020-03-13 13:28:39 -04:00 committed by GitHub
parent 38df80046e
commit 25a1e5f952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions

View File

@ -8,11 +8,17 @@ kind: ClusterConfiguration
imageRepository: {{ kube_image_repo }} imageRepository: {{ kube_image_repo }}
kubernetesVersion: {{ kube_version }} kubernetesVersion: {{ kube_version }}
etcd: etcd:
{% if etcd_kubeadm_enabled %}
local:
imageRepository: "{{ etcd_image_repo | regex_replace("/etcd$","") }}"
imageTag: "{{ etcd_image_tag }}"
{% else %}
external: external:
endpoints: endpoints:
{% for endpoint in etcd_access_addresses.split(',') %} {% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }} - {{ endpoint }}
{% endfor %} {% endfor %}
{% endif %}
dns: dns:
type: CoreDNS type: CoreDNS
imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }} imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}