test/e2e_kubeadm: fix matching UnversionedKubeletConfigMap defaults #108127
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
k8s-ci-robot
added
release-note-none
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: neolit123 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 |
k8s-ci-robot
added
approved
|
/triage accepted |
k8s-ci-robot
added
triage/accepted
|
/hold need to revist as something is not right |
k8s-ci-robot
added
the
do-not-merge/hold
The kubeadm defaults in features.go differ between versions. e2e_kubeadm tests cannot import the kubeadm features.go, or easily detect the versioned of the kubeadm binary used to create the cluster. Check for the existence of both versioned and unversioned objects independent of the value of the FG. Once the FG goes GA only the unversioned objects should be checked. Without this change kubeadm e2e skew tests will fail where kubeadm is at 1.24 (has the FG defaulted to true), the FG is not explicitly set by the user and the k8s version is at 1.23.
neolit123
force-pushed
the
1.24-fix-e2e-kubeadm-unversioned-kubelet-cm-defaults
branch
from
e4f932b
to
2fba7c8
Compare
k8s-ci-robot
added
size/M
neolit123
commented
Feb 15, 2022
Comment on lines
-40
to
-45
| kubeletConfigConfigMapResource = &authv1.ResourceAttributes{ | ||
| Namespace: kubeSystemNamespace, | ||
| Name: "", | ||
| Resource: "configmaps", | ||
| Verb: "get", | ||
| } |
There was a problem hiding this comment.
this object was unused
pacoxu
reviewed
Feb 16, 2022
| if err != nil { | ||
| cm, err = f.ClientSet.CoreV1(). | ||
| ConfigMaps(kubeSystemNamespace). | ||
| Get(context.TODO(), kubeletConfigConfigMapNameVersioned, metav1.GetOptions{}) |
There was a problem hiding this comment.
just remove lines like this after the feature gate is removed.
/lgtm
hadn't thought about the kubeadm n-1 kubelet skew when reviewing last PR.
/unhold
k8s-ci-robot
removed
the
do-not-merge/hold
k8s-ci-robot
added
the
lgtm
|
/retest |
1 similar comment
|
/retest |
k8s-ci-robot
added a commit
that referenced
this pull request
Feb 24, 2022
…08127-origin-release-1.23 Automated cherry pick of #108127: test/e2e_kubeadm: fix matching UnversionedKubeletConfigMap
12 tasks
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.
/kind failing-test
What this PR does / why we need it:
The kubeadm defaults in features.go differ between versions.
e2e_kubeadm tests cannot import the kubeadm features.go,
or easily detect the versioned of the kubeadm binary used
to create the cluster.
Check for the existence of both versioned and unversioned
objects independent of the value of the FG. Once the FG
goes GA only the unversioned objects should be checked.
Without this change kubeadm e2e skew tests will fail where kubeadm
is at 1.24 (has the FG defaulted to true), the FG is not
explicitly set by the user and the k8s version is at 1.23.
Which issue(s) this PR fixes:
xref kubernetes/kubeadm#1582 (comment)
https://k8s-testgrid.appspot.com/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-latest-on-1-23
Special notes for your reviewer:
need to backport this to 1.23. technically we only need to fix the 1.23 branch, but having this in master first is accurate.
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: