Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Oct 13, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
649f6fa
Avoid MetalLB speaker image download when metallb_speaker_enabled is …
unai-ttxu Sep 1, 2022
dd97c80
Move metallb_speaker_enabled var to allow outside metalLB role refere…
unai-ttxu Oct 12, 2022
09a1a8a
Move metallb_speaker_enabled var to allow outside metalLB role refere…
unai-ttxu Oct 12, 2022
06ac576
Improve metallb_speaker_enabled default values
unai-ttxu Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inventory/sample/group_vars/k8s_cluster/addons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ cert_manager_enabled: false

# MetalLB deployment
metallb_enabled: false
metallb_speaker_enabled: true
metallb_speaker_enabled: "{{ metallb_enabled }}"
# metallb_ip_range:
# - "10.5.0.50-10.5.0.99"
# metallb_pool_name: "loadbalanced"
Expand Down
2 changes: 1 addition & 1 deletion roles/download/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,7 @@ downloads:
- kube_control_plane

metallb_speaker:
enabled: "{{ metallb_enabled }}"
enabled: "{{ metallb_speaker_enabled }}"
container: true
repo: "{{ metallb_speaker_image_repo }}"
tag: "{{ metallb_version }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/kubernetes-apps/metallb/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metallb_protocol: "layer2"
metallb_port: "7472"
metallb_memberlist_port: "7946"
metallb_peers: []
metallb_speaker_enabled: true
metallb_speaker_enabled: "{{ metallb_enabled }}"
metallb_speaker_nodeselector:
kubernetes.io/os: "linux"
metallb_controller_nodeselector:
Expand Down
1 change: 1 addition & 0 deletions roles/kubespray-defaults/defaults/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ ingress_alb_enabled: false
cert_manager_enabled: false
expand_persistent_volumes: false
metallb_enabled: false
metallb_speaker_enabled: "{{ metallb_enabled }}"
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)
Expand Down