add configmap-oauth2proxy (#54)

statisticsnorway · Oct 23, 2023 · 04a9bbd · 04a9bbd
1 parent bc61ee5
commit 04a9bbd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/charts/datadoc/Chart.yaml b/charts/datadoc/Chart.yaml
@@ -24,7 +24,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.20
+version: 0.2.21
 
 dependencies:
   - name: library-chart

diff --git a/charts/datadoc/templates/configmap-oauth2proxy.yaml b/charts/datadoc/templates/configmap-oauth2proxy.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.configMapOAuth2" . }}
diff --git a/charts/datadoc/templates/statefulset.yaml b/charts/datadoc/templates/statefulset.yaml
@@ -36,6 +36,9 @@ spec:
         {{- else }}
           emptyDir: {}
         {{- end }}
+      {{- if .Values.security.oauth2.enabled }}
+      - {{ include "library-chart.oauth2ProxyVolume" . | indent 10 | trim }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -61,8 +64,6 @@ spec:
               value: "{{ .Values.service.image.version }}"
             - name: DATADOC_DATASET_PATH
               value: {{ .Values.dataset.dataset_path }}
-            - name: PASSWORD
-              value: {{ .Values.security.password }}
             - name: PROJECT_USER
               value: {{ .Values.environment.user }}
             - name: PROJECT_GROUP
@@ -87,6 +88,9 @@ spec:
             {{- toYaml .Values.startupProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      {{- if .Values.security.oauth2.enabled }}
+        - {{ include "library-chart.oauth2ProxyPod" . | indent 10 | trim }}
+      {{ end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{ include "library-chart.configMapOAuth2" . }}