Plug syncing Kubernetes components to cluster into main reconcile loop

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

controllers/workspace/condition.go

@@ -29,6 +29,7 @@ var conditionOrder = []dw.DevWorkspaceConditionType{
 	dw.DevWorkspaceRoutingReady,
 	dw.DevWorkspaceServiceAccountReady,
 	conditions.PullSecretsReady,
+	conditions.KubeComponentsReady,
 	conditions.DeploymentReady,
 	dw.DevWorkspaceReady,
 }

controllers/workspace/devworkspace_controller.go

@@ -33,6 +33,7 @@ import (
 	containerlib "github.com/devfile/devworkspace-operator/pkg/library/container"
 	"github.com/devfile/devworkspace-operator/pkg/library/env"
 	"github.com/devfile/devworkspace-operator/pkg/library/flatten"
+	kubesync "github.com/devfile/devworkspace-operator/pkg/library/kubernetes"
 	"github.com/devfile/devworkspace-operator/pkg/library/projects"
 	"github.com/devfile/devworkspace-operator/pkg/provision/automount"
 	"github.com/devfile/devworkspace-operator/pkg/provision/metadata"
@@ -467,6 +468,24 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	allPodAdditions = append(allPodAdditions, pullSecretStatus.PodAdditions)
 	reconcileStatus.setConditionTrue(conditions.PullSecretsReady, "DevWorkspace secrets ready")
 
+	if kubesync.HasKubelikeComponent(workspace) {
+		if err := kubesync.HandleKubernetesComponents(workspace, clusterAPI); err != nil {
+			switch syncErr := err.(type) {
+			case *kubesync.RetryError:
+				reqLogger.Info(syncErr.Error())
+				reconcileStatus.setConditionFalse(conditions.KubeComponentsReady, "Waiting for DevWorkspace Kubernetes components to be created on cluster")
+				return reconcile.Result{Requeue: true}, nil
+			case *kubesync.FailError:
+				return r.failWorkspace(workspace, fmt.Sprintf("Error provisioning workspace Kubernetes components: %s", syncErr), metrics.ReasonBadRequest, reqLogger, &reconcileStatus)
+			case *kubesync.WarningError:
+				reconcileStatus.setConditionTrue(conditions.DevWorkspaceWarning, fmt.Sprintf("Warning in Kubernetes components: %s", syncErr))
+			default:
+				return reconcile.Result{}, err
+			}
+		}
+		reconcileStatus.setConditionTrue(conditions.KubeComponentsReady, "Kubernetes components ready")
+	}
+
 	// Step six: Create deployment and wait for it to be ready
 	timing.SetTime(timingInfo, timing.DeploymentCreated)
 	deploymentStatus := wsprovision.SyncDeploymentToCluster(workspace, allPodAdditions, serviceAcctName, clusterAPI)

main.go

@@ -27,6 +27,7 @@ import (
 	"github.com/devfile/devworkspace-operator/pkg/cache"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/devfile/devworkspace-operator/pkg/infrastructure"
+	kubesync "github.com/devfile/devworkspace-operator/pkg/library/kubernetes"
 	"github.com/devfile/devworkspace-operator/pkg/webhook"
 	"github.com/devfile/devworkspace-operator/version"
 
@@ -105,6 +106,10 @@ func main() {
 	setupLog.Info(fmt.Sprintf("Commit: %s", version.Commit))
 	setupLog.Info(fmt.Sprintf("BuildTime: %s", version.BuildTime))
 
+	if err := kubesync.InitializeDeserializer(scheme); err != nil {
+		setupLog.Error(err, "failed to initialized Kubernetes objects decoder")
+	}
+
 	cacheFunc, err := cache.GetCacheFunc()
 	if err != nil {
 		setupLog.Error(err, "failed to set up objects cache")

pkg/conditions/conditions.go

@@ -22,6 +22,7 @@ const (
 	PullSecretsReady     dw.DevWorkspaceConditionType = "PullSecretsReady"
 	DevWorkspaceResolved dw.DevWorkspaceConditionType = "DevWorkspaceResolved"
 	StorageReady         dw.DevWorkspaceConditionType = "StorageReady"
+	KubeComponentsReady  dw.DevWorkspaceConditionType = "KubernetesComponentsProvisioned"
 	DeploymentReady      dw.DevWorkspaceConditionType = "DeploymentReady"
 	DevWorkspaceWarning  dw.DevWorkspaceConditionType = "DevWorkspaceWarning"
 )

pkg/library/kubernetes/util.go

@@ -17,9 +17,19 @@ import (
 	"fmt"
 
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
+	"github.com/devfile/devworkspace-operator/pkg/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+func HasKubelikeComponent(workspace *common.DevWorkspaceWithConfig) bool {
+	for _, component := range workspace.Spec.Template.Components {
+		if component.Kubernetes != nil || component.Openshift != nil {
+			return true
+		}
+	}
+	return false
+}
+
 func filterForKubeLikeComponents(components []dw.Component) ([]dw.Component, error) {
 	var k8sLikeComponents []dw.Component
 	for _, component := range components {