unify object bucket secret name

helm/dbrepo/templates/analyse-deployment.yaml

@@ -42,27 +42,27 @@ spec:
             - name: S3_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: AWS_ACCESS_KEY_ID
             - name: S3_ENDPOINT
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: ENDPOINT_URL
             - name: S3_EXPORT_BUCKET
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-upload-bucket-secret
+                  name: s3-bucket-dbrepo-upload-secret
                   key: BUCKET_NAME
             - name: S3_IMPORT_BUCKET
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: BUCKET_NAME
             - name: S3_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: AWS_SECRET_ACCESS_KEY
           livenessProbe:
             exec:

helm/dbrepo/templates/data-deployment.yaml

@@ -42,27 +42,27 @@ spec:
             - name: S3_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: AWS_ACCESS_KEY_ID
             - name: S3_ENDPOINT
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: ENDPOINT_URL
             - name: S3_EXPORT_BUCKET
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-upload-bucket-secret
+                  name: s3-bucket-dbrepo-upload-secret
                   key: BUCKET_NAME
             - name: S3_IMPORT_BUCKET
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: BUCKET_NAME
             - name: S3_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: AWS_SECRET_ACCESS_KEY
           livenessProbe:
             exec:

helm/dbrepo/templates/metadata-deployment.yaml

@@ -42,27 +42,27 @@ spec:
             - name: S3_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: AWS_ACCESS_KEY_ID
             - name: S3_ENDPOINT
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: ENDPOINT_URL
             - name: S3_EXPORT_BUCKET
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-upload-bucket-secret
+                  name: s3-bucket-dbrepo-upload-secret
                   key: BUCKET_NAME
             - name: S3_IMPORT_BUCKET
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: BUCKET_NAME
             - name: S3_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-download-bucket-secret
+                  name: s3-bucket-dbrepo-download-secret
                   key: AWS_SECRET_ACCESS_KEY
           livenessProbe:
             exec:

helm/dbrepo/templates/storage-bucket.yaml → helm/dbrepo/templates/storage-bucket-download.yml

 apiVersion: appcat.vshn.io/v1
 kind: ObjectBucket
-metadata:
-  name: s3-bucket-dbrepo-upload
-  namespace: aris-dbrepo-dev
-spec:
-  parameters:
-    bucketName: s3-bucket-dbrepo-upload
-    region: at-vie-1
-  writeConnectionSecretToRef:
-    name: s3-dbrepo-upload-bucket-secret
----
-apiVersion: appcat.vshn.io/v1
-kind: ObjectBucket
 metadata:
   name: s3-bucket-dbrepo-download
   namespace: aris-dbrepo-dev
@@ -20,4 +8,4 @@ spec:
     bucketName: s3-bucket-dbrepo-download
     region: at-vie-1
   writeConnectionSecretToRef:
-    name: s3-dbrepo-download-bucket-secret
+    name: s3-bucket-dbrepo-download-secret
\ No newline at end of file

helm/dbrepo/templates/storage-bucket-upload.yaml

+apiVersion: appcat.vshn.io/v1
+kind: ObjectBucket
+metadata:
+  name: s3-bucket-dbrepo-upload
+  namespace: aris-dbrepo-dev
+spec:
+  parameters:
+    bucketName: s3-bucket-dbrepo-upload
+    region: at-vie-1
+  writeConnectionSecretToRef:
+    name: s3-bucket-dbrepo-upload-secret
\ No newline at end of file

helm/dbrepo/templates/upload-deployment.yaml

@@ -59,17 +59,17 @@ spec:
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-upload-bucket-secret
+                  name: s3-bucket-dbrepo-upload-secret
                   key: AWS_ACCESS_KEY_ID
             - name: AWS_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-upload-bucket-secret
+                  name: s3-bucket-dbrepo-upload-secret
                   key: AWS_SECRET_ACCESS_KEY
             - name: AWS_REGION
               valueFrom:
                 secretKeyRef:
-                  name: s3-dbrepo-upload-bucket-secret
+                  name: s3-bucket-dbrepo-upload-secret
                   key: AWS_REGION
           resources: {{- toYaml .Values.resources | nindent 12 }}
       volumes: