Skip to content

Commit ee3d764

Browse files
committed
Replace isv guild gpg keys with pipelines keys
Pipelines have a custom set of gpg keys. The isv guild keys will be deprecated soon. JIRA: ISV-2727
1 parent aba0a11 commit ee3d764

23 files changed

+1366
-286
lines changed

ansible/inventory/group_vars/operator-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ operator_pipeline_hydra_password_local_path: ../../vaults/common/nonprod-hydra-p
3535
operator_pipeline_preflight_decryption_key_private_local_path: ../../vaults/common/preflight-decryption-key-priv.gpg
3636
operator_pipeline_preflight_decryption_key_public_local_path: ../../vaults/common/preflight-decryption-key-pub.gpg
3737

38-
operator_pipeline_exd_guild_isv_key_path: ../../vaults/{{ env }}/exd-guild-isv.key
39-
operator_pipeline_exd_guild_isv_passphrase_path: ../../vaults/{{ env }}/exd-guild-isv.passphrase
38+
operator_pipeline_gpg_key_path: ../../vaults/{{ env }}/operator-pipeline-gpg.key
39+
operator_pipeline_gpg_passphrase_path: ../../vaults/{{ env }}/operator-pipeline-gpg.passphrase
4040

4141
operator_pipeline_url: "https://operator-pipeline-{{ oc_namespace }}.apps.pipelines-stage.0ce8.p1.openshiftapps.com"
4242
operator_pipeline_webhook_secret: ../../vaults/common/github-webhook-secret-preprod.txt

ansible/roles/operator-pipeline/tasks/pipeline-secrets.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@
294294
suffix: "{{ suffix }}"
295295
env: "{{ env }}"
296296
data:
297-
exd-guild-isv.key: "{{ lookup('file', operator_pipeline_exd_guild_isv_key_path, rstrip=False) | b64encode }}"
298-
exd-guild-isv.passphrase: "{{ lookup('file', operator_pipeline_exd_guild_isv_passphrase_path, rstrip=False) | b64encode }}"
297+
operator-pipeline-gpg.key: "{{ lookup('file', operator_pipeline_gpg_key_path, rstrip=False) | b64encode }}"
298+
operator-pipeline-gpg.passphrase: "{{ lookup('file', operator_pipeline_gpg_passphrase_path, rstrip=False) | b64encode }}"
299299

300300
- name: Create quay OAuth token secret
301301
no_log: yes

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ spec:
8787
default: isv-gpg-key
8888
- name: gpg_key_secret_key
8989
description: The key within the Kubernetes Secret that contains the gpg key.
90-
default: exd-guild-isv.key
90+
default: operator-pipeline-gpg.key
9191
- name: gpg_passphrase_secret_key
9292
description: The key within the Kubernetes Secret that contains the gpg passphrase.
93-
default: exd-guild-isv.passphrase
93+
default: operator-pipeline-gpg.passphrase
9494
- name: metrics_endpoint
9595
description: Prometheus metrics endpoint
9696
default: http://pipeline-metrics.pipeline-metrics-prod

ansible/vaults/dev/exd-guild-isv.key

Lines changed: 0 additions & 50 deletions
This file was deleted.

ansible/vaults/dev/exd-guild-isv.passphrase

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)