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

Merge pull request #8746 from hjkatz/patch-2

Browse Source 
Add quotes to kubernetes annotations

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-12-04 15:53:35 +00:00
committed by GitHub
parent 496eea9647 701deb2268
commit 8a433f30e4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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