diff --git a/.github/workflows/kind/kind.yaml b/.github/workflows/kind/kind.yaml index 4179d133b..ee37db117 100644 --- a/.github/workflows/kind/kind.yaml +++ b/.github/workflows/kind/kind.yaml @@ -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 diff --git a/test/e2e/groups.go b/test/e2e/groups.go index 852c17f79..b04d0dcd8 100644 --- a/test/e2e/groups.go +++ b/test/e2e/groups.go @@ -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 {