github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104284 from BenTheElder/umask-fun

Browse Source 
set umask on linux and darwin when testing kubeadm copycerts
This commit is contained in:
Kubernetes Prow Robot 2021-08-11 06:19:10 -07:00 committed by GitHub
commit 53d24cd0b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/copycerts/main_test.go
View File

@ -23,5 +23,7 @@ import (
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
// see: https://github.com/kubernetes/kubernetes/issues/104265
setNoUmask()
pkiutiltesting.RunWithPrivateKeyFixtureDirectory(m) pkiutiltesting.RunWithPrivateKeyFixtureDirectory(m)
} }

27
cmd/kubeadm/app/phases/copycerts/testutil_umask.go Normal file
View File

@ -0,0 +1,27 @@
// +build darwin linux
/*
Copyright 2021 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package copycerts
import "golang.org/x/sys/unix"
// on unix where umask may be in effect, clear umask so tests
// are not sensitive to the developer's system umask
func setNoUmask() {
unix.Umask(0)
}

23
cmd/kubeadm/app/phases/copycerts/testutil_umask_noop.go Normal file
View File

@ -0,0 +1,23 @@
// +build !darwin,!linux
/*
Copyright 2021 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package copycerts
func setNoUmask() {
// no-op on not-unix
}