more work (take 2)

templates/certificate.yaml

+{{- $APP_NAMESPACE := print .Chart.Name "-" .Values.APP_ENV -}}
+apiVersion: networking.gke.io/v1beta1
+kind: ManagedCertificate
+metadata:
+  name: "{{ $APP_NAMESPACE }}"
+spec:
+  domains:
+    - "{{ .Values.SERVERNAME }}"
+

templates/deployment.yaml

+{{- $APP_NAMESPACE := print .Chart.Name "-" .Values.APP_ENV -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "{{ $APP_NAMESPACE }}"
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: "{{ .Chart.Name }}"
+  template:
+    metadata:
+      labels:
+        app: "{{ .Chart.Name }}"
+    spec:
+      ## CONTAINERS
+      containers:
+        - name: "{{ .Chart.Name }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.apache.port }}
+              protocol: TCP
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.apache.port }}
+              path: /
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.apache.port }}
+              path: /
+            initialDelaySeconds: 10
+            periodSeconds: 10

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
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: "{{ $APP_NAMESPACE }}"
+  annotations:
+    external-dns.alpha.kubernetes.io/hostname="{{ .Values.SERVERNAME }}"
+    networking.gke.io/managed-certificates: "certificate-patchman-{{ .Values.APP_ENV }}"
+    kubernetes.io/ingress.allow-http: "false"
+spec:
+  backend:
+    serviceName: "{{ $APP_NAMESPACE }}"
+    servicePort: 80
+{{- end }}

templates/service.yaml

+{{- $APP_NAMESPACE := print .Chart.Name "-" .Values.APP_ENV -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ $APP_NAMESPACE }}"
+spec:
+  type: NodePort
+  selector:
+    app: "{{ .Chart.Name }}"
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80

values.yaml

@@ -7,9 +7,6 @@
 # APP_ENV is typically something like "dev", "test", "prod", etc.
 APP_ENV: dev
 
-# The GCP name of the global static external address.
-GLOBAL_STATIC_IP_NAME: my-global-static-ip-name
-
 # The endpoint name
 SERVERNAME: patchman-dev.example.com
 
@@ -28,7 +25,7 @@ replicaCount: 1
 
 # Docker image settings
 image:
-  repository: suet/patchman
+  repository: suet/apache-shib
   pullPolicy: Always
   tag: latest
 
@@ -36,9 +33,6 @@ image:
 apache:
   port: 80
 
-DATA_DISK_SIZE:     2Gi
-STORAGE_CLASS_NAME: standard
-
 securityContext: {}
   # capabilities:
   #   drop: