make metallb image repos configurable (kubernetes-sigs#6671) (kuberne…

…tes-sigs#6672) * Make metallb image repos configurable * Moved metallb image repo definitions to download role defaults * Removed comment. These are set in download defaults
southbridgeio · Jan 16, 2021 · 0c4282e · 0c4282e
1 parent b4a62db
commit 0c4282e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
@@ -536,6 +536,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
@@ -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: