Skip to content

Commit

Permalink
Merge pull request #8758 from hjkatz/patch-7
Browse files Browse the repository at this point in the history
Use literal quotation marks for Kubernetes annotations instead of quo…

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
  • Loading branch information
2 parents e7090a6 + b6b87ae commit d14fa93
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions installer/roles/kubernetes/templates/deployment.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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 %}
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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 %}

Expand Down

0 comments on commit d14fa93

Please sign in to comment.