openstack/openstack-helm
Code Issues Proposed changes

Ingress: Update labels

Browse Source 
This PS fixes some issues and inconsistencies with the way labels
were applied to the ingress controller.

Change-Id: I98a71e75836f4c4673502ae1f7f7e13a4d19bf95
This commit is contained in:
Pete Birley 2017-08-31 18:15:03 -05:00
parent 198162a073
commit d503d5b6bf
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ingress/templates/deployment-ingress.yaml
View File

@ -34,10 +34,9 @@ spec:
metadata: metadata:
labels: labels:
{{ tuple $envAll "ingress" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} {{ tuple $envAll "ingress" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
app: ingress-api
annotations: annotations:
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
labels:
app: ingress-api
spec: spec:
{{- if eq .Values.deployment_type "Deployment" }} {{- if eq .Values.deployment_type "Deployment" }}
affinity: affinity:

4
ingress/templates/service-error.yaml
View File

@ -20,7 +20,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
app: ingress-error-pages {{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
name: ingress-error-pages name: ingress-error-pages
spec: spec:
clusterIP: None clusterIP: None
@ -29,4 +29,4 @@ spec:
protocol: TCP protocol: TCP
targetPort: 8080 targetPort: 8080
selector: selector:
app: ingress-error-pages {{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}

2
ingress/templates/service-ingress.yaml
View File

@ -33,4 +33,4 @@ spec:
protocol: TCP protocol: TCP
targetPort: 443 targetPort: 443
selector: selector:
{{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} app: ingress-api