C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

make metallb image repos configurable (#6671) (#6672)

Browse source 
* Make metallb image repos configurable

* Moved metallb image repo definitions to download role defaults

* Removed comment. These are set in download defaults
This commit is contained in:
David Louks 2020-09-17 04:45:13 -05:00 committed by GitHub
parent a9e11623cd
commit 3bf40d5db9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/download/defaults/main.yml
View file

@ -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_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" 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: downloads:
netcheck_server: netcheck_server:
enabled: "{{ deploy_netchecker }}" enabled: "{{ deploy_netchecker }}"

4
roles/kubernetes-apps/metallb/templates/metallb.yml.j2
View file

@ -317,7 +317,7 @@ spec:
secretKeyRef: secretKeyRef:
name: memberlist name: memberlist
key: secretkey key: secretkey
image: metallb/speaker:{{ metallb_version }} image: {{ metallb_speaker_image_repo }}:{{ metallb_version }}
imagePullPolicy: Always imagePullPolicy: Always
name: speaker name: speaker
ports: ports:
@ -373,7 +373,7 @@ spec:
- args: - args:
- --port={{ metallb_port }} - --port={{ metallb_port }}
- --config=config - --config=config
image: metallb/controller:{{ metallb_version }} image: {{ metallb_controller_image_repo }}:{{ metallb_version }}
imagePullPolicy: Always imagePullPolicy: Always
name: controller name: controller
ports: ports: