Skip to content

Conversation

@zaneb
Copy link
Member

@zaneb zaneb commented Dec 1, 2021

We need to specify a registries.conf file to set up the mirror, since the pull secret is for the mirror registry but the IPA image path points to the release image.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 1, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zaneb

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 requested review from andfasano and honza December 1, 2021 20:32
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 1, 2021
@zaneb
Copy link
Member Author

zaneb commented Dec 1, 2021

/retest-required


func (env *EnvInputs) RegistriesConf() (data []byte, err error) {
if env.RegistriesConfPath == "" {
return
Copy link
Contributor

Choose a reason for hiding this comment

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

not a fan of these naked returns..

Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to set an error here indicating that REGISTRIES_CONF_PATH is not set? It currently fails silently.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think we have to make it required (it doesn't fail, it just doesn't add a registry file to the ignition).

Copy link
Contributor

@asalkeld asalkeld left a comment

Choose a reason for hiding this comment

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

looks good, just a bit sad there is no tests :-(

@zaneb zaneb changed the title Support embedding a custom registries.conf file in static server Support embedding a custom registries.conf file Dec 6, 2021
@zaneb
Copy link
Member Author

zaneb commented Dec 6, 2021

/retest-required

@dtantsur
Copy link
Member

dtantsur commented Dec 7, 2021

Would it be possible to add tests per Angus' request?

zaneb added 2 commits December 7, 2021 17:05
On the installer bootstrap server, we need to specify a registries.conf
file to set up the mirror, since the pull secret is for the mirror
registry but the IPA image path points to the release image.
Previously this was limited to just the static server.
@zaneb
Copy link
Member Author

zaneb commented Dec 7, 2021

Now with tests.

@zaneb
Copy link
Member Author

zaneb commented Dec 8, 2021

/retest-required

@dtantsur
Copy link
Member

dtantsur commented Dec 9, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2021
@openshift-merge-robot openshift-merge-robot merged commit faf44b3 into openshift:main Dec 9, 2021
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants