Ingress: Update labels

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

Change-Id: I98a71e75836f4c4673502ae1f7f7e13a4d19bf95

ingress/templates/deployment-ingress.yaml

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

ingress/templates/service-error.yaml

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

ingress/templates/service-ingress.yaml

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