Skip to content

[multiple] Remove unnecessary registries from defaults #4013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Valkyrie00 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −17
Open

[multiple] Remove unnecessary registries from defaults #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions hooks/playbooks/config_cluster_for_disconnected_deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
---
# This is a pre_infra ci-framework hook that will configure the cluster for
# disconnected deployment. The variable: cifmw_ci_gen_kustomize_values_ooi_image
# must be specified. These examples for that variable are supported:
#
# registry-proxy.engineering.redhat.com/rh-osbs/iib:1125611
# registry.redhat.io/redhat/redhat-operator-index:v4.18
#
# Due to being in deprecated sqlite format this is unsupported:
# images.paas.redhat.com/podified-main-rhos-18-rhel-9/openstack-operator-index:trunk-patches-latest
#
# sqlite requires deprecated v1 oc-mirror workflow instead of the supported v2
# oc-mirror workflow
#
# must be specified with a valid operator index image URL.
#
- name: Update cluster for disconnected deployment
hosts: "{{ cifmw_target_host | default('localhost') }}"
Expand Down
4 changes: 0 additions & 4 deletions roles/openshift_setup/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,4 @@ cifmw_openshift_setup_allowed_registries:
- "registry.k8s.io"
- "registry.redhat.io"
- "registry.connect.redhat.com"
- "registry-proxy.engineering.redhat.com"
- "registry.stage.redhat.io"
- "images.paas.redhat.com"
- "image-registry.openshift-image-registry.svc:5000"
cifmw_openshift_setup_allowed_extra_registries: []
4 changes: 2 additions & 2 deletions roles/set_openstack_containers/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ It is used in edpm-ansible job to update the `ANSIBLEEE_IMAGE_URL_DEFAULT`.

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

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.
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.

Setting `cifmw_set_openstack_containers_overrides_transform` will enable the transformation to happen.

Expand All @@ -118,7 +118,7 @@ Setting `cifmw_set_openstack_containers_overrides_transform` will enable the tra
name: set_openstack_containers
```

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`
Will transform `example.registry.com/rh-osbs/rhoso18-ironic-python-agent:18.0` into `quay.io/test-namespace/ironic-python-agent:test-tag`

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

Expand Down
Loading