Skip to content

Commit bd38ca8

Browse files
committed
[openshift_setup] Replace ICSP with IDMS/ITMS for modern mirror configuration
- Migrate from deprecated ImageContentSourcePolicy to ImageDigestMirrorSet - Add ImageTagMirrorSet for tag-based image pulls - Support both digest and tag-based image resolution - Enable NeverContactSource in the corresponding downstream patch that contains rbac-proxy registry - Improve granular control over mirror selection order Signed-off-by: David Sariel <dsariel@redhat.com> [1] https://docs.redhat.com/en/documentation/openshift_container_platform/4.14/html/config_apis/imagetagmirrorset-config-openshift-io-v1 [2] https://docs.redhat.com/en/documentation/openshift_container_platform/4.14/html/config_apis/imagedigestmirrorset-config-openshift-io-v1 ANVIL-58
1 parent cb17c52 commit bd38ca8

1 file changed

Lines changed: 23 additions & 4 deletions

File tree

roles/openshift_setup/tasks/configure_registries.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
- "{{ cifmw_update_containers_registry }}"
3838
allowedRegistries: "{{ all_registries }}"
3939

40-
- name: Create a ICSP with repository digest mirrors
40+
- name: Create ImageDigestMirrorSet repository digest mirrors
4141
when:
4242
- cifmw_openshift_setup_digest_mirrors is defined
4343
- cifmw_openshift_setup_digest_mirrors | length > 0
@@ -46,9 +46,28 @@
4646
api_key: "{{ cifmw_openshift_token | default(omit)}}"
4747
context: "{{ cifmw_openshift_context | default(omit)}}"
4848
definition:
49-
apiVersion: operator.openshift.io/v1alpha1
50-
kind: ImageContentSourcePolicy
49+
apiVersion: config.openshift.io/v1
50+
kind: ImageDigestMirrorSet
5151
metadata:
5252
name: registry-digest-mirrors
5353
spec:
54-
repositoryDigestMirrors: "{{ cifmw_openshift_setup_digest_mirrors }}"
54+
imageDigestMirrors: "{{ cifmw_openshift_setup_digest_mirrors }}"
55+
56+
# If both ImageDigestMirrorSet and ImageTagMirrorSet are applied to the registries,
57+
# ITMS acts as a fallback for tag-based pulls, while IDMS provides the primary
58+
# secure source for digests
59+
- name: Create ImageTagMirrorSet for tag-based pulls
60+
when:
61+
- cifmw_openshift_setup_tag_mirrors is defined
62+
- cifmw_openshift_setup_tag_mirrors | length > 0
63+
kubernetes.core.k8s:
64+
kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
65+
api_key: "{{ cifmw_openshift_token | default(omit)}}"
66+
context: "{{ cifmw_openshift_context | default(omit)}}"
67+
definition:
68+
apiVersion: config.openshift.io/v1
69+
kind: ImageTagMirrorSet
70+
metadata:
71+
name: registry-tag-mirrors
72+
spec:
73+
imageTagMirrors: "{{ cifmw_openshift_setup_digest_mirrors }}"

0 commit comments

Comments
 (0)