From a7655c274bc498445c1cd082194d0ba3402c7b2c Mon Sep 17 00:00:00 2001 From: Scott Hebert Date: Fri, 8 Nov 2024 16:34:45 -0500 Subject: [PATCH 1/2] feat(RELEASE-1283): file-updates secret update - allow file-updates-secret to be configurable Signed-off-by: Scott Hebert --- internal-services/catalog/file-updates-pipeline.yaml | 6 ++++++ .../file-updates-process-file-updates-task.yaml | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/internal-services/catalog/file-updates-pipeline.yaml b/internal-services/catalog/file-updates-pipeline.yaml index bc352a8..d0d7a81 100644 --- a/internal-services/catalog/file-updates-pipeline.yaml +++ b/internal-services/catalog/file-updates-pipeline.yaml @@ -29,6 +29,10 @@ spec: - name: application type: string description: Application being released + - name: file_updates_secret + type: string + default: "file-updates-secret" + description: The credentials used to update the git repo tasks: - name: task-process-file-updates taskRef: @@ -44,6 +48,8 @@ spec: value: $(params.paths) - name: application value: $(params.application) + - name: file_updates_secret + value: $(params.file_updates_secret) results: - name: jsonBuildInfo value: $(tasks.task-process-file-updates.results.fileUpdatesInfo) diff --git a/internal-services/catalog/file-updates-process-file-updates-task.yaml b/internal-services/catalog/file-updates-process-file-updates-task.yaml index 78ebdaf..bb15b2b 100644 --- a/internal-services/catalog/file-updates-process-file-updates-task.yaml +++ b/internal-services/catalog/file-updates-process-file-updates-task.yaml @@ -29,6 +29,10 @@ spec: - name: application type: string description: Application being released + - name: file_updates_secret + type: string + default: "file-updates-secret" + description: The credentials used to update the git repo results: - name: fileUpdatesInfo description: fileUpdates detailed information @@ -41,22 +45,22 @@ spec: - name: GITLAB_HOST valueFrom: secretKeyRef: - name: file-updates-secret + name: $(params.file_updates_secret) key: gitlab_host - name: ACCESS_TOKEN valueFrom: secretKeyRef: - name: file-updates-secret + name: $(params.file_updates_secret) key: gitlab_access_token - name: GIT_AUTHOR_NAME valueFrom: secretKeyRef: - name: file-updates-secret + name: $(params.file_updates_secret) key: git_author_name - name: GIT_AUTHOR_EMAIL valueFrom: secretKeyRef: - name: file-updates-secret + name: $(params.file_updates_secret) key: git_author_email script: | #!/usr/bin/env sh From c92978fcb5f3442cac9f191a4df3a167c4dd4e3d Mon Sep 17 00:00:00 2001 From: Scott Hebert Date: Sun, 10 Nov 2024 22:58:48 -0500 Subject: [PATCH 2/2] feat(RELEASE-1283): file-updates naming - change reference to RHTAP to Konflux Signed-off-by: Scott Hebert --- .../catalog/file-updates-process-file-updates-task.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal-services/catalog/file-updates-process-file-updates-task.yaml b/internal-services/catalog/file-updates-process-file-updates-task.yaml index bb15b2b..e890223 100644 --- a/internal-services/catalog/file-updates-process-file-updates-task.yaml +++ b/internal-services/catalog/file-updates-process-file-updates-task.yaml @@ -186,7 +186,7 @@ spec: git_commit_and_push --branch $WORKING_BRANCH --message "fileUpdates changes" echo "Creating Pull Request..." - GITLAB_MR_MSG="[RHTAP release] $(params.application): fileUpdates changes ${WORKING_BRANCH}" + GITLAB_MR_MSG="[Konflux release] $(params.application): fileUpdates changes ${WORKING_BRANCH}" gitlab_create_mr --head $WORKING_BRANCH --target-branch $REVISION --title "${GITLAB_MR_MSG}" \ --description "${GITLAB_MR_MSG}" --upstream-repo "${UPSTREAM_REPO}" | jq '. | tostring' \ |tee $(results.fileUpdatesInfo.path)