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

Jump to bottom

OCPBUGS-4566: Append annotations from machine template spec to the node #1096

Merged
merged 2 commits into from Jan 5, 2023
Merged

OCPBUGS-4566: Append annotations from machine template spec to the node #1096

merged 2 commits into from Jan 5, 2023

Conversation

RadekManak
Copy link
Contributor

@RadekManak RadekManak commented Dec 9, 2022 •
edited

Annotations from Machine spec.metadata field were to being added to node metadata field.

While fixing this, I noticed that the FAQ mentions that Labels, Annotations and Taints are added to the node only when it is created. This is not the case. They get reapplied from the machine to its node every time the machine or its node is reconciled.

@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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 9, 2022
@openshift-ci-robot
Copy link
Contributor

@RadekManak: This pull request references Jira Issue OCPBUGS-4566, which is invalid:

  • expected the bug to target the "4.13.0" version, but no target version was set

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:

Annotations and labels on machine in spec.metadata should be applied to the node after it is created and linked to the machine. This works for labels, but appears that it was missed for annotations. This PR fixes that.

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.

@RadekManak
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 9, 2022
@openshift-ci-robot
Copy link
Contributor

@RadekManak: This pull request references Jira Issue OCPBUGS-4566, 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.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

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

@RadekManak
Copy link
Contributor Author

/hold Will require change in the FAQ

@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 Dec 9, 2022
@JoelSpeed
Copy link
Contributor

/approve

Let's get the FAQs updated and then I think this is ok to go

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 12, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 12, 2022
@openshift-ci-robot
Copy link
Contributor

@RadekManak: An error was encountered querying GitHub for users with public email (zhsun@redhat.com) for bug OCPBUGS-4566 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message. Post "http://ghproxy/graphql": dial tcp 172.30.229.2:80: i/o timeout

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

In response to this:

Annotations from Machine spec.metadata field were to being added to node metadata field.

While fixing this, I noticed that the FAQ mentions that Labels, Annotations and Taints are added to the node only when it is created. This is not the case. They get reapplied from the machine to its node every time the machine or its node is reconciled.

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.

@RadekManak
Copy link
Contributor Author

/unhold

Updated the FAQ to reflect current behavior of nodelink controller when applying Labels, Annotations and Taints.

@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 Jan 2, 2023
JoelSpeed
JoelSpeed reviewed Jan 3, 2023
View reviewed changes
Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

Couple of nits/suggestions but otherwise LGTM thanks

FAQ.md Outdated Show resolved Hide resolved
FAQ.md Outdated Show resolved Hide resolved
@RadekManak
Update FAQ to describe annotation and label logic
f48ab85 
The FAQ says that Annotations, Labels and Taits are only added to the
node when it is created. This is not the case. They are appended to the
node if missing whenever the machine or its node is reconciled.
@RadekManak
Copy link
Contributor Author

Updated with Joel's suggestions.

@JoelSpeed
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 5, 2023
@openshift-merge-robot openshift-merge-robot merged commit f8658d7 into openshift:master Jan 5, 2023
@openshift-ci-robot
Copy link
Contributor

@RadekManak: All pull requests linked via external trackers have merged:

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

In response to this:

Annotations from Machine spec.metadata field were to being added to node metadata field.

While fixing this, I noticed that the FAQ mentions that Labels, Annotations and Taints are added to the node only when it is created. This is not the case. They get reapplied from the machine to its node every time the machine or its node is reconciled.

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

openshift-ci bot commented Jan 5, 2023

@RadekManak: The following tests 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/e2e-libvirt f48ab85 link false /test e2e-libvirt
ci/prow/e2e-nutanix f48ab85 link false /test e2e-nutanix

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.

@RadekManak
Copy link
Contributor Author

/cherry-pick release-4.12

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 5, 2023
Merged
@openshift-cherrypick-robot
Copy link

@RadekManak: new pull request created: #1104

In response to this:

/cherry-pick release-4.12

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoelSpeed JoelSpeed JoelSpeed left review comments

@elmiko elmiko Awaiting requested review from elmiko

@sunzhaohua2 sunzhaohua2 Awaiting requested review from sunzhaohua2

Assignees

@JoelSpeed JoelSpeed

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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. 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
5 participants
@RadekManak @openshift-ci-robot @JoelSpeed @openshift-cherrypick-robot @openshift-merge-robot