Merge pull request #4228 from wansir/fix-4167

Fix inconsistent user status in member cluster
2021-09-17 16:09:52 +08:00
parent 0cdbe3821f 559a378ca4
commit 83df7d1ffd
5 changed files with 352 additions and 534 deletions
--- a/staging/src/kubesphere.io/api/types/v1beta1/federateduser_types.go
+++ b/staging/src/kubesphere.io/api/types/v1beta1/federateduser_types.go
@@ -45,7 +45,10 @@ type FederatedUserSpec struct {
 }

 type UserTemplate struct {
-	Spec v1alpha2.UserSpec `json:"spec,omitempty"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              v1alpha2.UserSpec `json:"spec"`
+	// +optional
+	Status v1alpha2.UserStatus `json:"status,omitempty"`
 }

 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object