MGMT-12635: Add icsp-file support for all oc commands (#4684)

[bfournie]

#4141 added support for the --icsp-file parameter to the "oc adm release extract" using the contents of imageContentSources in install-config.yaml. The other oc commands didn't use the --icsp-file option as they used the mirror defined in the env variable OPENSHIFT_RELEASE_IMAGE_MIRROR.

Relying on this mirror setting can be problematic if this env variable cannot be set, or if the oc method of deriving the mirror using the --icsp-file is different than the env variable value. This change adds support for the --icsp-file param to the remaining oc commands. The ICSP contents are read from /etc/containers/registries.conf as the install-config.yaml containing the imageContentSources may not be available.

(cherry picked from commit 3ade14b)

List all the issues related to this PR

• New Feature
• Enhancement
• Bug fix
• Tests
• Documentation
• CI/CD

What environments does this code impact?

• Automation (CI, tools, etc)
• Cloud
• Operator Managed Deployments
• None

How was this code tested?

• assisted-test-infra environment
• dev-scripts environment
• Reviewer's test appreciated
• Waiting for CI to do a full test run
• Manual (Elaborate on how it was tested)
• No tests needed

Checklist

• Title and description added to both, commit and PR.
• Relevant issues have been associated (see CONTRIBUTING guide)
• This change does not require a documentation update (docstring, docs, README, etc)
• Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

• Are the title and description (in both PR and commit) meaningful and clear?
• Is there a bug required (and linked) for this change?
• Should this PR be backported?

[openshift-ci]

@bfournie: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

MGMT-12635: Add icsp-file support for all oc commands (#4684)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bfournie]

/cc @eranco74

[openshift-ci]

@bfournie: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[zaneb]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bfournie, filanov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [filanov]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[eranco74]

/cherry-pick release-ocm-2.6

[openshift-cherrypick-robot]

@eranco74: #4700 failed to apply on top of branch "release-ocm-2.6":

Applying: MGMT-12635: Add icsp-file support for all oc commands (#4684)
Using index info to reconstruct a base tree...
M	cmd/agentbasedinstaller/register.go
M	cmd/main.go
M	internal/oc/release.go
M	internal/oc/release_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/oc/release_test.go
Auto-merging internal/oc/release.go
CONFLICT (content): Merge conflict in internal/oc/release.go
Auto-merging cmd/main.go
Auto-merging cmd/agentbasedinstaller/register.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MGMT-12635: Add icsp-file support for all oc commands (#4684)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-ocm-2.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[eranco74]

/cherry-pick release-ocm-2.7

[openshift-cherrypick-robot]

@eranco74: #4700 failed to apply on top of branch "release-ocm-2.7":

Applying: MGMT-12635: Add icsp-file support for all oc commands (#4684)
Using index info to reconstruct a base tree...
M	cmd/agentbasedinstaller/register.go
M	cmd/main.go
M	internal/installercache/installercache.go
M	internal/oc/release.go
M	internal/oc/release_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/oc/release.go
Auto-merging cmd/main.go
CONFLICT (content): Merge conflict in cmd/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MGMT-12635: Add icsp-file support for all oc commands (#4684)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-ocm-2.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.