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.

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

[release-4.15] OCPBUGS-27428: Don't skip a NMStateConfig over-ride #1798

Merged
merged 1 commit into from Jan 22, 2024
Merged

[release-4.15] OCPBUGS-27428: Don't skip a NMStateConfig over-ride #1798

merged 1 commit into from Jan 22, 2024

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1773

/assign daosman

@daosman
ztp: OCPBUGS-27031: Don't skip a NMStateConfig over-ride
b4976bb 
If the user ommits the NodeNetwork details from the siteConfig but
includes it in an crTemplate over-ride of NMStateConfig, we end up not
generating the NMStateConfig because we think the network is empty.
Check if the user did not include an over-ride before skiping the
NMStateConfig generation.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 19, 2024
Merged
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: Jira Issue OCPBUGS-27031 has been cloned as Jira Issue OCPBUGS-27428. Will retitle bug to link to clone.
/retitle [release-4.15] OCPBUGS-27428: Don't skip a NMStateConfig over-ride

In response to this:

This is an automated cherry-pick of #1773

/assign daosman

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 openshift-ci bot changed the title [release-4.15] OCPBUGS-27031: Don't skip a NMStateConfig over-ride [release-4.15] OCPBUGS-27428: Don't skip a NMStateConfig over-ride Jan 19, 2024
@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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 19, 2024
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-27428, 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-27031 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-27031 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @yliu127

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 #1773

/assign daosman

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 OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 19, 2024

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: yliu127.

Note that only openshift-kni members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-27428, 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-27031 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-27031 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @yliu127

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 #1773

/assign daosman

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.

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.

@daosman
Copy link
Contributor

daosman commented Jan 19, 2024

/assign @imiller0

imiller0
imiller0 approved these changes Jan 22, 2024
View reviewed changes
Copy link
Contributor

@imiller0 imiller0 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 Jan 22, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: imiller0, 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 Jan 22, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 6bc8dcf into openshift-kni:release-4.15 Jan 22, 2024
4 checks passed
@openshift-ci-robot
Copy link
Collaborator

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

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

In response to this:

This is an automated cherry-pick of #1773

/assign daosman

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.

@daosman
Copy link
Contributor

daosman commented Jan 22, 2024

/cherrypick release-4.14

@openshift-cherrypick-robot
Copy link
Author

@daosman: new pull request created: #1801

In response to this:

/cherrypick release-4.14

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@imiller0 imiller0 imiller0 approved these changes

@ijolliffe ijolliffe Awaiting requested review from ijolliffe

@jlojosnegros jlojosnegros Awaiting requested review from jlojosnegros

Assignees

@imiller0 imiller0

@daosman daosman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.

None yet
4 participants
@openshift-cherrypick-robot @openshift-ci-robot @daosman @imiller0