removed loadbalancer_class from metallb_config; metallb_loadbalancer_…

…class in role defaults
kubernetes-sigs · Oct 23, 2023 · 7a1e078 · 7a1e078
1 parent 688cce8
commit 7a1e078
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/roles/kubernetes-apps/metallb/defaults/main.yml b/roles/kubernetes-apps/metallb/defaults/main.yml
@@ -13,3 +13,4 @@ metallb_speaker_tolerations:
     key: node-role.kubernetes.io/control-plane
     operator: Exists
 metallb_controller_tolerations: []
+metallb_loadbalancer_class: ""
diff --git a/roles/kubernetes-apps/metallb/templates/metallb.yaml.j2 b/roles/kubernetes-apps/metallb/templates/metallb.yaml.j2
@@ -1724,8 +1724,8 @@ spec:
       - args:
         - --port={{ metallb_port }}
         - --log-level={{ metallb_log_level }}
-{% if 'loadbalancer_class' in metallb_config.keys() and metallb_config.loadbalancer_class != "" %}
-        - --lb-class={{ metallb_config.loadbalancer_class }}
+{% if metallb_loadbalancer_class != "" %}
+        - --lb-class={{ metallb_loadbalancer_class }}
 {% endif %}
         env:
         - name: METALLB_ML_SECRET_NAME
@@ -1817,8 +1817,8 @@ spec:
       - args:
         - --port={{ metallb_port }}
         - --log-level={{ metallb_log_level }}
-{% if 'loadbalancer_class' in metallb_config.keys() and metallb_config.loadbalancer_class != "" %}
-        - --lb-class={{ metallb_config.loadbalancer_class }}
+{% if metallb_loadbalancer_class != "" %}
+        - --lb-class={{ metallb_loadbalancer_class }}
 {% endif %}
         env:
         - name: METALLB_NODE_NAME