Skip to content

MGMT-21854: fix registries.conf generation for multiple yaml mirror files#543

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
andfasano:fix-registriesconfg-parsing
Sep 29, 2025
Merged

MGMT-21854: fix registries.conf generation for multiple yaml mirror files#543
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
andfasano:fix-registriesconfg-parsing

Conversation

@andfasano
Copy link
Contributor

Currently the Prow CI OVE ISO jobs are permafailing due the incorrect parsing of the oc-mirror generated files. This patch fixes the issue by enabling the parsing of multi-doc yaml files for the RegistriesConf asset.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 25, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 25, 2025

@andfasano: This pull request references MGMT-21854 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Currently the Prow CI OVE ISO jobs are permafailing due the incorrect parsing of the oc-mirror generated files. This patch fixes the issue by enabling the parsing of multi-doc yaml files for the RegistriesConf asset.

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 openshift-eng/jira-lifecycle-plugin repository.

@andfasano
Copy link
Contributor Author

/assign @danielerez

@zaneb
Copy link
Member

zaneb commented Sep 25, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2025
for _, digestMirrors := range idms.Spec.ImageDigestMirrors {
if len(digestMirrors.Mirrors) == 0 {
continue
dec := yaml.NewDecoder(bytes.NewReader(idmsFile))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency/readability, maybe we could use the generic GetMultipleYamls func instead?
See for example usage in:

yamlList, err := agentManifests.GetMultipleYamls[unstructured](file.Data)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea @danielerez , didn't spot that GetMultipleYamls was available. Done

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2025
@danielerez
Copy link
Contributor

/approve

@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andfasano, danielerez

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2025
@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2025

@andfasano: 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-sigs/prow repository. I understand the commands that are listed here.

@danielerez
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 296a219 into openshift:master Sep 29, 2025
8 checks passed
andfasano added a commit to andfasano/appliance that referenced this pull request Sep 29, 2025
…iles (openshift#543)

* fix registries.conf generation for multiple yaml mirror files

* use GetMultipleYamls for manifests parsing
openshift-merge-bot bot pushed a commit that referenced this pull request Sep 29, 2025
…iles (#543) (#544)

* fix registries.conf generation for multiple yaml mirror files

* use GetMultipleYamls for manifests parsing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants