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

[release-4.15] OCPBUGS-25596: Make MC names deterministic #888

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #875

/assign jmencak

OpenShift Nodes can be a part of only one custom MachineConfigPool.
However, MCP configuration allows this not to be the case.  This is
caught by the machine-config-controller and reported as an error (<node>
belongs to <N> custom roles, cannot proceed with this Node).

In order to target an MCP with a configuration, NTO uses
machineConfigLabels.  However, one or more MCPs can select a particular
single MC.  This is due to the MCP's machineConfigSelector.  This is
another challenge scenario.

In the above two scenarios, it was possible for NTO to generate a
randomly-named MC based on the membership of one of the matching MCPs.
Then, a pruning function would mistakenly remove the other MCs,
seemingly unused.  This could result in a flip between the rendered MCs
and cause a Node reboot.

This PR makes the process of establishing the names of the MC for the
purposes of MachineConfigPool based matching deterministic.

Other changes/fixes:
 - Synced with MCO's latest getPoolsForNode() changes.
 - Logging in syncMachineConfigHyperShift().

Resolves: OCPBUGS-24792
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-24792 has been cloned as Jira Issue OCPBUGS-25596. Will retitle bug to link to clone.
/retitle [release-4.15] OCPBUGS-25596: Make MC names deterministic

In response to this:

This is an automated cherry-pick of #875

/assign jmencak

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/test-infra repository.

@openshift-ci openshift-ci bot changed the title [release-4.15] OCPBUGS-24792: Make MC names deterministic [release-4.15] OCPBUGS-25596: Make MC names deterministic Dec 18, 2023
@jmencak
Copy link
Contributor

jmencak commented Dec 18, 2023

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Dec 18, 2023
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-24792 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-24792 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

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

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

In response to this:

This is an automated cherry-pick of #875

/assign jmencak

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/test-infra repository.

@openshift-ci openshift-ci bot requested review from MarSik and Tal-or December 18, 2023 08:28
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2023
Copy link
Contributor

openshift-ci bot commented Dec 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmencak, openshift-cherrypick-robot

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 18, 2023
@jmencak
Copy link
Contributor

jmencak commented Dec 19, 2023

/retest

@jmencak
Copy link
Contributor

jmencak commented Dec 19, 2023

/label backport-risk-assessed
@liqcui , can we plese have cherry-pick-approved label? Thank you!

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 19, 2023
@liqcui
Copy link

liqcui commented Dec 19, 2023

/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 Dec 19, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 81fb8b2 and 2 for PR HEAD 88c045f in total

Copy link
Contributor

openshift-ci bot commented Dec 19, 2023

@openshift-cherrypick-robot: 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 590ba65 into openshift:release-4.15 Dec 19, 2023
14 checks passed
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-25596: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #875

/assign jmencak

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/test-infra repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-node-tuning-operator-container-v4.15.0-202312191811.p0.g590ba65.assembly.stream for distgit cluster-node-tuning-operator.
All builds following this will include this PR.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate 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
Development

Successfully merging this pull request may close these issues.

None yet

5 participants