New version of archives

eea · Jan 4, 2024 · d832412 · d832412
1 parent 2701592
commit d832412
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 150 deletions.
diff --git a/docs/archives-0.2.1.tgz b/docs/archives-0.2.1.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
diff --git a/sources/archives/Chart.yaml b/sources/archives/Chart.yaml
@@ -12,7 +12,7 @@ keywords:
 # 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.0
+version: 0.2.1
 
 # Version for the main container
 appVersion: "archives-22.09.06"

diff --git a/sources/archives/README.md b/sources/archives/README.md
@@ -5,6 +5,9 @@ This chart is configured for production. Must run in its own namespace.
 ## Releases
 
 <dl>
+  <dt>Version 0.2.1</dt>
+  <dd>Alignment with forum-test values</dd>
+
   <dt>Version 0.2.0</dt>
   <dd>Use subchart for postfix.</dd>
 

diff --git a/sources/archives/templates/cron-deployment.yaml b/sources/archives/templates/cron-deployment.yaml
@@ -31,21 +31,19 @@ spec:
         - name: CRONTAB
           value: 'True'
         - name: ERROR_FROM_EMAIL
-          value: {{ .Values.errorFromEmail }}
+          value: "{{ .Values.errorFromEmail }}"
         - name: GOOGLE_AUTH_CLIENT_ID
-          value: ''
+          value: "{{ .Values.googleAuthClientId }}"
         - name: GOOGLE_AUTH_CLIENT_SECRET
-          value: ''
+          value: "{{ .Values.googleAuthClientSecret }}"
         - name: HOST_NAME
           value: {{ .Values.serverName }}
         - name: SENTRY_DSN
-          value: ''
-        - name: WEBEX_CONTACTS
-          value: ''
+          value: "{{ .Values.sentryDsn }}"
         - name: reCAPTCHA_PRIVATE_KEY
-          value: ''
+          value: "{{ .Values.recaptchaPrivateKey }}"
         - name: reCAPTCHA_PUBLIC_KEY
-          value: ''
+          value: "{{ .Values.recaptchaPublicKey }}"
         - name: TZ
           value: "{{ .Values.timezone }}"
         resources:

diff --git a/sources/archives/templates/deployment.yaml b/sources/archives/templates/deployment.yaml
@@ -4,48 +4,48 @@ metadata:
   name: {{ include "appl.fullname" . }}
   labels:
     {{- include "appl.labels" . | nindent 4 }}
-    component: archives
+    component: worker
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "appl.selectorLabels" . | nindent 6 }}
-      component: archives
+      component: worker
   template:
     metadata:
       labels:
         {{- include "appl.selectorLabels" . | nindent 8 }}
-        component: archives
+        component: worker
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "appl.serviceAccountName" . }}
       containers:
-      - name: {{ .Release.Name }}-archives
+      - name: {{ .Release.Name }}-worker
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         ports:
         - containerPort: 80
           protocol: TCP
           name: http
         env:
+        - name: DEBUG_MODE
+          value: "{{ .Values.debugMode }}"
         - name: ERROR_FROM_EMAIL
           value: {{ .Values.errorFromEmail }}
         - name: GOOGLE_AUTH_CLIENT_ID
-          value: ''
+          value: {{ .Values.googleAuthClientId }}
         - name: GOOGLE_AUTH_CLIENT_SECRET
-          value: ''
+          value: {{ .Values.googleAuthClientSecret }}
         - name: HOST_NAME
           value: {{ .Values.serverName }}
         - name: SENTRY_DSN
-          value: ''
-        - name: WEBEX_CONTACTS
-          value: ''
+          value: {{ .Values.sentryDsn }}
         - name: reCAPTCHA_PRIVATE_KEY
-          value: ''
+          value: "{{ .Values.recaptchaPrivateKey }}"
         - name: reCAPTCHA_PUBLIC_KEY
-          value: ''
+          value: "{{ .Values.recaptchaPublicKey }}"
         - name: TZ
           value: "{{ .Values.timezone }}"
         resources:

diff --git a/sources/archives/templates/service.yaml b/sources/archives/templates/service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "appl.fullname" . }}
   labels:
     {{- include "appl.labels" . | nindent 4 }}
-    component: archives
+    component: worker
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -13,4 +13,4 @@ spec:
       protocol: TCP
   selector:
     {{- include "appl.selectorLabels" . | nindent 4 }}
-    component: archives
+    component: worker
diff --git a/sources/archives/values.yaml b/sources/archives/values.yaml
@@ -14,9 +14,9 @@ googleAuthClientId: ''
 googleAuthClientSecret: ''
 sentryDsn: ''
 timezone: Europe/Copenhagen
-webexContacts: ''
 recaptchaPrivateKey: ''
 recaptchaPublicKey: ''
+debugMode: 'False'
 
 imagePullSecrets: []
 nameOverride: ""