Commit b3223ef2 authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

more work (take 6)

parent 46e8d341
......@@ -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 -}}
{{- $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 }}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment