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

fix a typo in the "matallb_auto_assign" variable name (#8949)

Browse source 
* fix a typo in the "matallb_auto_assign" variable name

* add metallb check to fail when deprecated "matallb_auto_assign" variable is defined
This commit is contained in:
orange-llajeanne 2022-06-13 18:40:12 +02:00 committed by GitHub
parent 4726a110fc
commit 2fba94c5e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 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

@ -165,7 +165,7 @@ metallb_speaker_enabled: true
# 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"
# matallb_auto_assign: true # metallb_auto_assign: true
# metallb_speaker_nodeselector: # metallb_speaker_nodeselector:
# kubernetes.io/os: "linux" # kubernetes.io/os: "linux"
# metallb_controller_nodeselector: # metallb_controller_nodeselector:

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

@ -19,4 +19,4 @@ metallb_speaker_tolerations:
operator: Exists operator: Exists
metallb_controller_tolerations: [] metallb_controller_tolerations: []
metallb_pool_name: "loadbalanced" metallb_pool_name: "loadbalanced"
matallb_auto_assign: true metallb_auto_assign: true

6
roles/kubernetes-apps/metallb/tasks/main.yml
View file

@ -18,6 +18,12 @@
- metallb_protocol == 'bgp' and metallb_speaker_enabled - metallb_protocol == 'bgp' and metallb_speaker_enabled
- metallb_peers is not defined or not metallb_peers - metallb_peers is not defined or not metallb_peers
- name: Kubernetes Apps | Check that the deprecated 'matallb_auto_assign' variable is not used anymore
fail:
msg: "'matallb_auto_assign' configuration variable is deprecated, please use 'metallb_auto_assign' instead"
when:
- matallb_auto_assign is defined
- name: Kubernetes Apps | Check AppArmor status - name: Kubernetes Apps | Check AppArmor status
command: which apparmor_parser command: which apparmor_parser
register: apparmor_status register: apparmor_status

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

@ -31,7 +31,7 @@ data:
{% for ip_range in metallb_ip_range %} {% for ip_range in metallb_ip_range %}
- {{ ip_range }} - {{ ip_range }}
{% endfor %} {% endfor %}
{% if matallb_auto_assign == false %} {% if metallb_auto_assign == false %}
auto-assign: false auto-assign: false
{% endif %} {% endif %}
{% if metallb_additional_address_pools is defined %}{% for pool in metallb_additional_address_pools %} {% if metallb_additional_address_pools is defined %}{% for pool in metallb_additional_address_pools %}