Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addressing registry conflicts in Makefile #3299

Closed
wants to merge 1 commit into from

Conversation

Shivkumar13
Copy link
Contributor

What this PR does / why we need it:

Fixes the issue with the RP_IMAGE_ACR env, as when $(RP_IMAGE_ACR) is empty, the $ARO_IMAGE_BASE would be .azurecr.io/aro, which will fail any operations that we do with the image.

Encountered this issue while the RP_IMAGE_ACR is not set, and also the else if conditions seems unnecessary as we are defaulting to registry.access.redhat.com in the else block so no need to check RP_IMAGE_ACR explicitly for the empty value.

Test plan for issue:

N/A

Is there any documentation that needs to be updated for this PR?

N/A

Copy link
Contributor

@jhoreman jhoreman left a comment

Choose a reason for hiding this comment

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

Seems straightforward enough. Thanks for this.

@Shivkumar13
Copy link
Contributor Author

/azp run e2e

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Collaborator

@anshulvermapatel anshulvermapatel left a comment

Choose a reason for hiding this comment

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

/lgtm

@anshulvermapatel
Copy link
Collaborator

/azp run e2e

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Collaborator

@SudoBrendan SudoBrendan left a comment

Choose a reason for hiding this comment

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

I worry about this change because it has wider implications to our pipelines, where this variable is set and overridden, e.g. https://github.com/Azure/ARO-RP/blob/master/.pipelines/e2e.yml#L42 (I'm sure this happens in other places too... we'd need to audit all pipelines everywhere, not just in our repo here...)

What is the pain we are trying to mitigate here? I feel like if someone doesn't run make secrets + . ./env other issues will also arise outside this.

@mociarain
Copy link
Collaborator

Closing this since it's stale and has no associated ticket. Push back if this seems worth pursuing

@mociarain mociarain closed this Jul 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants