Bug 1954309: Rebase to upstream 0.47.0 #191
Conversation
If kubernetes-nmstate is deployed at a cluster with not compatible nodes (like NetworkManager not started, bad version or not installed) the kubernetes-nmstate-handler start without issue. This change add a readiness probe that runs "nmstatectl show" to check if nmstatectl is functional at a basic level. Signed-off-by: Quique Llorente <[email protected]>
At the new release-notes command version (it was bumped after some "make vendor") does not need "--release-version" flag and the "--github-org" and "--github-repo" arg have being renamed to "--org" and "--repo". Signed-off-by: Quique Llorente <[email protected]>
* Use github.com/gofrs/flock to lock handler The nmstate-handler has a lock that make it wait if another handler is already running in the system, but the library used for that does not work well with containers. This change replace that library with different one that uses golang syscall.Flock behind the scine [1] and that works fine with containers sharing node volume. [1] github.com/nightlyone/lockfile. Signed-off-by: Quique Llorente <[email protected]> * Replace handler readiness probe The nmstate handler is marked as ready even if it was not able to take ownership of the lock, this change runs nmstatectl and touchs a file after gaining lock ownership so the readiness probe can check both things. Signed-off-by: Quique Llorente <[email protected]> * Test nmstate handler lock mechanism The nmstate handler don't get ready if another handler is running at the same node. This change add an e2e tests to check that this is working. Signed-off-by: Quique Llorente <[email protected]>
The previous order of these calls resulted in the container exiting before the log message was output, which made it impossible to debug what went wrong. This just changes the order so the message is logged and then the process exits. Signed-off-by: Ben Nemec <[email protected]>
Signed-off-by: Quique Llorente <[email protected]>
* Reorder nnpc controller functions The first thing that reader is presumably interested in when opening nodenetworkconfigurationpolicy_controller.go file is the Reconcile loop. In this commit, I'm moving the Reconcile loop to the top of the file, and reordering the helper functions so that the reader can see the details in the same order in which these helper functions are called in Reconcile. Signed-off-by: Radim Hrazdil <[email protected]> * Remove unused method enactmentsCountByPolicy enactmentsCountByPolicy is not used, let's remove it. Signed-off-by: Radim Hrazdil <[email protected]>
The internal Networking team needs to be able to approve and review. Signed-off-by: Brad P. Crochet <[email protected]>
Signed-off-by: Brad P. Crochet <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cybertron 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 |
openshift-ci-robot
added
the
approved
|
Note that although we already did a rebase for 4.8, this one pulls in some critical bug fixes that were discovered after the previous one. |
cybertron
changed the title
openshift-ci-robot
added
bugzilla/severity-medium
|
@cybertron: This pull request references Bugzilla bug 1954309, 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
No GitHub users were found matching the public email listed for the QA contact in Bugzilla ([email protected]), skipping review request. In response to this:
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. |
|
/lgtm |
|
@cybertron: All pull requests linked via external trackers have merged: Bugzilla bug 1954309 has been moved to the MODIFIED state. In response to this:
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. |
kubernetes-nmstate 0.47.0 rebase process
Inspired by the commit description for openshift/coredns#52
Identify carry commits:
git log --oneline --no-merges v0.47.0..openshift/masterNote that the
UPSTREAM: <carry>: openshift:prefix was added to any new commits to carry since the previous rebase. This will make new carry commits easy to identify alongside prior carry commits.After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch.
The following commands cover these steps:
Process
My 0.47.0 merge commit from the above process is (af57ae1).
With the merge-0.47.0 branch in place, I cherry picked the carry commits. Merge conflicts were resolved on an individual commit basis when necessary. Some carry commits may have been squashed to reduce the number of cherry-picks in future rebases. If there are any questions please let me know.
Carried Commits (applied bottom to top / oldest first):