Fixes

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

pkg/deploy/dev-workspace/dev_workspace.go

@@ -18,6 +18,7 @@ import (
 	"github.com/eclipse/che-operator/pkg/deploy"
 	"github.com/eclipse/che-operator/pkg/util"
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -87,20 +88,16 @@ func ReconcileDevWorkspace(deployContext *deploy.DeployContext) (bool, error) {
 		return true, nil
 	}
 
-	devWorkspaceDeploymentExists, err := deploy.IsExists(
+	devWorkspaceWebhookExists, err := deploy.IsExists(
 		deployContext,
-		client.ObjectKey{Name: DevWorkspaceDeploymentName, Namespace: DevWorkspaceNamespace},
-		&appsv1.Deployment{},
+		client.ObjectKey{Name: DevWorkspaceWebhookName},
+		&admissionregistrationv1.MutatingWebhookConfiguration{},
 	)
 	if err != nil {
 		return false, err
 	}
 
-	if !devWorkspaceDeploymentExists {
-		if err := checkWebTerminalSubscription(deployContext); err != nil {
-			return false, err
-		}
-
+	if !devWorkspaceWebhookExists {
 		for _, syncItem := range syncItems {
 			done, err := syncItem(deployContext)
 			if !util.IsTestMode() {
@@ -109,6 +106,10 @@ func ReconcileDevWorkspace(deployContext *deploy.DeployContext) (bool, error) {
 				}
 			}
 		}
+	} else {
+		if err := checkWebTerminalSubscription(deployContext); err != nil {
+			return false, err
+		}
 	}
 
 	return true, nil

pkg/deploy/dev-workspace/dev_workspace_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/eclipse/che-operator/pkg/deploy"
 	"github.com/eclipse/che-operator/pkg/util"
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -72,11 +73,18 @@ func TestReconcileDevWorkspaceShouldThrowErrorIfWebTerminalSubscriptionExists(t
 		Spec: &operatorsv1alpha1.SubscriptionSpec{},
 	}
 
+	webhook := admissionregistrationv1.MutatingWebhookConfiguration{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: DevWorkspaceWebhookName,
+		},
+	}
+
 	scheme := scheme.Scheme
 	orgv1.SchemeBuilder.AddToScheme(scheme)
 	scheme.AddKnownTypes(operatorsv1alpha1.SchemeGroupVersion, &operatorsv1alpha1.Subscription{})
+	scheme.AddKnownTypes(admissionregistrationv1.SchemeGroupVersion, &admissionregistrationv1.MutatingWebhookConfiguration{})
 
-	cli := fake.NewFakeClientWithScheme(scheme, subscription)
+	cli := fake.NewFakeClientWithScheme(scheme, subscription, &webhook)
 
 	deployContext := &deploy.DeployContext{
 		CheCluster: &orgv1.CheCluster{