From 45267da3125f67b4d7996b5e826a10659a0b5ac2 Mon Sep 17 00:00:00 2001
From: David Burke <david@burkesoftware.com>
Date: Fri, 24 Jan 2020 14:53:39 -0500
Subject: [PATCH] Remove unused service and ingress chart templates

---
 templates/deployment.yaml      |  7 +++---
 templates/ingress.yaml         | 41 ----------------------------------
 templates/pre-install-job.yaml |  7 +++---
 templates/service.yaml         | 15 -------------
 4 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 templates/ingress.yaml
 delete mode 100644 templates/service.yaml

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index a486a4c..0c77bf1 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -39,9 +39,10 @@ spec:
               value: "False"
             - name: STATIC_URL
               value: /
-          envFrom:
-            - secretRef:
-                name: {{ include "glitchtip.fullname" . }}
+            - name: DATABASE_URL
+              value: {{ required "databaseURL is a required value." .Values.databaseURL | quote }}
+            - name: SECRET_KEY
+              value: {{ required "secretKey is a required value." .Values.secretKey | quote }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
deleted file mode 100644
index dac226b..0000000
--- a/templates/ingress.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "glitchtip.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "glitchtip.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-        {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/templates/pre-install-job.yaml b/templates/pre-install-job.yaml
index b751710..43e7bbd 100644
--- a/templates/pre-install-job.yaml
+++ b/templates/pre-install-job.yaml
@@ -21,6 +21,7 @@ spec:
             value: "False"
           - name: STATIC_URL
             value: /
-        envFrom:
-          - secretRef:
-              name: {{ include "glitchtip.fullname" . }}
+          - name: DATABASE_URL
+            value: {{ required "databaseURL is a required value." .Values.databaseURL | quote }}
+          - name: SECRET_KEY
+            value: {{ required "secretKey is a required value." .Values.secretKey | quote }}
\ No newline at end of file
diff --git a/templates/service.yaml b/templates/service.yaml
deleted file mode 100644
index 53fd687..0000000
--- a/templates/service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "glitchtip.fullname" . }}
-  labels:
-    {{- include "glitchtip.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "glitchtip.selectorLabels" . | nindent 4 }}