set umask on linux and darwin when testing kubeadm copycerts #104284
Conversation
k8s-ci-robot
added
release-note-none
k8s-ci-robot
added
area/kubeadm
sig/cluster-lifecycle
|
/sig cluster-lifecycle |
BenTheElder
changed the title
k8s-ci-robot
added
the
do-not-merge/work-in-progress
BenTheElder
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
|
Tested on Linux and macOS locally. |
| @@ -0,0 +1,27 @@ | |||
| //+build darwin linux | |||
There was a problem hiding this comment.
+++ b/cmd/kubeadm/app/phases/copycerts/testutil_umask.go
@@ -1,4 +1,4 @@
-//+build darwin linux
+// +build darwin linux
+++ b/cmd/kubeadm/app/phases/copycerts/testutil_umask_noop.go
@@ -1,4 +1,4 @@
-//+build !darwin,!linux
+// +build !darwin,!linux
to pass hack/verify-boilerplate.sh
There was a problem hiding this comment.
I will appease the robots! 🙃
| @@ -0,0 +1,27 @@ | |||
| // +build darwin linux | |||
There was a problem hiding this comment.
there's no // +build unix (I hallucinated it I swear) and we don't currently actively support platforms other than these + windows, with these two being the only known platforms we support that do.
I didn't find many comparable examples in the existing codebase, mostly code that targets linux or windows specifically (for e.g. kubelet).
There was a problem hiding this comment.
I think we usually just do !windows in such a case, which is not enrirely accurate.
|
|
||
| package copycerts | ||
|
|
||
| func setNoUmask() { |
There was a problem hiding this comment.
Like i've mentioned on the issue these file mask unit tests are broken on windows, since the OS simply does not have mode bits for files. Some of the go stdlib logic is no-op on windows. I think we cross compile the kubeadm binary for windows, but we never run unit tests on windows.
If we do, this change is accurate and probably more tests would fail in cmd/kubeadm.
Thanks
/approve
/triage accepted
/priority backlog
@pacoxu please apply LGTM given you were already reviewing.
There was a problem hiding this comment.
Yeah, I think maybe some limited windows unit test running occurs, but not in CI or the release and I would be surprised if it didn't have many issues similar to #102607 already ...
k8s-ci-robot
added
triage/accepted
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BenTheElder, 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
the
approved
|
/lgtm |
k8s-ci-robot
added
the
lgtm
What type of PR is this?
/kind failing-test
What this PR does / why we need it:
Makes the kubeadm copycerts unit tests independent of the system umask.
Which issue(s) this PR fixes:
Fixes #104265
Special notes for your reviewer:
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: