Fix identification of control-plane Node in e2e test framework #3728
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We use the `node-role.kubernetes.io/<ROLE>` label to identify the control-plane Node. The `<ROLE>` we use needs to depend on the K8s version because: - before K8s v1.20, the label is `node-role.kubernetes.io/master` - starting with K8s v1.24, the label is `node-role.kubernetes.io/control-plane`. - in between, both labels are used by K8s However, the function used to determine the correct label to use based on the K8s version was called *before* the K8s server version was actually determined, so it was always returning `node-role.kubernetes.io/master`. This was causing tests to fail for K8s v1.24 (which has just been released), since the label no longer exists in that version. Signed-off-by: Antonin Bas <abas@vmware.com>
Codecov Report
@@ Coverage Diff @@
## main #3728 +/- ##
==========================================
- Coverage 64.44% 56.63% -7.81%
==========================================
Files 278 392 +114
Lines 39513 55091 +15578
==========================================
+ Hits 25463 31201 +5738
- Misses 12068 21459 +9391
- Partials 1982 2431 +449
Flags with carried forward coverage won't be shown. Click here to find out more.
|
jianjuns
approved these changes
May 5, 2022
tnqn
approved these changes
May 5, 2022
|
/test-e2e |
XinShuYang
approved these changes
May 5, 2022
|
/test-e2e |
|
/test-ipv6-e2e |
antoninbas
deleted the
fix-identification-of-control-plane-node-in-e2e-framework
branch
|
@antoninbas do you think this PR and #3731 should be backported to make antrea 1.5 and 1.6 work with K8s 1.24 better? |
|
Yes we can backport. I'll open the PRs for this one. #3731 is more important since it affects controller scheduling. |
antoninbas
added
the
kind/cherry-pick
This was referenced May 6, 2022
antoninbas
added
action/backport
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We use the
node-role.kubernetes.io/<ROLE>label to identify thecontrol-plane Node. The
<ROLE>we use needs to depend on the K8sversion because:
node-role.kubernetes.io/masternode-role.kubernetes.io/control-plane.However, the function used to determine the correct label to use based
on the K8s version was called before the K8s server version was
actually determined, so it was always returning
node-role.kubernetes.io/master. This was causing tests to fail for K8sv1.24 (which has just been released), since the label no longer exists
in that version.
Signed-off-by: Antonin Bas abas@vmware.com