From 4ae4b30ff31ce05cb5a89288576ff9300785048a Mon Sep 17 00:00:00 2001
From: Manuel Esberger <esberger.manuel@live.at>
Date: Fri, 2 Aug 2024 08:06:38 +0200
Subject: [PATCH] unify object bucket secret name
---
helm/dbrepo/templates/analyse-deployment.yaml | 10 ++++----
helm/dbrepo/templates/data-deployment.yaml | 10 ++++----
.../dbrepo/templates/metadata-deployment.yaml | 10 ++++----
.../templates/storage-bucket-download.yml | 11 +++++++++
.../templates/storage-bucket-upload.yaml | 11 +++++++++
helm/dbrepo/templates/storage-bucket.yaml | 23 -------------------
helm/dbrepo/templates/upload-deployment.yaml | 6 ++---
7 files changed, 40 insertions(+), 41 deletions(-)
create mode 100644 helm/dbrepo/templates/storage-bucket-download.yml
create mode 100644 helm/dbrepo/templates/storage-bucket-upload.yaml
delete mode 100644 helm/dbrepo/templates/storage-bucket.yaml
diff --git a/helm/dbrepo/templates/analyse-deployment.yaml b/helm/dbrepo/templates/analyse-deployment.yaml
index 41f42db816..3024f13183 100644
--- a/helm/dbrepo/templates/analyse-deployment.yaml
+++ b/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:
diff --git a/helm/dbrepo/templates/data-deployment.yaml b/helm/dbrepo/templates/data-deployment.yaml
index ecfd391213..d570a2e164 100644
--- a/helm/dbrepo/templates/data-deployment.yaml
+++ b/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:
diff --git a/helm/dbrepo/templates/metadata-deployment.yaml b/helm/dbrepo/templates/metadata-deployment.yaml
index 4254741ddd..51dea77170 100644
--- a/helm/dbrepo/templates/metadata-deployment.yaml
+++ b/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:
diff --git a/helm/dbrepo/templates/storage-bucket-download.yml b/helm/dbrepo/templates/storage-bucket-download.yml
new file mode 100644
index 0000000000..f5795396d3
--- /dev/null
+++ b/helm/dbrepo/templates/storage-bucket-download.yml
@@ -0,0 +1,11 @@
+apiVersion: appcat.vshn.io/v1
+kind: ObjectBucket
+metadata:
+ name: s3-bucket-dbrepo-download
+ namespace: aris-dbrepo-dev
+spec:
+ parameters:
+ bucketName: s3-bucket-dbrepo-download
+ region: at-vie-1
+ writeConnectionSecretToRef:
+ name: s3-bucket-dbrepo-download-secret
\ No newline at end of file
diff --git a/helm/dbrepo/templates/storage-bucket-upload.yaml b/helm/dbrepo/templates/storage-bucket-upload.yaml
new file mode 100644
index 0000000000..1d548082e4
--- /dev/null
+++ b/helm/dbrepo/templates/storage-bucket-upload.yaml
@@ -0,0 +1,11 @@
+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
diff --git a/helm/dbrepo/templates/storage-bucket.yaml b/helm/dbrepo/templates/storage-bucket.yaml
deleted file mode 100644
index e8c3b1209d..0000000000
--- a/helm/dbrepo/templates/storage-bucket.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-spec:
- parameters:
- bucketName: s3-bucket-dbrepo-download
- region: at-vie-1
- writeConnectionSecretToRef:
- name: s3-dbrepo-download-bucket-secret
\ No newline at end of file
diff --git a/helm/dbrepo/templates/upload-deployment.yaml b/helm/dbrepo/templates/upload-deployment.yaml
index 85e3fc7ca0..9d2e784b32 100644
--- a/helm/dbrepo/templates/upload-deployment.yaml
+++ b/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:
--
GitLab