more work (take 6)

templates/_helpers.tpl

@@ -61,7 +61,3 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
-
-{{- define "apache_shib.APP_NAMESPACE" -}}
-{{ .Chart.Name }} - {{ .Values.APP_ENV }}
-{{- end -}}

templates/ingress.yaml

+{{- $APP_NAMESPACE := print .Chart.Name "-" .Values.APP_ENV -}}
 {{- if .Values.ingress.enabled -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
@@ -6,13 +7,13 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{- template "apache_shib.APP_NAMESPACE" }}
+  name: {{ $APP_NAMESPACE }}
   annotations:
     external-dns.alpha.kubernetes.io/hostname: "{{ .Values.SERVERNAME }}"
-    networking.gke.io/managed-certificates: "certificate-patchman-{{ .Values.APP_ENV }}"
+    networking.gke.io/managed-certificates: {{ $APP_NAMESPACE }}
     kubernetes.io/ingress.allow-http: "false"
 spec:
   backend:
-    serviceName: {{- template "apache_shib.APP_NAMESPACE" }}
+    serviceName: {{ $APP_NAMESPACE }}
     servicePort: 80
 {{- end }}