Fix config and secret key names

swisstopo · Oct 15, 2024 · ac293ab · ac293ab
2 parents 6b99331 + a5955d6
commit ac293ab
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/charts/swissgeol-boreholes-view-sync/Chart.yaml b/charts/swissgeol-boreholes-view-sync/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: swissgeol-boreholes-view-sync
 description: Synchronizes freely available drilling data from a source database to a target database.
 type: application
-version: 0.1.3
+version: 0.2.1
 icon: https://raw.githubusercontent.com/swisstopo/swissgeol-boreholes-suite/main/src/client/public/favicon.ico
 appVersion: "v2.1.870"
 home: https://www.swissgeol.ch/en

diff --git a/charts/swissgeol-boreholes/Chart.yaml b/charts/swissgeol-boreholes/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: swissgeol-boreholes
 description: Borehole Data Management System
 type: application
-version: 0.4.1
+version: 0.5.1
 icon: https://raw.githubusercontent.com/swisstopo/swissgeol-boreholes-suite/main/src/client/public/favicon.ico
 appVersion: "v2.1.870"
 home: https://www.swissgeol.ch/en

diff --git a/charts/swissgeol-boreholes/templates/api.yaml b/charts/swissgeol-boreholes/templates/api.yaml
@@ -40,7 +40,7 @@ spec:
           valueFrom:
             configMapKeyRef:
               name: {{ .Release.Name }}-config
-              key: s3bucket
+              key: s3Bucket
         - name: S3__ENDPOINT
           valueFrom:
             configMapKeyRef:

diff --git a/charts/swissgeol-boreholes/templates/configmap.yaml b/charts/swissgeol-boreholes/templates/configmap.yaml
@@ -9,7 +9,7 @@ data:
   databaseName: {{ .Values.database.name }}
   databasePort: {{ .Values.database.port | default "5432" | quote }}
   s3Endpoint: {{ .Values.s3.endpoint }}
-  s3bucket: {{ .Values.s3.bucket }}
+  s3Bucket: {{ .Values.s3.bucket }}
   s3Secure: {{ .Values.s3.secure | default "1" | quote }}
   authAuthority: {{ .Values.auth.authority | quote }}
   authAudience: {{ .Values.auth.audience | quote }}

diff --git a/charts/swissgeol-boreholes/templates/dataextraction-api.yaml b/charts/swissgeol-boreholes/templates/dataextraction-api.yaml
@@ -29,18 +29,16 @@ spec:
                 secretKeyRef:
                   name: {{ .Release.Name }}-secrets
                   key: s3AccessKey
-                  optional: true
             - name: AWS_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ .Release.Name }}-secrets
                   key: s3SecretKey
-                  optional: true
             - name: AWS_S3_BUCKET
               valueFrom:
                 configMapKeyRef:
                   name: {{ .Release.Name }}-config
-                  key: s3bucket
+                  key: s3Bucket
             - name: AWS_ENDPOINT
               valueFrom:
                 configMapKeyRef:

diff --git a/charts/swissgeol-boreholes/templates/secrets.yaml b/charts/swissgeol-boreholes/templates/secrets.yaml
@@ -9,4 +9,4 @@ data:
   databasePassword: {{ default "" .Values.database.password | b64enc | quote }}
   databaseConnectionString: {{ printf "Host=%s:%s;Database=%s;Username=%s;Password=%s" .Values.database.host (default "5432" .Values.database.port) .Values.database.name .Values.database.username .Values.database.password | b64enc | quote }}
   s3AccessKey: {{ default "" .Values.s3.accessKey | b64enc | quote }}
-  s3Secretkey: {{ default "" .Values.s3.secretKey | b64enc | quote }}
+  s3SecretKey: {{ default "" .Values.s3.secretKey | b64enc | quote }}