Skip to content

OCPBUGS-44910: openstack: don't reconcile image registry config during bootstrap#5178

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
shiftstack:OCPBUGS-44910
Nov 28, 2024
Merged

OCPBUGS-44910: openstack: don't reconcile image registry config during bootstrap#5178
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
shiftstack:OCPBUGS-44910

Conversation

@EmilienM
Copy link
Copy Markdown
Member

What this PR does / why we need it:

For platforms where cluster-image-registry-operator (CIRO) needs a PVC to be created, bootstrap needs to happen
in CIRO before the registry config is created. For now, this is the case for the OpenStack platform.
If the object exist, we reconcile the registry config for other other fields as it should be fine since the PVC would
exist at this point.

This patch will maintain a list of platforms that require a PVC for CIRO
(OpenStack only for now), check whether an image registry config already
exist and if it does, skip reconcile to let CIRO bootstrap doing it and
creating the needed PVC for CIRO.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 22, 2024
@openshift-ci-robot
Copy link
Copy Markdown

@EmilienM: This pull request references Jira Issue OCPBUGS-44910, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (rlobillo@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

What this PR does / why we need it:

For platforms where cluster-image-registry-operator (CIRO) needs a PVC to be created, bootstrap needs to happen
in CIRO before the registry config is created. For now, this is the case for the OpenStack platform.
If the object exist, we reconcile the registry config for other other fields as it should be fine since the PVC would
exist at this point.

This patch will maintain a list of platforms that require a PVC for CIRO
(OpenStack only for now), check whether an image registry config already
exist and if it does, skip reconcile to let CIRO bootstrap doing it and
creating the needed PVC for CIRO.

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Nov 22, 2024
@openshift-ci openshift-ci Bot requested review from csrwng and sjenning November 22, 2024 18:15
@openshift-ci openshift-ci Bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Nov 22, 2024
@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-openstack-csi-cinder

@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-aws

@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-openstack-csi-cinder

@openshift-ci openshift-ci Bot added the area/documentation Indicates the PR includes changes for documentation label Nov 23, 2024
@netlify
Copy link
Copy Markdown

netlify Bot commented Nov 23, 2024

Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit 6a70de8
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/67412a2245189700087fac7b
😎 Deploy Preview https://deploy-preview-5178--hypershift-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-openstack-csi-cinder

@EmilienM
Copy link
Copy Markdown
Member Author

/cherry-pick release-4.18

@openshift-cherrypick-robot
Copy link
Copy Markdown

@EmilienM: once the present PR merges, I will cherry-pick it on top of release-4.18 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.18

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.

@EmilienM
Copy link
Copy Markdown
Member Author

/test okd-scos-e2e-aws-ovn

@csrwng
Copy link
Copy Markdown
Contributor

csrwng commented Nov 26, 2024

/approve
/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Nov 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, EmilienM

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 Nov 26, 2024
Copy link
Copy Markdown
Contributor

@MaysaMacedo MaysaMacedo left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 26, 2024
@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 2569f33 and 2 for PR HEAD 6a70de8 in total

…g bootstrap

For platforms where cluster-image-registry-operator (CIRO) needs a PVC to be created, bootstrap needs to happen
in CIRO before the registry config is created. For now, this is the case for the OpenStack platform.
If the object exist, we reconcile the registry config for other other fields as it should be fine since the PVC would
exist at this point.

This patch will maintain a list of platforms that require a PVC for CIRO
(OpenStack only for now), check whether an image registry config already
exist and if it does, skip reconcile to let CIRO bootstrap doing it and
creating the needed PVC for CIRO.
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 26, 2024
Copy link
Copy Markdown
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

I'm not clear on the relationship between CIRO and hypershift. If we need in all case for CIRO to write its config once, why don't we make it a needed condition in hypershift (for all platforms)? Why do we need to maintain a list of platforms that might use a PV as the storage for the image registry?

@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-aws

@csrwng
Copy link
Copy Markdown
Contributor

csrwng commented Nov 26, 2024

If we need in all case for CIRO to write its config once, why don't we make it a needed condition in hypershift (for all platforms)?

As Emilien mentioned, the reason is to limit the scope of this change to OpenStack. We may eventually want to do it for other platforms as well. But since that does have a broader impact, we want to be more intentional about it and maybe not just do it for CIRO but for other operators as well.

@EmilienM
Copy link
Copy Markdown
Member Author

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 26, 2024
@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-aws

1 similar comment
@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-aws

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD da24e17 and 2 for PR HEAD 1341901 in total

1 similar comment
@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD da24e17 and 2 for PR HEAD 1341901 in total

@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-aks

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD da24e17 and 2 for PR HEAD 1341901 in total

2 similar comments
@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD da24e17 and 2 for PR HEAD 1341901 in total

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD da24e17 and 2 for PR HEAD 1341901 in total

@EmilienM
Copy link
Copy Markdown
Member Author

/retest-required

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD f2d9716 and 1 for PR HEAD 1341901 in total

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 27, 2024
@MaysaMacedo
Copy link
Copy Markdown
Contributor

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 27, 2024
@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-aws

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Nov 28, 2024

@EmilienM: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 1341901 link false /test okd-scos-e2e-aws-ovn

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.

@EmilienM
Copy link
Copy Markdown
Member Author

/test e2e-aws

@openshift-merge-bot openshift-merge-bot Bot merged commit 8326d86 into openshift:main Nov 28, 2024
@openshift-ci-robot
Copy link
Copy Markdown

@EmilienM: Jira Issue OCPBUGS-44910: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-44910 has been moved to the MODIFIED state.

Details

In response to this:

What this PR does / why we need it:

For platforms where cluster-image-registry-operator (CIRO) needs a PVC to be created, bootstrap needs to happen
in CIRO before the registry config is created. For now, this is the case for the OpenStack platform.
If the object exist, we reconcile the registry config for other other fields as it should be fine since the PVC would
exist at this point.

This patch will maintain a list of platforms that require a PVC for CIRO
(OpenStack only for now), check whether an image registry config already
exist and if it does, skip reconcile to let CIRO bootstrap doing it and
creating the needed PVC for CIRO.

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@EmilienM: new pull request created: #5198

Details

In response to this:

/cherry-pick release-4.18

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.

@openshift-bot
Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

Distgit: hypershift
This PR has been included in build ose-hypershift-container-v4.19.0-202411280839.p0.g8326d86.assembly.stream.el9.
All builds following this will include this PR.

@EmilienM
Copy link
Copy Markdown
Member Author

EmilienM commented Dec 4, 2024

/cherry-pick release-4.17

@openshift-cherrypick-robot
Copy link
Copy Markdown

@EmilienM: #5178 failed to apply on top of branch "release-4.17":

Applying: OCPBUGS-44910: openstack: don't reconcile image registry config during bootstrap
Using index info to reconstruct a base tree...
M	control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
M	docs/content/how-to/openstack/create-openstack-cluster.md
Falling back to patching base and 3-way merge...
Auto-merging docs/content/how-to/openstack/create-openstack-cluster.md
CONFLICT (content): Merge conflict in docs/content/how-to/openstack/create-openstack-cluster.md
Auto-merging control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-44910: openstack: don't reconcile image registry config during bootstrap

Details

In response to this:

/cherry-pick release-4.17

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.

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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.

7 participants