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

Avoid MetalLB speaker image download when MetalLB speaker is disabled (#9248)

Browse source 
* Avoid MetalLB speaker image download when metallb_speaker_enabled is set to

* Move metallb_speaker_enabled var to allow outside metalLB role references

* Move metallb_speaker_enabled var to allow outside metalLB role references

* Improve metallb_speaker_enabled default values
This commit is contained in:
Unai Arríen 2022-10-14 01:50:47 +02:00 committed by GitHub
parent e3339fe3d8
commit 52904ee6ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/sample/group_vars/k8s_cluster/addons.yml
View file

@ -161,7 +161,7 @@ cert_manager_enabled: false
# MetalLB deployment # MetalLB deployment
metallb_enabled: false metallb_enabled: false
metallb_speaker_enabled: true metallb_speaker_enabled: "{{ metallb_enabled }}"
# metallb_ip_range: # metallb_ip_range:
# - "10.5.0.50-10.5.0.99" # - "10.5.0.50-10.5.0.99"
# metallb_pool_name: "loadbalanced" # metallb_pool_name: "loadbalanced"

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

@ -1695,7 +1695,7 @@ downloads:
- kube_control_plane - kube_control_plane
metallb_speaker: metallb_speaker:
enabled: "{{ metallb_enabled }}" enabled: "{{ metallb_speaker_enabled }}"
container: true container: true
repo: "{{ metallb_speaker_image_repo }}" repo: "{{ metallb_speaker_image_repo }}"
tag: "{{ metallb_version }}" tag: "{{ metallb_version }}"

2
roles/kubernetes-apps/metallb/defaults/main.yml
View file

@ -5,7 +5,7 @@ metallb_protocol: "layer2"
metallb_port: "7472" metallb_port: "7472"
metallb_memberlist_port: "7946" metallb_memberlist_port: "7946"
metallb_peers: [] metallb_peers: []
metallb_speaker_enabled: true metallb_speaker_enabled: "{{ metallb_enabled }}"
metallb_speaker_nodeselector: metallb_speaker_nodeselector:
kubernetes.io/os: "linux" kubernetes.io/os: "linux"
metallb_controller_nodeselector: metallb_controller_nodeselector:

1
roles/kubespray-defaults/defaults/main.yaml
View file

@ -409,6 +409,7 @@ ingress_alb_enabled: false
cert_manager_enabled: false cert_manager_enabled: false
expand_persistent_volumes: false expand_persistent_volumes: false
metallb_enabled: false metallb_enabled: false
metallb_speaker_enabled: "{{ metallb_enabled }}"
argocd_enabled: false argocd_enabled: false
## When OpenStack is used, Cinder version can be explicitly specified if autodetection fails (Fixed in 1.9: https://github.com/kubernetes/kubernetes/issues/50461) ## When OpenStack is used, Cinder version can be explicitly specified if autodetection fails (Fixed in 1.9: https://github.com/kubernetes/kubernetes/issues/50461)