Fix Vector secret name (#5004)

This fixes the secret name used by Vector. It also unifies the names used in staging and development (CI).
redhat-appstudio · Nov 28, 2024 · 66214a8 · 66214a8
1 parent 8896202
commit 66214a8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/components/pipeline-service/development/main-pipeline-service-configuration.yaml b/components/pipeline-service/development/main-pipeline-service-configuration.yaml
@@ -2005,27 +2005,27 @@ spec:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_access_key_id
           - name: AWS_SECRET_ACCESS_KEY
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_secret_access_key
           - name: AWS_DEFAULT_REGION
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_region
           - name: BUCKET
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: bucket
           - name: ENDPOINT
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: endpoint
         tolerations:
           - effect: NoSchedule

diff --git a/components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml b/components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml
@@ -1957,27 +1957,27 @@ spec:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_access_key_id
           - name: AWS_SECRET_ACCESS_KEY
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_secret_access_key
           - name: AWS_DEFAULT_REGION
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_region
           - name: BUCKET
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: bucket
           - name: ENDPOINT
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: endpoint
         tolerations:
           - effect: NoSchedule

diff --git a/components/pipeline-service/staging/stone-stage-p01/deploy.yaml b/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
@@ -1946,27 +1946,27 @@ spec:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_access_key_id
           - name: AWS_SECRET_ACCESS_KEY
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_secret_access_key
           - name: AWS_DEFAULT_REGION
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_region
           - name: BUCKET
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: bucket
           - name: ENDPOINT
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: endpoint
         tolerations:
           - effect: NoSchedule

diff --git a/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml b/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
@@ -1946,27 +1946,27 @@ spec:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_access_key_id
           - name: AWS_SECRET_ACCESS_KEY
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_secret_access_key
           - name: AWS_DEFAULT_REGION
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: aws_region
           - name: BUCKET
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: bucket
           - name: ENDPOINT
             valueFrom:
               secretKeyRef:
-                name: s3-conf
+                name: tekton-results-s3
                 key: endpoint
         tolerations:
           - effect: NoSchedule

diff --git a/hack/secret-creator/create-plnsvc-secrets.sh b/hack/secret-creator/create-plnsvc-secrets.sh
@@ -6,7 +6,7 @@ main() {
     create_namespace tekton-logging
     create_db_secret
     create_s3_secret tekton-results tekton-results-s3
-    create_s3_secret tekton-logging s3-conf
+    create_s3_secret tekton-logging tekton-results-s3
     create_db_cert_secret_and_configmap
     if ! [ -x "$(command -v mc)" ]; then
         curl https://dl.min.io/client/mc/release/linux-amd64/mc \