From 3bf40d5db9a3bd92126f9fdc3b4fc625782716b3 Mon Sep 17 00:00:00 2001
From: David Louks <2402775+dlouks@users.noreply.github.com>
Date: Thu, 17 Sep 2020 04:45:13 -0500
Subject: [PATCH] make metallb image repos configurable (#6671) (#6672)
* Make metallb image repos configurable
* Moved metallb image repo definitions to download role defaults
* Removed comment. These are set in download defaults
---
roles/download/defaults/main.yml | 3 +++
roles/kubernetes-apps/metallb/templates/metallb.yml.j2 | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 18a97b5a1..181f0d932 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -529,6 +529,9 @@ image_pull_command_on_localhost: "{{ docker_bin_dir }}/docker pull"
image_save_command_on_localhost: "{{ docker_bin_dir }}/docker save {{ image_reponame }} | gzip -{{ download_compress }} > {{ image_path_cached }}"
image_info_command_on_localhost: "{{ docker_bin_dir }}/docker images"
+metallb_speaker_image_repo: "{{ docker_image_repo }}/metallb/speaker"
+metallb_controller_image_repo: "{{ docker_image_repo }}/metallb/controller"
+
downloads:
netcheck_server:
enabled: "{{ deploy_netchecker }}"
diff --git a/roles/kubernetes-apps/metallb/templates/metallb.yml.j2 b/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
index b975b1df1..bad2fdd13 100644
--- a/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
+++ b/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
@@ -317,7 +317,7 @@ spec:
secretKeyRef:
name: memberlist
key: secretkey
- image: metallb/speaker:{{ metallb_version }}
+ image: {{ metallb_speaker_image_repo }}:{{ metallb_version }}
imagePullPolicy: Always
name: speaker
ports:
@@ -373,7 +373,7 @@ spec:
- args:
- --port={{ metallb_port }}
- --config=config
- image: metallb/controller:{{ metallb_version }}
+ image: {{ metallb_controller_image_repo }}:{{ metallb_version }}
imagePullPolicy: Always
name: controller
ports:
--
GitLab