Merge pull request #4847 from xyz-li/master

Fix: e2e test failed
This commit is contained in:
KubeSphere CI Bot
2022-05-06 16:08:02 +08:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -2,7 +2,7 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.19.7
image: kindest/node:v1.21.1
extraMounts:
- hostPath: /etc/localtime
containerPath: /etc/localtime

View File

@@ -126,10 +126,10 @@ func createUserWithWait(f framework.KubeSphereFramework, c client.Client, userna
framework.Failf("Cannot retrieve User %q: %v", username, err)
return false, err
}
if u == nil || u.Status.State == nil {
if u == nil || u.Status.State == "" {
return false, nil
}
return *u.Status.State == v1alpha2.UserActive, nil
return u.Status.State == v1alpha2.UserActive, nil
})
if err != nil {