External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8758 from hjkatz/patch-7

Browse Source 
Use literal quotation marks for Kubernetes annotations instead of quo…

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-12-04 20:03:33 +00:00 committed by GitHub
commit d14fa93ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@ -4,10 +4,10 @@ kind: ServiceAccount
metadata:
name: {{ kubernetes_serviceaccount_name }}
namespace: {{ kubernetes_namespace }}
{% if kubernetes_service_account_annotations is defined %}
{% if kubernetes_service_account_is defined %}
annotations:
{% for key, value in kubernetes_service_account_annotations.items() %}
{{ key }}: {{ value | quote }}
{{ key }}: "{{ value }}"
{% endfor %}
{% endif %}
{% if kubernetes_image_pull_secrets is defined %}
@ -88,7 +88,7 @@ metadata:
{% if kubernetes_deployment_annotations is defined %}
annotations:
{% for key, value in kubernetes_deployment_annotations.items() %}
{{ key }}: {{ value | quote }}
{{ key }}: "{{ value }}"
{% endfor %}
{% endif %}
{% if openshift_host is defined %}
@ -107,7 +107,7 @@ spec:
{% if kubernetes_pod_annotations is defined %}
annotations:
{% for key, value in kubernetes_pod_annotations.items() %}
{{ key }}: {{ value | quote }}
{{ key }}: "{{ value }}"
{% endfor %}
{% endif %}
labels:
@ -521,7 +521,7 @@ metadata:
{% if kubernetes_service_annotations is defined %}
annotations:
{% for key, value in kubernetes_service_annotations.items() %}
{{ key }}: {{ value | quote }}
{{ key }}: "{{ value }}"
{% endfor %}
{% endif %}
spec:
@ -546,7 +546,7 @@ metadata:
{% if kubernetes_ingress_annotations is defined %}
annotations:
{% for key, value in kubernetes_ingress_annotations.items() %}
{{ key }}: {{ value | quote }}
{{ key }}: "{{ value }}"
{% endfor %}
{% endif %}