File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
cmd/kubeadm/app/cmd/upgrade Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff 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 ) {
You can’t perform that action at this time.
0 commit comments