Skip to content

Commit 1de144b

Browse files
committed
fix: add-bundle-to-fbc uses registry credentials
In order to render a catalog from template a task needs a registy credentials. The auth file was mounted as a workspace to the task and default env variable is pointing to the auth config. While testing the config I found out that pre-prod registry tokens lost access to registry and needed to be rotated. JIRA: ISV-5757 Signed-off-by: Ales Raszka <[email protected]>
1 parent 7a63f9a commit 1de144b

File tree

7 files changed

+1759
-1855
lines changed

7 files changed

+1759
-1855
lines changed

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml

+2
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,8 @@ spec:
644644
subPath: summary
645645
- name: ssh-directory
646646
workspace: ssh-dir
647+
- name: registry-credentials
648+
workspace: registry-pull-credentials
647649

648650
finally:
649651

ansible/roles/operator-pipeline/templates/openshift/tasks/add-bundle-to-fbc.yml

+7
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,18 @@ spec:
5757
description: Scratch space and storage for the comment and related data
5858
- name: ssh-directory
5959
optional: true
60+
- name: registry-credentials
61+
description: A workspace with credentials for registry opm render catalog command
62+
optional: true
6063

6164
steps:
6265
- name: add-bundle-to-fbc
6366
image: "$(params.pipeline_image)"
6467
workingDir: $(workspaces.source.path)
68+
env:
69+
# The registry auth file for opm render catalog command
70+
- name: REGISTRY_AUTH_FILE
71+
value: "$(workspaces.registry-credentials.path)/.dockerconfigjson"
6572
script: |
6673
#! /usr/bin/env bash
6774
set -xe

ansible/vaults/dev/registry-auth/release-pipeline-pull.json

+350-382
Large diffs are not rendered by default.

ansible/vaults/integration-tests/registry-auth/release-pipeline-pull.json

+350-382
Large diffs are not rendered by default.

ansible/vaults/prod/registry-auth/release-pipeline-pull.json

+350-327
Large diffs are not rendered by default.

ansible/vaults/qa/registry-auth/release-pipeline-pull.json

+350-382
Large diffs are not rendered by default.

ansible/vaults/stage/registry-auth/release-pipeline-pull.json

+350-382
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)