[helm-chart] Basic-Auth support without environment-variables (#1289)

* Added basic auth support Signed-off-by: Alexander Zimmermann <alexander.zimmermann96@gmail.com> * Disabled basicAuth for default Signed-off-by: Alexander Zimmermann <alexander.zimmermann96@gmail.com> * Count up helm chart version * Using default values in http-headers Signed-off-by: Alexander Zimmermann <alexander.zimmermann96@gmail.com>
gomods · Jun 27, 2019 · 9436778 · 9436778
1 parent d398221
commit 9436778
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/charts/athens-proxy/Chart.yaml b/charts/athens-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: athens-proxy
-version: 0.2.11
+version: 0.2.12
 appVersion: 0.4.0
 description: The proxy server for Go modules
 icon: https://raw.githubusercontent.com/gomods/athens/master/docs/static/banner.png

diff --git a/charts/athens-proxy/templates/deployment.yaml b/charts/athens-proxy/templates/deployment.yaml
@@ -50,10 +50,20 @@ spec:
           httpGet:
             path: "/healthz"
             port: 3000
+            {{- if .Values.basicAuth.enabled }}
+            httpHeaders:
+              - name: Authorization
+                value: "Basic {{ (printf "%s:%s" (default "gomod" .Values.basicAuth.user) (default "gomod" .Values.basicAuth.password) | b64enc) }}"
+            {{- end }}
         readinessProbe:
           httpGet:
             path: "{{ template "readinessPath" . }}"
             port: 3000
+            {{- if .Values.basicAuth.enabled }}
+            httpHeaders:
+              - name: Authorization
+                value: "Basic {{ (printf "%s:%s" (default "gomod" .Values.basicAuth.user) (default "gomod" .Values.basicAuth.password) | b64enc) }}"
+            {{- end }}
         env:
         - name: ATHENS_GOGET_WORKERS
         {{- if .Values.goGetWorkers }}
@@ -108,6 +118,12 @@ spec:
         - name: ATHENS_TRACE_EXPORTER
           value: "jaeger"
         {{- end }}
+        {{- if .Values.basicAuth.enabled }}
+        - name: BASIC_AUTH_USER
+          value: "{{ default "gomod" .Values.basicAuth.user | quote }}"
+        - name: BASIC_AUTH_PASS
+          value: "{{ default "gomod" .Values.basicAuth.password | quote }}"
+        {{- end }}
         ports:
         - containerPort: 3000
         {{- if or (eq .Values.storage.type "disk") .Values.upstreamProxy.enabled .Values.netrc.enabled }}

diff --git a/charts/athens-proxy/values.yaml b/charts/athens-proxy/values.yaml
@@ -51,13 +51,14 @@ storage:
     useDefaultConfiguration: true
 
 # Extra environment variables to be passed
-# Commented lines below, show how to set username/password for basic auth
 # You can add any new ones at the bottom
 configEnvVars: {}
-#  - name: BASIC_AUTH_USER
-#    value: "some_user"
-#  - name: BASIC_AUTH_PASS
-#    value: "some_password"
+
+# HTTP basic auth
+basicAuth:
+  enabled: false
+  user: "some_user"
+  password: "some_password"
 
 netrc:
   # if enabled, it expects to find the content of a valid .netrc file imported as a secret named netrcsecret