Merge pull request #148 from bmozaffa/KIECLOUD-194

[KIECLOUD-194] Deployment podStatuses, edge case bug fix
kiegroup · Apr 22, 2019 · a130044 · a130044
2 parents cc0d80b + f40b1a5
commit a130044
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 10 deletions.
diff --git a/pkg/apis/app/v1/zz_generated.deepcopy.go b/pkg/apis/app/v1/zz_generated.deepcopy.go
diff --git a/pkg/controller/kieapp/kieapp_controller.go b/pkg/controller/kieapp/kieapp_controller.go
@@ -113,12 +113,18 @@ func (reconciler *Reconciler) Reconcile(request reconcile.Request) (reconcile.Re
 	}
 
 	// Update CR if needed
-	if reconciler.hasChanged(instance, cachedInstance) {
+	if reconciler.hasSpecChanges(instance, cachedInstance) {
 		if status.SetProvisioning(instance) && instance.ResourceVersion == cachedInstance.ResourceVersion {
 			return reconciler.UpdateObj(instance)
 		}
 		return reconcile.Result{Requeue: true}, nil
 	}
+	if reconciler.hasStatusChanges(instance, cachedInstance) {
+		if instance.ResourceVersion == cachedInstance.ResourceVersion {
+			return reconciler.UpdateObj(instance)
+		}
+		return reconcile.Result{Requeue: true}, nil
+	}
 	if status.SetDeployed(instance) {
 		if instance.ResourceVersion == cachedInstance.ResourceVersion {
 			return reconciler.UpdateObj(instance)
@@ -168,6 +174,7 @@ func (reconciler *Reconciler) updateDeploymentConfigs(instance *v1.KieApp, env v
 			}
 		}
 	}
+	log.Debugf("There are %d updated DCs", len(dcUpdates))
 	if len(dcUpdates) > 0 {
 		for _, uDc := range dcUpdates {
 			_, err := reconciler.UpdateObj(&uDc)
@@ -215,10 +222,7 @@ func (reconciler *Reconciler) updateBuildConfigs(instance *v1.KieApp, env v1.Env
 	return false, nil
 }
 
-func (reconciler *Reconciler) hasChanged(instance, cached *v1.KieApp) bool {
-	if !reflect.DeepEqual(instance.Status, cached.Status) {
-		return true
-	}
+func (reconciler *Reconciler) hasSpecChanges(instance, cached *v1.KieApp) bool {
 	if !reflect.DeepEqual(instance.Spec, cached.Spec) {
 		return true
 	}
@@ -235,6 +239,13 @@ func (reconciler *Reconciler) hasChanged(instance, cached *v1.KieApp) bool {
 	return false
 }
 
+func (reconciler *Reconciler) hasStatusChanges(instance, cached *v1.KieApp) bool {
+	if !reflect.DeepEqual(instance.Status, cached.Status) {
+		return true
+	}
+	return false
+}
+
 func (reconciler *Reconciler) setFailedStatus(instance *v1.KieApp, reason v1.ReasonType, err error) {
 	status.SetFailed(instance, reason, err)
 	_, updateError := reconciler.UpdateObj(instance)
@@ -680,6 +691,7 @@ func getDeploymentsStatuses(dcs []oappsv1.DeploymentConfig, cr *v1.KieApp) v1.De
 			}
 		}
 	}
+	log.Debugf("Found DCs with status stopped [%s], starting [%s], and ready [%s]", stopped, starting, ready)
 	return v1.Deployments{
 		Stopped:  stopped,
 		Starting: starting,