Fix chart to work with old service name (#40)

Author: phillebaba

charts/git-auth-proxy/templates/deployment.yaml

@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
     {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
     {{- end }}
@@ -38,6 +38,8 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          args:
+            - "--config=/var/config.json"
           ports:
             - name: http
               containerPort: 8080
@@ -57,12 +59,12 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             - name: config
-              mountPath: "/var/"
+              mountPath: "/var"
               readOnly: true
       volumes:
         - name: config
-          configMap:
-            name: {{ include "git-auth-proxy.fullname" . }}
+          secret:
+            secretName: {{ include "git-auth-proxy.fullname" . }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}

charts/git-auth-proxy/templates/configmap.yaml renamed to charts/git-auth-proxy/templates/secret.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: {{ include "git-auth-proxy.fullname" . }}
   labels:
     {{- include "git-auth-proxy.labels" . | nindent 4 }}
-data:
+stringData:
   config.json: {{ required "Config has to be set." .Values.config | quote }}

charts/git-auth-proxy/templates/service.yaml

@@ -17,3 +17,25 @@ spec:
       name: metrics
   selector:
     {{- include "git-auth-proxy.selectorLabels" . | nindent 4 }}
+---
+# This service is left for legacy reasons as the project used to be called azdo-proxy.
+# The service should be removed eventually as all applications change the service name they use.
+apiVersion: v1
+kind: Service
+metadata:
+  name: azdo-proxy
+  labels:
+    {{- include "git-auth-proxy.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.metricsPort }}
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
+  selector:
+    {{- include "git-auth-proxy.selectorLabels" . | nindent 4 }}

main.go

@@ -29,10 +29,10 @@ import (
 )
 
 type cfg struct {
-	Addr           string `flag:"addr" default:":8080"`
-	MetricsAddr    string `flag:"metrics-addr" default:":9090"`
+	Addr           string `flag:"addr" default:":8080" required:"true"`
+	MetricsAddr    string `flag:"metrics-addr" default:":9090" required:"true"`
+	ConfigPath     string `flag:"config" required:"true"`
 	KubeconfigPath string `flag:"kubeconfig"`
-	ConfigPath     string `flag:"config"`
 }
 
 func main() {