diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 4a6965ad5..286a3ec4c 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -105,6 +105,8 @@ contiv_image_repo: "contiv/netplugin" contiv_image_tag: "{{ contiv_version }}" contiv_auth_proxy_image_repo: "contiv/auth_proxy" contiv_auth_proxy_image_tag: "{{ contiv_version }}" +contiv_etcd_init_image_repo: "ferest/etcd-initer" +contiv_etcd_init_image_tag: latest cilium_image_repo: "docker.io/cilium/cilium" cilium_image_tag: "{{ cilium_version }}" nginx_image_repo: nginx @@ -383,6 +385,14 @@ downloads: sha256: "{{ contiv_auth_proxy_digest_checksum|default(None) }}" groups: - k8s-cluster + contiv_etcd_init: + enabled: "{{ kube_network_plugin == 'contiv' }}" + container: true + repo: "{{ contiv_etcd_init_image_repo }}" + tag: "{{ contiv_etcd_init_image_tag }}" + sha256: "{{ contiv_etcd_init_digest_checksum|default(None) }}" + groups: + - k8s-cluster pod_infra: enabled: true container: true diff --git a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 index a6e9121d4..9d7502857 100644 --- a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 @@ -26,7 +26,7 @@ spec: effect: NoSchedule initContainers: - name: contiv-etcd-init - image: ferest/etcd-initer:latest + image: {{ contiv_etcd_init_image_repo }}:{{ contiv_etcd_init_image_tag }} imagePullPolicy: Always env: - name: ETCD_INIT_ARGSFILE