Skip to content

Commit 6699db9

Browse files
authored
Merge pull request kubernetes#114957 from claudiubelu/kubeadm-preflight-checks-admin
unit tests: Fixes kubeadm enforce requirements test
2 parents a887a3b + 3af2c25 commit 6699db9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

cmd/kubeadm/app/cmd/upgrade/common_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
clientset "k8s.io/client-go/kubernetes"
2828
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
2929
kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
30+
"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
3031
"k8s.io/kubernetes/cmd/kubeadm/app/util/output"
3132
testutil "k8s.io/kubernetes/cmd/kubeadm/test"
3233
)
@@ -113,7 +114,10 @@ func TestEnforceRequirements(t *testing.T) {
113114

114115
expErr := tt.expectedErr
115116
// pre-flight check expects the user to be root, so the root and non-root should hit different errors
116-
if os.Getuid() != 0 && len(tt.expectedErrNonRoot) != 0 {
117+
isPrivileged := preflight.IsPrivilegedUserCheck{}
118+
// this will return an array of errors if we're not running as a privileged user.
119+
_, errors := isPrivileged.Check()
120+
if len(errors) != 0 && len(tt.expectedErrNonRoot) != 0 {
117121
expErr = tt.expectedErrNonRoot
118122
}
119123
if err != nil && !strings.Contains(err.Error(), expErr) {

0 commit comments

Comments
 (0)