Skip to content

Commit 2f3dfb0

Browse files
committed
Remove IBM replication task
The task is no longer needed because IBM decided to drop this feature. JIRA: ISV-2040
1 parent 5034039 commit 2f3dfb0

File tree

19 files changed

+1
-1923
lines changed

19 files changed

+1
-1923
lines changed

ansible/inventory/group_vars/operator-pipeline-prod.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ e2e_kubeconfig_path: ../../vaults/prod/kubeconfig-e2e
2424

2525
pipelines_metrics_endpoint: http://pipeline-metrics.pipeline-metrics-prod
2626

27-
operator_pipeline_ibm_webhook_token_local_path: ../../vaults/prod/nonprod-ibm-webhook-token
28-
2927
# Settings for importing index imagestreams
3028
certified_operator_index: registry.redhat.io/redhat/certified-operator-index
3129
redhat_marketplace_index: registry.redhat.io/redhat/redhat-marketplace-index

ansible/inventory/group_vars/operator-pipeline.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ operator_pipeline_registry_token: ../../vaults/{{ env }}/dockerconfig.json
2121

2222
operator_pipeline_kubeconfig_prow_local_path: ../../vaults/common/kubeconfig-prow
2323
operator_pipeline_github_bot_token: ../../vaults/common/github-bot-token.txt
24-
operator_pipeline_ibm_webhook_token_local_path: ../../vaults/common/nonprod-ibm-webhook-token
2524

2625
operator_pipeline_hydra_username_local_path: ../../vaults/common/nonprod-hydra-username
2726
operator_pipeline_hydra_password_local_path: ../../vaults/common/nonprod-hydra-password

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -255,26 +255,6 @@
255255
data:
256256
token: "{{ quay_oauth_token | b64encode }}"
257257

258-
- name: Create IBM webhook token secret
259-
no_log: yes
260-
tags:
261-
- secrets
262-
k8s:
263-
state: present
264-
force: yes
265-
namespace: "{{ oc_namespace }}"
266-
definition:
267-
apiVersion: v1
268-
kind: Secret
269-
type: opaque
270-
metadata:
271-
name: ibm-webhook-token
272-
labels:
273-
app: operator-pipeline
274-
suffix: "{{ suffix }}"
275-
env: "{{ env }}"
276-
data:
277-
token: "{{ lookup('file', operator_pipeline_ibm_webhook_token_local_path, rstrip=False) | b64encode }}"
278258

279259
- name: Create signing pub key secret
280260
no_log: yes

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

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ spec:
4040
- name: github_token_secret_key
4141
description: The key within the Kubernetes Secret that contains the GitHub token.
4242
default: github_bot_token
43-
- name: ibm_webhook_token_secret_name
44-
description: The name of the Kubernetes Secret that contains the IBM webhook token.
45-
default: ibm-webhook-token
46-
- name: ibm_webhook_token_secret_key
47-
description: The key within the Kubernetes Secret that contains the IBM webhook token.
48-
default: token
4943
- name: pyxis_ssl_secret_name
5044
description: Kubernetes secret name that contains the Pyxis SSL files.
5145
default: operator-pipeline-api-certs
@@ -334,36 +328,6 @@ spec:
334328
- name: ocp_registry_kubeconfig_secret_key
335329
value: "$(params.ocp_registry_kubeconfig_secret_key)"
336330

337-
# Trigger IBM webhook for marketplace replication
338-
- name: trigger-marketplace-replication
339-
runAfter:
340-
- publish-to-ocp-registry
341-
- get-supported-versions
342-
- bundle-path-validation
343-
taskRef:
344-
name: trigger-marketplace-replication
345-
params:
346-
- name: bundle_path
347-
value: "$(tasks.get-bundle-path.results.bundle_path)"
348-
- name: ibm_webhook_token_secret_name
349-
value: "$(params.ibm_webhook_token_secret_name)"
350-
- name: ibm_webhook_token_secret_key
351-
value: "$(params.ibm_webhook_token_secret_key)"
352-
- name: package
353-
value: "$(tasks.bundle-path-validation.results.package_name)"
354-
- name: pipeline_image
355-
value: "$(params.pipeline_image)"
356-
- name: ocp_version
357-
value: "$(tasks.get-supported-versions.results.ocp_version)"
358-
- name: organization
359-
value: "$(tasks.get-organization.results.organization)"
360-
- name: version
361-
value: "$(tasks.bundle-path-validation.results.bundle_version)"
362-
workspaces:
363-
- name: source
364-
workspace: repository
365-
subPath: src
366-
367331
# create container image
368332
- name: create-container-image
369333
runAfter:
@@ -402,7 +366,7 @@ spec:
402366
- name: publish-bundle
403367
runAfter:
404368
- create-container-image
405-
- trigger-marketplace-replication
369+
- get-supported-versions
406370
taskRef:
407371
name: publish-bundle
408372
params:

ansible/roles/operator-pipeline/templates/openshift/tasks/trigger-marketplace-replication.yml

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

ansible/vaults/common/nonprod-ibm-webhook-token

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

ansible/vaults/prod/nonprod-ibm-webhook-token

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

docs/pipeline-env-setup.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,3 @@ oc create secret generic ocp-registry-kubeconfig \
197197

198198
Additional setup instructions for this cluster are documented [here](rhc4tp-cluster.md).
199199

200-
### IBM webhook token
201-
The Release pipeline needs to call an IBM webhook to trigger marketplace replication. To
202-
authenticate with the webhook, a token is needed.
203-
204-
```bash
205-
oc create secret generic ibm-webhook-token --from-literal token=< TOKEN >
206-
```

operator-pipeline-images/operatorcert/entrypoints/marketplace_replication.py

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

operator-pipeline-images/operatorcert/webhook/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)