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

Bug 2022627: Fix nodelink and CSR approval when a machine has multiple addresses #210

Merged
merged 3 commits into from
Dec 6, 2021

Conversation

mdbooth
Copy link

@mdbooth mdbooth commented Dec 2, 2021

What this PR does / why we need it:
This PR does 2 things:

Release note:

* Fixes an error where workers may be deleted or enter a failed state when making changes to a machine object. Changing a machine object is not supported. With this fix, changes to the machine object will be safely ignored.
* Fixes an error where kubelet-serving CSRs were not approved if the machine had additional ports or IP addresses.

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. labels Dec 2, 2021
@openshift-ci
Copy link

openshift-ci bot commented Dec 2, 2021

@mdbooth: This pull request references Bugzilla bug 2022627, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

Requesting review from QA contact:
/cc @eurijon

In response to this:

Bug 2022627: Fix nodelink and CSR approval when a machine has multiple addresses

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

openshift-ci bot commented Dec 2, 2021

@openshift-ci[bot]: GitHub didn't allow me to request PR reviews from the following users: eurijon.

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

In response to this:

@mdbooth: This pull request references Bugzilla bug 2022627, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

Requesting review from QA contact:
/cc @eurijon

In response to this:

Bug 2022627: Fix nodelink and CSR approval when a machine has multiple addresses

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.

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.

actuator.Update() could in certain circumstances cause a server to be
recreated. This is always an error and can only result in data loss.

This change removes all functionality from CAPO which relates to
recreating OpenStack resources. Instead, when we get an Update we simply
synchronise the Machine object with the current state of the OpenStack
resource.

Additionally, we are no longer setting the instance-status annotation on
the machine object, as this is no longer relevant. Instead we detect a
deleted OpenStack resource by setting the providerID on the machine.
This also has the advantage of making nodelink matching more robust.
It was dead code.

Move the OpenstackIdAnnotationKey constant to machine, which is the only
place it is used.

Remove the OpenstackIPAnnotationKey and no longer set the corresponding
annotation, because it is no longer used.
We were previously only reporting a single 'primary' address. This would
cause CSRs for the machine not to be approved if additional ports were
added.

This removes the last use of code for determining the 'primary' IP, so
we also remove all the dead code.

Fixes: rhbz#2022627
@mdbooth
Copy link
Author

mdbooth commented Dec 2, 2021

@mdbooth
Copy link
Author

mdbooth commented Dec 2, 2021

/test e2e-openstack

1 similar comment
@mdbooth
Copy link
Author

mdbooth commented Dec 2, 2021

/test e2e-openstack

@mdbooth
Copy link
Author

mdbooth commented Dec 3, 2021

/test e2e-openstack
/test e2e-openstack-proxy

@mdbooth
Copy link
Author

mdbooth commented Dec 3, 2021

/hold cancel

@openshift-ci
Copy link

openshift-ci bot commented Dec 3, 2021

@mdbooth: This pull request references Bugzilla bug 2022627, which is valid.

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

Requesting review from QA contact:
/cc @eurijon

In response to this:

Bug 2022627: Fix nodelink and CSR approval when a machine has multiple addresses

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 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 3, 2021
@openshift-ci
Copy link

openshift-ci bot commented Dec 3, 2021

@openshift-ci[bot]: GitHub didn't allow me to request PR reviews from the following users: eurijon.

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

In response to this:

@mdbooth: This pull request references Bugzilla bug 2022627, which is valid.

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

Requesting review from QA contact:
/cc @eurijon

In response to this:

Bug 2022627: Fix nodelink and CSR approval when a machine has multiple addresses

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.

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

openshift-ci bot commented Dec 3, 2021

@mdbooth: 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/e2e-openstack-proxy 67b4aa8 link false /test e2e-openstack-proxy

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.

@EmilienM
Copy link
Member

EmilienM commented Dec 6, 2021

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2021
@openshift-ci
Copy link

openshift-ci bot commented Dec 6, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM

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 6, 2021
@EmilienM
Copy link
Member

EmilienM commented Dec 6, 2021

The proxy job isn't happy for a few tests that failed, but this is a well known issue and should be fixed soon via openshift/release#24212

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit e33e318 into openshift:master Dec 6, 2021
@openshift-ci
Copy link

openshift-ci bot commented Dec 6, 2021

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

Bugzilla bug 2022627 has been moved to the MODIFIED state.

In response to this:

Bug 2022627: Fix nodelink and CSR approval when a machine has multiple addresses

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.

@pierreprinetti pierreprinetti deleted the actuator-update branch December 7, 2021 12:54
pierreprinetti pushed a commit to shiftstack/cluster-api-provider-openstack that referenced this pull request Apr 22, 2024
using --vm-dirver lead to error and
--bootstrap-flags vm-driver=kvm2 works
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. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants