Fix prtb migration (#13)

* Add project member

Signed-off-by: galal-hussein <[email protected]>

* Fix compare in prtb migration

Signed-off-by: galal-hussein <[email protected]>

---------

Signed-off-by: galal-hussein <[email protected]>

Author: galal-hussein

pkg/cluster/cluster.go

@@ -205,7 +205,7 @@ func (c *Cluster) Compare(ctx context.Context, tc *Cluster) error {
 					for _, tPrtb := range tProject.PRTBs {
 						if sPrtb.Name == tPrtb.Name {
 							sPrtb.Migrated = true
-							if !reflect.DeepEqual(sPrtb.Obj, tPrtb.Obj) {
+							if !sPrtb.Compare(tPrtb) {
 								sPrtb.Diff = true
 							}
 						}
@@ -347,7 +347,6 @@ func (c *Cluster) Migrate(ctx context.Context, client *client.Clients, tc *Clust
 						return errors.New("user " + userID + " does not exists, please migrate user first")
 					}
 				}
-
 				prtb.Mutate(tc.Obj.Name, prtb.ProjectName)
 				if err := client.ProjectRoleTemplateBindings.Create(ctx, prtb.ProjectName, prtb.Obj, nil, v1.CreateOptions{}); err != nil {
 					return err

pkg/cluster/projectroletemplatebinding.go

@@ -36,6 +36,10 @@ func (p *ProjectRoleTemplateBinding) normalize() {
 	// removing objectMeta and projectName since prtb has no spec
 	p.Obj.ObjectMeta = v1.ObjectMeta{}
 	p.Obj.ProjectName = ""
+	if p.Obj.GroupPrincipalName != "" || p.Obj.GroupName != "" {
+		p.Obj.UserName = ""
+		p.Obj.UserPrincipalName = ""
+	}
 }
 
 func (p *ProjectRoleTemplateBinding) Mutate(clusterName, projectName string) {
@@ -52,6 +56,22 @@ func (p *ProjectRoleTemplateBinding) Mutate(clusterName, projectName string) {
 	}
 }
 
+func (p *ProjectRoleTemplateBinding) Compare(target *ProjectRoleTemplateBinding) bool {
+	// if group principal name exists in the target cluster we should just return true
+	// this is due to the original creator of the source cluster might be different than
+	// the target cluster creator
+	if target.Obj.GroupPrincipalName != "" || target.Obj.GroupName != "" {
+		return true
+	}
+	if p.Obj.UserName == target.Obj.UserName &&
+		p.Obj.UserPrincipalName == target.Obj.UserPrincipalName &&
+		p.Obj.ServiceAccount == target.Obj.ServiceAccount &&
+		p.Obj.RoleTemplateName == target.Obj.RoleTemplateName {
+		return true
+	}
+	return false
+}
+
 func (p *ProjectRoleTemplateBinding) SetDescription(ctx context.Context, client *client.Clients) error {
 	if p.Obj.UserName == "" && p.Obj.UserPrincipalName == "" {
 		groupName := p.Obj.GroupName