Skip to content

[release-4.17] OCPBUGS-57293: sort zone slices extracted from map of byo subnets #9778

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 2 commits into
base: release-4.17
Choose a base branch
from
Open

[release-4.17] OCPBUGS-57293: sort zone slices extracted from map of byo subnets #9778

wants to merge 2 commits into from

Conversation

tthvo
Copy link
Member

@tthvo tthvo commented Jun 10, 2025

Manual cherry-pick of #9774

Notes: I need to bump gci version to make golint and gofmt happy.

tthvo added 2 commits June 10, 2025 12:46
@tthvo
OCPBUGS-57293: sort zone slices extracted from map of byo subnets
762b4ac 
Previously, since zones are extracted from map keys, order is not guaranteed.
This can lead to an issue where master CAPI machine manifest is configured
with a different subnet ID than MAPI machine manifest as they are
handled separately.

This commit ensures the zones are sorted by lexical order before
processing CAPI/MAP machine manifests so that zones are distributed in
the same order.
@tthvo
vendor: bump github.com/daixiang0/gci to 0.12.2
7985382 
This version of gci supports go 1.22 standard libs.
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jun 10, 2025
@openshift-ci-robot
Copy link
Contributor

@tthvo: This pull request references Jira Issue OCPBUGS-57293, which is invalid:

  • expected dependent Jira Issue OCPBUGS-57220 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Manual cherry-pick of #9774

Notes: I need to bump gci version to make golint and gofmt happy.

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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 10, 2025
@openshift-ci openshift-ci bot requested review from barbacbd and rna-afk June 10, 2025 21:10
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 10, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign sadasu for approval. For more information see the Code Review Process.

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

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

@tthvo
Copy link
Member Author

tthvo commented Jun 10, 2025

/cc @patrickdillon

@openshift-ci openshift-ci bot requested a review from patrickdillon June 10, 2025 21:25
@tthvo
Copy link
Member Author

tthvo commented Jun 11, 2025

Unit test failure is expected and will be addressed in #9777. The other "aro-unit" failed due to an outage from nip.io this morning, I think.

/test aro-unit

@tthvo
Copy link
Member Author

tthvo commented Jun 11, 2025

/test unit

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 11, 2025

@tthvo: all tests passed!

Full PR test history. Your PR dashboard.

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.

@tthvo
Copy link
Member Author

tthvo commented Jun 16, 2025

/jira refresh

@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 Jun 16, 2025
@openshift-ci-robot
Copy link
Contributor

@tthvo: This pull request references Jira Issue OCPBUGS-57293, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.z) matches configured target version for branch (4.17.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-57220 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-57220 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

/jira refresh

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 removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 16, 2025
@tthvo
Copy link
Member Author

tthvo commented Jun 16, 2025

/cc @yunjiang29 @gpei

@openshift-ci openshift-ci bot requested review from gpei and yunjiang29 June 16, 2025 17:53
@gpei
Copy link
Contributor

gpei commented Jun 17, 2025

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 17, 2025
barbacbd
barbacbd reviewed Jun 20, 2025
View reviewed changes
Copy link
Contributor

@barbacbd barbacbd 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 Jun 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barbacbd barbacbd barbacbd left review comments

@rna-afk rna-afk Awaiting requested review from rna-afk

@patrickdillon patrickdillon Awaiting requested review from patrickdillon

@gpei gpei Awaiting requested review from gpei

@yunjiang29 yunjiang29 Awaiting requested review from yunjiang29

Assignees

@barbacbd barbacbd

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tthvo @openshift-ci-robot @gpei @barbacbd