Skip to content

Commit 60600dc

Browse files
committed
Drop support for IIB on OCP 4.12
The last job we ran with that for IIB was more than 4 months ago.
1 parent 4d04000 commit 60600dc

5 files changed

Lines changed: 6 additions & 84 deletions

File tree

ansible/roles/iib_ci/README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,6 @@ use that. Run `make iib` with the following environment variables set:
6464
* `INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:492329`
6565
* `KUBEADMINPASS="11111-22222-33333-44444"`
6666

67-
### OCP 4.12 and previous versions
68-
69-
Due to the lack of v2 manifest support on the internal registry, we use an external
70-
registry. Run `make iib` with the following environment variables set:
71-
72-
* `INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:492329`
73-
* `REGISTRY=quay.io/rhn_support_mbaldess/iib`
74-
* `REGISTRY_TOKEN=<username>:<token>`
75-
76-
*Note*: For the REGISTRY_TOKEN go to your quay repository, add a robot with "Write" permissions. The robot created will have a "username" and "password" fields. Set the REGISTRY_TOKEN environment variable to that value.
77-
7867
## Useful commands
7968

8069
* List IIBs for an operator:

ansible/roles/iib_ci/defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
rh_internal_registry: registry-proxy.engineering.redhat.com
22
iib_image: "{{ lookup('env', 'INDEX_IMAGE') }}"
33

4-
external_registry: "{{ lookup('env', 'REGISTRY') }}"
5-
external_registry_token: "{{ lookup('env', 'REGISTRY_TOKEN') }}"
6-
external_registry_email: noemail@localhost
7-
84
kubeadminpass: "{{ lookup('env', 'KUBEADMINPASS') }}"
95

106
internal_registry_ns: openshift-marketplace

ansible/roles/iib_ci/tasks/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
- name: Is OCP pre OCP 4.13? (aka registry supports v2 manifests)
2323
ansible.builtin.set_fact:
24-
use_internal_registry: "{{ oc_version_raw.stdout is version('4.13', '>=') }}"
24+
ocp_413: "{{ oc_version_raw.stdout is version('4.13', '>=') }}"
25+
26+
- name: Fail if OCP < 4.13 as we do not support it for IIB testing any longer
27+
ansible.builtin.fail:
28+
msg: "OCP versions < 4.13 are not support for IIB loading"
29+
when: not ocp_413
2530

2631
- name: Set up internal registry (OCP >= 4.13)
2732
ansible.builtin.include_tasks: setup-internal-registry.yml
28-
when: use_internal_registry
29-
30-
- name: Set up external registry (OCP < 4.13)
31-
ansible.builtin.include_tasks: setup-external-registry.yml
32-
when: not use_internal_registry
3333

3434
- name: Install new IIB in cluster
3535
ansible.builtin.include_tasks: install-iib-in-cluster.yml

ansible/roles/iib_ci/tasks/mirror-related-images.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,6 @@
9191
'mirrordest_nosha': (mirror_dest + item | basename) | regex_replace('@.*$', ''),
9292
'mirrordest_tag': 'tag-' + item | basename | regex_replace('^.*@sha256:', '')}}, recursive=true) }}"
9393
loop: "{{ all_images }}"
94-
when: use_internal_registry
95-
96-
- name: Create dict with full image name+sha -> mirror destination (OCP < 4.13)
97-
ansible.builtin.set_fact:
98-
image_urls: "{{ image_urls | default({}) | combine({item:
99-
{'mirrordest': mirror_dest + '@' + item | basename | regex_replace('^.*@', ''),
100-
'mirrordest_nosha': mirror_dest,
101-
'mirrordest_tag': 'tag-' + item | basename | regex_replace('^.*@sha256:', '')}}, recursive=true) }}"
102-
loop: "{{ all_images }}"
103-
when: not use_internal_registry
10494

10595
- name: Create dict with full image name+sha -> image key without sha
10696
ansible.builtin.set_fact:
@@ -124,14 +114,6 @@
124114
src: ./templates/imageDigestMirror.yaml.j2
125115
dest: "{{ iib_local_folder }}/imageMirror.yaml"
126116
mode: "0644"
127-
when: use_internal_registry
128-
129-
- name: Template out imageMirror.yaml (OCP < 4.13)
130-
ansible.builtin.template:
131-
src: ./templates/imageContentSourcePolicy.yaml.j2
132-
dest: "{{ iib_local_folder }}/imageMirror.yaml"
133-
mode: "0644"
134-
when: not use_internal_registry
135117

136118
- name: Template out mirror.map
137119
ansible.builtin.template:

ansible/roles/iib_ci/tasks/setup-external-registry.yml

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

0 commit comments

Comments
 (0)