Merge pull request #94 from Abirdcfly/fixorgstatus

fix: org status sometimes cannot be changed to Deployed

config/samples/example-test.sh

@@ -237,16 +237,19 @@ kubectl create -f config/samples/orgs/org1.yaml --dry-run=client -o json |
 	kubectl create --token=${Admin1Token} -f -
 function waitOrgReady() {
 	orgName=$1
+	wantFedName=$2
 	START_TIME=$(date +%s)
 	while true; do
 		status=$(kubectl get org $orgName --ignore-not-found=true -o json | jq -r .status.type)
 		if [ "$status" == "Deployed" ]; then
-			break
-		fi
-
-		# TODO after finish https://github.com/bestchains/fabric-operator/issues/79, remove check ca status
-		caStatus=$(kubectl get ibpca -n $orgName $orgName --ignore-not-found=true -o json | jq -r '.status.type')
-		if [ "$caStatus" == "Deployed" ]; then
+			if [[ $fedName != "" ]]; then
+				getFedName=$(kubectl get org $orgName --ignore-not-found=true -o json | jq -r '.status.federations[0].name')
+				if [[ $wantFedName == $getFedName ]]; then
+					break
+				else
+					continue
+				fi
+			fi
 			break
 		fi
 
@@ -313,6 +316,8 @@ function waitFed() {
 	done
 }
 waitFed federation-sample "Exist"
+waitOrgReady "org1" "federation-sample"
+waitOrgReady "org1" "federation-sample"
 
 info "4.3 create federation create proposal for fed=federation-sample"
 

controllers/organization/organization_controller.go

@@ -127,7 +127,10 @@ func add(mgr manager.Manager, r *ReconcileOrganization) error {
 	caFuncs := predicate.Funcs{
 		UpdateFunc: r.CAUpdateFunc,
 	}
-	err = c.Watch(&source.Kind{Type: &current.IBPCA{}}, &handler.EnqueueRequestForObject{}, caFuncs)
+	err = c.Watch(&source.Kind{Type: &current.IBPCA{}}, &handler.EnqueueRequestForOwner{
+		OwnerType:    &current.Organization{},
+		IsController: true,
+	}, caFuncs)
 	if err != nil {
 		return err
 	}

controllers/organization/predict.go

@@ -302,27 +302,20 @@ func (r *ReconcileOrganization) AddFed(m current.Member, federation *current.Fed
 
 // CA related predict funcs
 func (r *ReconcileOrganization) CAUpdateFunc(e event.UpdateEvent) bool {
-	var err error
-
+	update := Update{}
 	oldCA := e.ObjectOld.(*current.IBPCA)
 	newCA := e.ObjectNew.(*current.IBPCA)
-	log.Info(fmt.Sprintf("Update event detected for ibpca '%s'", oldCA.GetName()))
-
-	org := &current.Organization{}
-	err = r.client.Get(context.TODO(), types.NamespacedName{
-		Name: newCA.GetOrganization().Name,
-	}, org)
-	if err != nil {
-		log.Error(err, fmt.Sprintf("failed to get organization %s`", newCA.GetOrganization().Name))
+	if reflect.DeepEqual(oldCA.Status.CRStatus, newCA.Status.CRStatus) {
 		return false
 	}
-	// sync to CAStatus
-	err = r.SetStatus(org, &newCA.Status.CRStatus)
-	if err != nil {
-		log.Error(err, fmt.Sprintf("set organization %s to %s", org.GetName(), newCA.Status.Type))
-	}
 
-	return false
+	log.Info(fmt.Sprintf("Update event detected for ibpca '%s'", oldCA.GetName()))
+	orgName := oldCA.GetOrganization().Name
+
+	update.caStatusUpdated = true
+	r.PushUpdate(orgName, update)
+
+	return true
 }
 
 func (r *ReconcileOrganization) UpdateStatus(organization current.NamespacedName, newStatus current.CRStatus) error {

controllers/organization/update.go

@@ -28,8 +28,9 @@ import (
 type Update struct {
 	specUpdated bool
 
-	adminUpdated bool
-	tokenUpdated bool
+	adminUpdated    bool
+	tokenUpdated    bool
+	caStatusUpdated bool
 
 	// cache orgigin admin
 	adminTransfered string
@@ -63,6 +64,10 @@ func (u *Update) TokenUpdated() bool {
 	return u.tokenUpdated
 }
 
+func (u *Update) CAStatusUpdated() bool {
+	return u.caStatusUpdated
+}
+
 // GetUpdateStackWithTrues is a helper method to print updates that have been detected
 func (u *Update) GetUpdateStackWithTrues() string {
 	stack := ""
@@ -88,7 +93,11 @@ func (u *Update) GetUpdateStackWithTrues() string {
 	}
 
 	if u.ClientsRemoved() != "" {
-		stack += "clientsRemoved"
+		stack += "clientsRemoved "
+	}
+
+	if u.CAStatusUpdated() {
+		stack += "caStatusUpdated "
 	}
 
 	if len(stack) == 0 {

pkg/offering/base/organization/organization.go

@@ -39,6 +39,7 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -53,6 +54,7 @@ type Update interface {
 	AdminTransfered() string
 	ClientsUpdated() bool
 	ClientsRemoved() string
+	CAStatusUpdated() bool
 }
 
 type Override interface {
@@ -73,7 +75,7 @@ type Organization interface {
 	PreReconcileChecks(instance *current.Organization, update Update) error
 	Initialize(instance *current.Organization, update Update) error
 	ReconcileManagers(instance *current.Organization, update Update) error
-	CheckStates(instance *current.Organization) (common.Result, error)
+	CheckStates(instance *current.Organization, update Update) (common.Result, error)
 	Reconcile(instance *current.Organization, update Update) (common.Result, error)
 }
 
@@ -162,7 +164,7 @@ func (organization *BaseOrganization) Reconcile(instance *current.Organization,
 		return common.Result{}, errors.Wrap(err, "failed to reconcile managers")
 	}
 
-	return organization.CheckStates(instance)
+	return organization.CheckStates(instance, update)
 }
 
 // PreReconcileChecks on Organization upon Update
@@ -322,13 +324,24 @@ func (organization *BaseOrganization) ReconcileUsers(instance *current.Organizat
 }
 
 // CheckStates on Organization
-func (organization *BaseOrganization) CheckStates(instance *current.Organization) (common.Result, error) {
-	return common.Result{
-		Status: &current.CRStatus{
-			Type:    current.Deploying,
-			Version: version.Operator,
-		},
-	}, nil
+func (organization *BaseOrganization) CheckStates(instance *current.Organization, update Update) (common.Result, error) {
+	if update.CAStatusUpdated() && instance.Status.Type != current.Error {
+		ca := &current.IBPCA{}
+		ca.Namespace = instance.GetCA().Namespace
+		ca.Name = instance.GetCA().Name
+		if err := organization.Client.Get(context.TODO(), client.ObjectKeyFromObject(ca), ca); err == nil {
+			return common.Result{Status: &ca.Status.CRStatus}, nil
+		}
+	}
+	if !instance.HasType() {
+		return common.Result{
+			Status: &current.CRStatus{
+				Type:    current.Deploying,
+				Version: version.Operator,
+			},
+		}, nil
+	}
+	return common.Result{}, nil
 }
 
 // GetLabels from instance.GetLabels