Florian Ruynat
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
-
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
|
|
@ -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: |
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|