Merge pull request #203 from one-acre-fund/feature/nocodb-extra-confi…

…guration

Refactor NocoDB Helm Chart to increase configurability

charts/nocodb/Chart.yaml

@@ -15,7 +15,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.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/nocodb/templates/configmap.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.extraEnv -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "nocodb.fullname" . }}-config
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+data:
+   {{- range $key, $val := .Values.extraEnv }}
+   {{ $key }}: {{ $val | quote }}
+   {{- end }}
+{{- end }}

charts/nocodb/templates/deployment.yaml

@@ -133,13 +133,6 @@ spec:
             - name: NC_REDIS_URL
               value: "redis://:$(NC_REDIS_PASSWORD)@{{ template "nocodb.redis.fullname" . }}-master:{{ .Values.redis.master.service.ports.redis }}"
             {{- end }}
-            {{- if and .Values.jwt.create (not (eq .Values.jwt.secret "")) }}
-            - name: NC_AUTH_JWT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "nocodb.jwtSecretName" . }}
-                  key: {{ include "nocodb.jwtSecretKey" . }}
-            {{- end }}
             {{- if .Values.admin.create }}
             - name: NC_ADMIN_EMAIL
               valueFrom:
@@ -196,6 +189,13 @@ spec:
                   name: {{ include "nocodb.databaseSecretName" . }}
                   key: {{ include "nocodb.databaseSecretPasswordKey" . }}
             {{- end }}
+          envFrom:
+            - secretRef:
+                name: {{ include "nocodb.fullname" . }}-secrets
+                optional: true
+            - configMapRef:
+                name: {{ include "nocodb.fullname" . }}-config
+                optional: true
           ports:
             - name: http
               containerPort: {{ .Values.service.ports.http }}

charts/nocodb/templates/jwt-secret.yaml → charts/nocodb/templates/secrets.yaml

@@ -1,14 +1,16 @@
-{{- if and .Values.jwt.create (not (eq .Values.jwt.secret "")) }} 
+{{- if and .Values.extraEnvSecrets }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "nocodb.jwtSecretName" . }}
+  name: {{ include "nocodb.fullname" . }}-secrets
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 type: Opaque
 data:
-  {{ include "nocodb.jwtSecretKey" . }}: {{ .Values.jwt.secret | b64enc | quote }}
+{{- range $key, $val := .Values.extraEnvSecrets }}
+  {{ $key }}: {{ $val | b64enc }}
+{{- end }}
 {{- end }}

charts/nocodb/values.yaml

@@ -252,12 +252,8 @@ priorityClassName: ""
 
 schedulerName: ""
 
-jwt:
-  create: true
-  name: ""
-  secret: ""
-  existingSecretName: ""
-  existingSecretKey: ""
+extraEnvSecrets: []
+extraEnv: []
 
 admin:
   create: true