Merge branch 'main' of https://github.com/openshift-pipelines/tekton-…

…caches
openshift-pipelines · Oct 10, 2024 · fd235c4 · fd235c4
2 parents d1c9689 + 6ad954d
commit fd235c4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 19 deletions.
diff --git a/dev/pipeline/pipeline.yaml b/dev/pipeline/pipeline.yaml
@@ -78,10 +78,6 @@ spec:
                 value: $(workspaces.cred.path)/credentials
               - name: awsConfigFile
                 value: $(workspaces.cred.path)/config
-              - name: cred-store
-                value: $(workspaces.cred.path)
-              - name: cred-store
-                value: $(workspaces.cred.path)
               - name: googleCredentialsPath
                 value: $(workspaces.cred.path)/creds.json
 

diff --git a/dev/step-action/cache-fetch.yaml b/dev/step-action/cache-fetch.yaml
@@ -49,9 +49,8 @@ spec:
       type: string
       default: ""
     - name: blobQueryParams
-      type: string
-      default: ""
-    - name: cred-store
+      description: |
+        Blob Query Params to support configure s3, gcs and azure. This is optional unless some additional features of storage providers are required like s3 acceleration, fips, pathstyle,etc
       type: string
       default: ""
   results: # Any result to "publish" ?
@@ -69,8 +68,6 @@ spec:
       value: $(params.insecure)
     - name: GOOGLE_APPLICATION_CREDENTIALS
       value: $(params.googleCredentialsPath)
-    - name: CRED_STORE
-      value: $(params.cred-store)
     - name: AWS_CONFIG_FILE
       value: $(params.awsConfigFile)
     - name: AWS_SHARED_CREDENTIALS_FILE

diff --git a/dev/step-action/cache-upload.yaml b/dev/step-action/cache-upload.yaml
@@ -60,7 +60,7 @@ spec:
       default: ""
     - name: blobQueryParams
       description: |
-        Blob Query Params to support configure s3, gcs and azure.
+        Blob Query Params to support configure s3, gcs and azure. This is optional unless some additional features of storage providers are required like s3 acceleration, fips, pathstyle,etc
       type: string
       default: ""
   env:

diff --git a/tekton/cache-fetch.yaml b/tekton/cache-fetch.yaml
@@ -38,9 +38,19 @@ spec:
         The path where to find the google credentials. If left empty, it is ignored.
       type: string
       default: ""
-    - name: cred-store
+    - name: awsConfigFile
       description: |
-        The path where to find the creds to download cache files . If left empty, it is ignored.
+        The path to the aws config file. If left empty, it is ignored.
+      type: string
+      default: ""
+    - name: awsCredentialFile
+      description: |
+        The path to find the aws credentials file. If left empty, it is ignored.
+      type: string
+      default: ""
+    - name: blobQueryParams
+      description: |
+        Blob Query Params to support configure s3, gcs and azure. This is optional unless some additional features of storage providers are required like s3 acceleration, fips, pathstyle,etc
       type: string
       default: ""
   results: # Any result to "publish" ?
@@ -58,9 +68,12 @@ spec:
       value: $(params.insecure)
     - name: GOOGLE_APPLICATION_CREDENTIALS
       value: $(params.googleCredentialsPath)
-    - name: CRED_STORE
-      value: $(params.cred-store)
-
+    - name: AWS_CONFIG_FILE
+      value: $(params.awsConfigFile)
+    - name: AWS_SHARED_CREDENTIALS_FILE
+      value: $(params.awsCredentialFile)
+    - name: BLOB_QUERY_PARAMS
+      value: $(params.blobQueryParams)
   # FIXME: use a released version once something is released :)
   image: ghcr.io/openshift-pipelines/tekton-caches/cache:latest
   args: ["$(params.patterns[*])"]

diff --git a/tekton/cache-upload.yaml b/tekton/cache-upload.yaml
@@ -48,9 +48,19 @@ spec:
         The path where to find the google credentials. If left empty, it is ignored.
       type: string
       default: ""
-    - name: cred-store
+    - name: awsConfigFile
       description: |
-        The path where to find the creds to upload cache files . If left empty, it is ignored.
+        The path to the aws config file. If left empty, it is ignored.
+      type: string
+      default: ""
+    - name: awsCredentialFile
+      description: |
+        The path to find the aws credentials file. If left empty, it is ignored.
+      type: string
+      default: ""
+    - name: blobQueryParams
+      description: |
+        Blob Query Params to support configure s3, gcs and azure. This is optional unless some additional features of storage providers are required like s3 acceleration, fips, pathstyle,etc
       type: string
       default: ""
   env:
@@ -68,8 +78,12 @@ spec:
       value: $(params.force-cache-upload)
     - name: GOOGLE_APPLICATION_CREDENTIALS
       value: $(params.googleCredentialsPath)
-    - name: CRED_STORE
-      value: $(params.cred-store)
+    - name: AWS_CONFIG_FILE
+      value: $(params.awsConfigFile)
+    - name: AWS_SHARED_CREDENTIALS_FILE
+      value: $(params.awsCredentialFile)
+    - name: BLOB_QUERY_PARAMS
+      value: $(params.blobQueryParams)
   # FIXME: use a released version once something is released :)
   image: ghcr.io/openshift-pipelines/tekton-caches/cache:latest
   args: ["$(params.patterns[*])"]