OpenShiftP-633: Convert oc adm release mirror usage to oc-mirror v2 by mpkredhat · Pull Request #336 · redhat-cop/ocp4-helpernode

mpkredhat · 2026-04-13T11:45:49Z

This PR is for replacing "oc adm release mirror" command with "oc-mirror --v2" in disconnected installations.
This step is part of disconnected changes to get inline with current mirroring best practices.
Corresponding Redhat issue : https://issues.redhat.com/browse/OCPBUGS-70297

prb112 · 2026-04-14T19:35:55Z

+  - name: Downloading oc-mirror package
+    get_url:
+      url: "{{ oc_mirror_source }}"
+      dest: /usr/local/bin/oc-mirror.tar.gz


Suggested change

dest: /usr/local/bin/oc-mirror.tar.gz

dest: /usr/local/src/oc-mirror.tar.gz

prb112 · 2026-04-14T19:36:05Z

+
+  - name: Unarchiving oc-mirror package
+    unarchive:
+      src: /usr/local/bin/oc-mirror.tar.gz


Suggested change

src: /usr/local/bin/oc-mirror.tar.gz

src: /usr/local/src/oc-mirror.tar.gz

prb112 · 2026-04-14T19:38:13Z

+ocp_channel_name: stable-4.20
+ocp_min_version: 4.20.2
+ocp_max_version: 4.20.2


Formatting looks wrong, the L32 in original is offset 2 chars, you lost the integrity of setup_registry

prb112 · 2026-04-14T19:42:58Z

+mirror:
+  platform:
+    architectures:
+      - "{{ ansible_architecture }}"


I think this needs to come from openshift-install version if it contains multi, then set, else use ansible_architecture

prb112 · 2026-04-14T19:43:38Z

 ocp_install_kernel: "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.9/4.9.0/rhcos-4.9.0-x86_64-live-kernel-x86_64"
 ocp_client: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.9.18/openshift-client-linux-4.9.18.tar.gz"
 ocp_installer: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.9.18/openshift-install-linux-4.9.18.tar.gz"
+oc_mirror_source: "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.20/oc-mirror.tar.gz"


Suggested change

oc_mirror_source: "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.20/oc-mirror.tar.gz"

oc_mirror: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.20/oc-mirror.tar.gz"

match the style

prb112 · 2026-04-14T19:45:21Z

+    when:
+      - setup_registry.autosync_registry
+      - (((ocp_version.stdout.split(' ')[0] | int ) >= 4 and (ocp_version.stdout.split(' ')[1] | int) > 19 ) or ((ocp_version.stdout.split(' ')[0] | int ) >= 5 ))
+


let's add a step that deletes the cache. by default is is disabled. We will only use this in CI.

prb112 · 2026-04-14T19:46:18Z

+  - name: Copy ImageSetConfig file
+    template:
+      src: ../templates/imageset-config.yaml.j2
+      dest: /usr/local/src/imageset-config.yaml


Let's put this configuration in /etc

Let's move this step to setup_registry.yaml

prb112

minor changes...

prb112 · 2026-04-16T16:38:25Z

+    owner: root
+    group: root
+
+- name: Get openshift-install architecture


Suggested change

- name: Get openshift-install architecture

- name: Get openshift-install payload architecture

prb112 · 2026-04-16T16:41:41Z

+    imageset_arch: >-
+      {{
+        ['amd64', 'arm64', 'ppc64le', 's390x']
+        if os_install_arch.stdout == 'multi'
+        else
+        [os_install_arch.stdout]
+        if os_install_arch.rc == 0 and os_install_arch.stdout | length > 0
+        else
+        ['amd64']
+      }}


You are telling it to mirror every payload ['amd64', 'arm64', 'ppc64le', 's390x']
We only care about the arch specified or multi not the branching.

prb112 · 2026-04-16T16:42:35Z

+- name: Copy ImageSetConfig file    
+  template:
+    src: ../templates/imageset-config.yaml.j2
+    dest: /etc/imageset-config.yaml


Let's prefix with oc-mirror_

Suggested change

dest: /etc/imageset-config.yaml

dest: /etc/oc-mirror_imageset-config.yaml

prb112 · 2026-04-25T18:54:51Z

  - name: Generate Local Registry information
    when: setup_registry.autosync_registry
    copy:
-      content: "{{ registry.stdout }}"
+      content: "{{ registry.stdout_lines }}"
      dest: ../postrun-local-registry-info


I suspect we don't need it. However, we shouldn't mutate the original intent with this code. Right?

It'd change the behavior of the existing installations. I'd recommend excluding it when running oc-mirror.

