fix a typo in the "matallb_auto_assign" variable name (kubernetes-sig…

…s#8949) * fix a typo in the "matallb_auto_assign" variable name * add metallb check to fail when deprecated "matallb_auto_assign" variable is defined
southbridgeio · Jul 1, 2023 · 1acfe98 · 1acfe98
1 parent 93e06bb
commit 1acfe98
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/inventory/sample/group_vars/k8s_cluster/addons.yml b/inventory/sample/group_vars/k8s_cluster/addons.yml
@@ -165,7 +165,7 @@ metallb_speaker_enabled: true
 # metallb_ip_range:
 #   - "10.5.0.50-10.5.0.99"
 # metallb_pool_name: "loadbalanced"
-# matallb_auto_assign: true
+# metallb_auto_assign: true
 # metallb_speaker_nodeselector:
 #   kubernetes.io/os: "linux"
 # metallb_controller_nodeselector:

diff --git a/roles/kubernetes-apps/metallb/defaults/main.yml b/roles/kubernetes-apps/metallb/defaults/main.yml
@@ -19,4 +19,4 @@ metallb_speaker_tolerations:
     operator: Exists
 metallb_controller_tolerations: []
 metallb_pool_name: "loadbalanced"
-matallb_auto_assign: true
+metallb_auto_assign: true
diff --git a/roles/kubernetes-apps/metallb/tasks/main.yml b/roles/kubernetes-apps/metallb/tasks/main.yml
@@ -18,6 +18,12 @@
     - metallb_protocol == 'bgp' and metallb_speaker_enabled
     - 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
   command: which apparmor_parser
   register: apparmor_status

diff --git a/roles/kubernetes-apps/metallb/templates/metallb-config.yml.j2 b/roles/kubernetes-apps/metallb/templates/metallb-config.yml.j2
@@ -31,7 +31,7 @@ data:
 {% for ip_range in metallb_ip_range %}
       - {{ ip_range }}
 {% endfor %}
-{% if matallb_auto_assign == false %}
+{% if metallb_auto_assign == false %}
       auto-assign: false
 {% endif %}
 {% if metallb_additional_address_pools is defined %}{% for pool in metallb_additional_address_pools %}