From f0f4628fb9251577bbd53290a957d67b3c92f272 Mon Sep 17 00:00:00 2001 From: Scott Hebert Date: Fri, 6 Dec 2024 16:33:14 -0500 Subject: [PATCH] fix(RELEASE-1339): no longer consult .sign.request (#733) - use the task default for the request pipeline name Signed-off-by: Scott Hebert --- tasks/sign-base64-blob/README.md | 5 +++-- tasks/sign-base64-blob/sign-base64-blob.yaml | 9 ++------- tasks/sign-base64-blob/tests/test-sign-base64-blob.yaml | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tasks/sign-base64-blob/README.md b/tasks/sign-base64-blob/README.md index 79c9203cd..0e233e7f6 100644 --- a/tasks/sign-base64-blob/README.md +++ b/tasks/sign-base64-blob/README.md @@ -7,7 +7,6 @@ Creates an InternalRequest to sign a base64 encoded blob | Name | Description | Optional | Default value | |----------------------|-------------------------------------------------------------------------------------------|----------|-----------------------| | dataPath | Path to the JSON string of the merged data to use in the data workspace | No | - | -| request | Signing pipeline name to handle this request | Yes | blob-signing-pipeline | | referenceImage | The image to be signed | No | - | | manifestDigestImage | Manifest Digest Image used to extract the SHA | Yes | "" | | requester | Name of the user that requested the signing, for auditing purposes | No | - | @@ -22,11 +21,13 @@ Creates an InternalRequest to sign a base64 encoded blob ``` data: sign: - request: pipelineImage: configMapName: ``` +## Changes in 2.4.0 +* No longer examine `.data.sign.request` to obtain the Signing pipeline name. Use the default - blob-signing-pipeline + ## Changes in 2.3.0 * Updated the base image used in this task diff --git a/tasks/sign-base64-blob/sign-base64-blob.yaml b/tasks/sign-base64-blob/sign-base64-blob.yaml index c49d128c4..660644efd 100644 --- a/tasks/sign-base64-blob/sign-base64-blob.yaml +++ b/tasks/sign-base64-blob/sign-base64-blob.yaml @@ -4,7 +4,7 @@ kind: Task metadata: name: sign-base64-blob labels: - app.kubernetes.io/version: "2.3.0" + app.kubernetes.io/version: "2.4.0" annotations: tekton.dev/pipelines.minVersion: "0.12.1" tekton.dev/tags: release @@ -15,10 +15,6 @@ spec: - name: dataPath description: Path to the JSON string of the merged data to use in the data workspace type: string - - name: request - type: string - description: Signing pipeline name to handle this request - default: "blob-signing-pipeline" - name: blob type: string description: The base64 encoded blob to be signed. @@ -54,7 +50,6 @@ spec: exit 1 fi - request=$(jq -r '.sign.request // "$(params.request)"' ${DATA_FILE}) default_pipeline_image="quay.io/redhat-isv/operator-pipelines-images:9ea90b42456fcdf66edf4b15c0c0487ba5fa3ee3" pipeline_image=$(jq -r --arg default_pipeline_image ${default_pipeline_image} \ '.sign.pipelineImage // $default_pipeline_image' ${DATA_FILE}) @@ -65,7 +60,7 @@ spec: echo "- blob=$(params.blob)" echo "- requester=$(params.requester)" - internal-request -r "${request}" \ + internal-request -r "blob-signing-pipeline" \ -p pipeline_image=${pipeline_image} \ -p blob=$(params.blob) \ -p requester=$(params.requester) \ diff --git a/tasks/sign-base64-blob/tests/test-sign-base64-blob.yaml b/tasks/sign-base64-blob/tests/test-sign-base64-blob.yaml index b0008081d..fdf2524d1 100644 --- a/tasks/sign-base64-blob/tests/test-sign-base64-blob.yaml +++ b/tasks/sign-base64-blob/tests/test-sign-base64-blob.yaml @@ -25,7 +25,6 @@ spec: cat > $(workspaces.data.path)/data.json << EOF { "sign": { - "request": "blob-signing-pipeline", "configMapName": "signing-config-map" } }