prb112 · 2026-04-25T18:55:24Z

  - name: Process Local Registry information
    when: setup_registry.autosync_registry
    shell: "sed -i '1,/Success/d' ../postrun-local-registry-info"



It might not be used in many palces.

prb112 · 2026-04-29T19:40:24Z

+oc_mirror_bin: "oc-mirror"
+oc_mirror_cmd: "/usr/local/bin/oc-mirror"
+oc_mirror_wipe_cache: false
+oc_mirror_workspace_dir: /tmp/oc-mirror-work-dir


this is not what we want to use. oc_mirror_workspace_dir: /tmp/oc-mirror-work-dir - we need to use the home folder or /var/oc-mirror.

RHEL uses systemd-tmpfiles to automatically prune files from /tmp. Unlike some distributions that only clear /tmp on reboot, RHEL will delete files while the system is running if they haven't been accessed for a certain amount of time.

prb112 · 2026-05-01T15:13:44Z

+oc_mirror_bin: "oc-mirror"
+oc_mirror_cmd: "/usr/local/bin/oc-mirror"
+oc_mirror_wipe_cache: false
+oc_mirror_workspace_dir: /var/oc-mirror-work-dir


prb112 · 2026-06-27T00:12:00Z

-  ocp_channel_name: "stable-4.20"
-  ocp_min_version: "4.20.2"
-  ocp_max_version: "4.20.2"


We shouldn't mutate the existing values and locations. It should only be changed when / if it is discussed and coordinate. Please revert these moves.

prb112 · 2026-06-27T00:12:27Z

+oc_mirror_parallel_images: 10
+oc_mirror_parallel_layers: 10
+oc_mirror_bin: "oc-mirror"
+oc_mirror_cmd: "/usr/local/bin/oc-mirror"
+oc_mirror_wipe_cache: false
+oc_mirror_workspace_dir: /var/oc-mirror-work-dir


These make sense here

Signed-off-by: Mandar Kulkarni <mandar.kulkarni6@ibm.com>

mpkredhat force-pushed the br-633 branch 2 times, most recently from e47c800 to 6fbc4b7 Compare April 13, 2026 13:17

prb112 reviewed Apr 14, 2026

View reviewed changes

prb112 suggested changes Apr 14, 2026

View reviewed changes

mpkredhat force-pushed the br-633 branch 2 times, most recently from 92792d7 to 357c01a Compare April 16, 2026 12:53

prb112 reviewed Apr 16, 2026

View reviewed changes

mpkredhat force-pushed the br-633 branch 15 times, most recently from ac2b9e3 to e188bd7 Compare April 23, 2026 10:15

mpkredhat force-pushed the br-633 branch 4 times, most recently from f30631b to 8798ac6 Compare April 24, 2026 18:06

prb112 reviewed Apr 25, 2026

View reviewed changes

mpkredhat force-pushed the br-633 branch 4 times, most recently from 782021e to d537536 Compare April 28, 2026 12:54

prb112 reviewed Apr 29, 2026

View reviewed changes

mpkredhat force-pushed the br-633 branch from d537536 to 0ecd5db Compare April 30, 2026 06:51

prb112 reviewed May 1, 2026

View reviewed changes

mpkredhat force-pushed the br-633 branch 3 times, most recently from 8aff9aa to d777576 Compare May 12, 2026 14:01

mpkredhat force-pushed the br-633 branch 8 times, most recently from 4732d61 to 22d83a2 Compare June 24, 2026 08:43

prb112 reviewed Jun 27, 2026

View reviewed changes

OpenShiftP-633: Convert oc adm release mirror usage to oc-mirror v2

d8f2c3f

Signed-off-by: Mandar Kulkarni <mandar.kulkarni6@ibm.com>

mpkredhat force-pushed the br-633 branch from 22d83a2 to d8f2c3f Compare June 29, 2026 08:56

	dest: /usr/local/bin/oc-mirror.tar.gz
	dest: /usr/local/src/oc-mirror.tar.gz

	src: /usr/local/bin/oc-mirror.tar.gz
	src: /usr/local/src/oc-mirror.tar.gz

	oc_mirror_source: "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.20/oc-mirror.tar.gz"
	oc_mirror: "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.20/oc-mirror.tar.gz"

	- name: Get openshift-install architecture
	- name: Get openshift-install payload architecture

	dest: /etc/imageset-config.yaml
	dest: /etc/oc-mirror_imageset-config.yaml

Uh oh!

Conversation

mpkredhat commented Apr 13, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

prb112 Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

prb112 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

prb112 Apr 14, 2026 •

edited

Loading