Skip to content

Commit e5cd0c5

Browse files
[multiple] Remove unnecessary registries from defaults
Remove registries that are not needed in upstream defaults. These are now supplied via cifmw_openshift_setup_allowed_extra_registries at the job level. Also cleaned up related references from comments and documentation. Signed-off-by: Vito Castellano <vcastell@redhat.com>
1 parent 9535333 commit e5cd0c5

3 files changed

Lines changed: 3 additions & 17 deletions

File tree

hooks/playbooks/config_cluster_for_disconnected_deployment.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
---
22
# This is a pre_infra ci-framework hook that will configure the cluster for
33
# disconnected deployment. The variable: cifmw_ci_gen_kustomize_values_ooi_image
4-
# must be specified. These examples for that variable are supported:
5-
#
6-
# registry-proxy.engineering.redhat.com/rh-osbs/iib:1125611
7-
# registry.redhat.io/redhat/redhat-operator-index:v4.18
8-
#
9-
# Due to being in deprecated sqlite format this is unsupported:
10-
# images.paas.redhat.com/podified-main-rhos-18-rhel-9/openstack-operator-index:trunk-patches-latest
11-
#
12-
# sqlite requires deprecated v1 oc-mirror workflow instead of the supported v2
13-
# oc-mirror workflow
14-
#
4+
# must be specified with a valid operator index image URL.
155
#
166
- name: Update cluster for disconnected deployment
177
hosts: "{{ cifmw_target_host | default('localhost') }}"

roles/openshift_setup/defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,4 @@ cifmw_openshift_setup_allowed_registries:
3636
- "registry.k8s.io"
3737
- "registry.redhat.io"
3838
- "registry.connect.redhat.com"
39-
- "registry-proxy.engineering.redhat.com"
40-
- "registry.stage.redhat.io"
41-
- "images.paas.redhat.com"
42-
- "image-registry.openshift-image-registry.svc:5000"
4339
cifmw_openshift_setup_allowed_extra_registries: []

roles/set_openstack_containers/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ It is used in edpm-ansible job to update the `ANSIBLEEE_IMAGE_URL_DEFAULT`.
9999

100100
### Update an image which doesn't have openstack- in its name
101101

102-
For instance `RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT` has this kind of url `registry-proxy.engineering.redhat.com/rh-osbs/rhoso18-ironic-python-agent:18.0` where the usual `openstack-` prefix is absent.
102+
For instance `RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT` has this kind of url `example.registry.com/rh-osbs/rhoso18-ironic-python-agent:18.0` where the usual `openstack-` prefix is absent.
103103

104104
Setting `cifmw_set_openstack_containers_overrides_transform` will enable the transformation to happen.
105105

@@ -118,7 +118,7 @@ Setting `cifmw_set_openstack_containers_overrides_transform` will enable the tra
118118
name: set_openstack_containers
119119
```
120120

121-
Will transform `registry-proxy.engineering.redhat.com/rh-osbs/rhoso18-ironic-python-agent:18.0` into `quay.io/test-namespace/ironic-python-agent:test-tag`
121+
Will transform `example.registry.com/rh-osbs/rhoso18-ironic-python-agent:18.0` into `quay.io/test-namespace/ironic-python-agent:test-tag`
122122

123123
### Update all openstack services containers env vars in meta operator with tag from delorean and set OPENSTACK_RELEASE_VERSION env
124124

0 commit comments

Comments
 (0)