Fix Opensuse not working with ansible_distribution (kubernetes-sigs#7551

)
nolimitkun · Apr 26, 2021 · c16efc9 · c16efc9
1 parent 324c95d
commit c16efc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2 b/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
@@ -32,13 +32,13 @@ spec:
           imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
             - name: WATCH_NAMESPACE
-              {%- if ingress_ambassador_multi_namespaces %}
+{% if ingress_ambassador_multi_namespaces %}
               value: ''
-              {%- else %}
+{% else %}
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-              {%- end %}
+{% endif %}
             - name: POD_NAME
               valueFrom:
                 fieldRef:

diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
@@ -24,7 +24,7 @@
 
 - name: Stop if unknown OS
   assert:
-    that: ansible_distribution in ['RedHat', 'CentOS', 'Fedora', 'Ubuntu', 'Debian', 'Flatcar Container Linux by Kinvolk', 'Suse', 'ClearLinux', 'OracleLinux', 'AlmaLinux']
+    that: ansible_distribution in ['RedHat', 'CentOS', 'Fedora', 'Ubuntu', 'Debian', 'Flatcar Container Linux by Kinvolk', 'Suse', 'openSUSE Leap', 'ClearLinux', 'OracleLinux', 'AlmaLinux']
     msg: "{{ ansible_distribution }} is not a known OS"
   when: not ignore_assert_errors