github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114957 from claudiubelu/kubeadm-preflight-checks-admin

Browse Source 
unit tests: Fixes kubeadm enforce requirements test
This commit is contained in:
Kubernetes Prow Robot 2023-01-11 03:33:43 -08:00 committed by GitHub
commit 6699db9f59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/cmd/upgrade/common_test.go
View File

@ -27,6 +27,7 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
"k8s.io/kubernetes/cmd/kubeadm/app/util/output" "k8s.io/kubernetes/cmd/kubeadm/app/util/output"
testutil "k8s.io/kubernetes/cmd/kubeadm/test" testutil "k8s.io/kubernetes/cmd/kubeadm/test"
) )
@ -113,7 +114,10 @@ func TestEnforceRequirements(t *testing.T) {
expErr := tt.expectedErr expErr := tt.expectedErr
// pre-flight check expects the user to be root, so the root and non-root should hit different errors // pre-flight check expects the user to be root, so the root and non-root should hit different errors
if os.Getuid() != 0 && len(tt.expectedErrNonRoot) != 0 { isPrivileged := preflight.IsPrivilegedUserCheck{}
// this will return an array of errors if we're not running as a privileged user.
_, errors := isPrivileged.Check()
if len(errors) != 0 && len(tt.expectedErrNonRoot) != 0 {
expErr = tt.expectedErrNonRoot expErr = tt.expectedErrNonRoot
} }
if err != nil && !strings.Contains(err.Error(), expErr) { if err != nil && !strings.Contains(err.Error(), expErr) {