cronjob and secret added

NBISweden · Apr 5, 2024 · 11a73a3 · 11a73a3
1 parent 628975f
commit 11a73a3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/charts/landing-pages-chart/Chart.yaml b/charts/landing-pages-chart/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.1.2
+version: 0.1.3
 
 # 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

diff --git a/charts/landing-pages-chart/templates/lp_cj.yaml b/charts/landing-pages-chart/templates/lp_cj.yaml
@@ -2,9 +2,8 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
     name: lp-generator-cronjob
-    namespace: {{ .Values.namespace }}
 spec:
-    schedule: {{ .Values.backupconfig.schedule }}
+    schedule: {{ .Values.schedule }}
     concurrencyPolicy: Forbid
     startingDeadlineSeconds: 3600
     jobTemplate:
@@ -28,7 +27,7 @@ spec:
                         - secret:
                             name: "lp-generator-secret"
                     containers:
-                    - name: gc-backup-container
+                    - name: lp-generator-container
                       image: {{ .Values.images.lp_image }}
                       imagePullPolicy: Always
                       env:
@@ -40,12 +39,6 @@ spec:
                       - name: "cronjob"
                         mountPath: "/.secrets/config.yaml"
                         subPath: "config.yaml"
-                      - name: "cronjob"
-                        mountPath: "/.secrets/keys/key.pub.pem"
-                        subPath: "key.pub.pem"
-                      - name: "cronjob"
-                        mountPath: "/.secrets/keys/key.sec.pem"
-                        subPath: "key.sec.pem"
                       resources:
                         requests: 
                             cpu: "100m"

diff --git a/charts/landing-pages-chart/templates/lp_secret.yaml b/charts/landing-pages-chart/templates/lp_secret.yaml
@@ -12,8 +12,8 @@ stringData:
         bucket: {{ .Values.s3MetadataBucket.bucket }}
         region: {{ .Values.s3MetadataBucket.region }}
       S3DeploymentBucket:
-        url: {{ .Values.S3DeploymentBucket.url }}
-        accesskey: {{ .Values.S3DeploymentBucket.accesskey }}
-        secretkey: {{ .Values.S3DeploymentBucket.secretkey }}
-        bucket: {{ .Values.S3DeploymentBucket.bucket }}
-        region: {{ .Values.S3DeploymentBucket.region }}
+        url: {{ .Values.s3DeploymentBucket.url }}
+        accesskey: {{ .Values.s3DeploymentBucket.accesskey }}
+        secretkey: {{ .Values.s3DeploymentBucket.secretkey }}
+        bucket: {{ .Values.s3DeploymentBucket.bucket }}
+        region: {{ .Values.s3DeploymentBucket.region }}
diff --git a/charts/landing-pages-chart/values.yaml b/charts/landing-pages-chart/values.yaml
@@ -10,17 +10,18 @@ domainName:
 secretName:
 clusterIssuer: 
 
-S3MetadataBucket:
-  url: "asdfe"
-  accesskey: sdef
-  secretkey: sage
-  bucket: sage
-  region: asegt
+s3MetadataBucket:
+  url: 
+  accesskey: 
+  secretkey: 
+  bucket: 
+  region: 
 
-S3DeploymentBucket:
-  url: asegt
-  accesskey: aasegf
-  secretkey: asef 
-  bucket: asegt
-  region: asegtf
-
+s3DeploymentBucket:
+  url: 
+  accesskey: 
+  secretkey:  
+  bucket: 
+  region: 
+
+schedule: "0 0 1 * *"