diff --git a/helm/dbrepo/templates/analyse-deployment.yaml b/helm/dbrepo/templates/analyse-deployment.yaml index 41f42db8164d3627461d7a0036d554e5e50ec12c..3024f13183f9b378de164ad7ded96b2fb84891bd 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 ecfd391213423789ff1850c20cce2158a07a42fa..d570a2e1649a0065d4817407669328eb05346bc8 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 4254741ddd8d4ee5dc6d7b17a5d756a0dde2eee0..51dea77170b7946a033e9a582202b6824c37f4c3 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 0000000000000000000000000000000000000000..f5795396d39f7209fdd9c4d9f5c4776c9433cbea --- /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 0000000000000000000000000000000000000000..1d548082e4d3cf91adc3167e1cea2861ee70dae8 --- /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 e8c3b1209d70dcb721b9f026ffda2054de52fe46..0000000000000000000000000000000000000000 --- 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 85e3fc7ca05450328c2fae95bccd352c9851a401..9d2e784b32c46c83393585265e3d213574d9c254 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: