Move IsOpenShift check to a global variable that must be initialized

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

Author: amisevsk

controllers/controller/workspacerouting/solvers/basic_solver.go

@@ -15,6 +15,7 @@ package solvers
 import (
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/constants"
+	"github.com/devfile/devworkspace-operator/pkg/infrastructure"
 )
 
 var routeAnnotations = func(endpointName string) map[string]string {
@@ -37,9 +38,7 @@ var nginxIngressAnnotations = func(endpointName string) map[string]string {
 // According to the current cluster there is different behavior:
 // Kubernetes: use Ingresses without TLS
 // OpenShift: use Routes with TLS enabled
-type BasicSolver struct {
-	isOpenShift bool
-}
+type BasicSolver struct{}
 
 var _ RoutingSolver = (*BasicSolver)(nil)
 
@@ -58,7 +57,7 @@ func (s *BasicSolver) GetSpecObjects(routing *controllerv1alpha1.WorkspaceRoutin
 	services := getServicesForEndpoints(spec.Endpoints, workspaceMeta)
 	services = append(services, GetDiscoverableServicesForEndpoints(spec.Endpoints, workspaceMeta)...)
 	routingObjects.Services = services
-	if s.isOpenShift {
+	if infrastructure.IsOpenShift() {
 		routingObjects.Routes = getRoutesForSpec(spec.Endpoints, workspaceMeta)
 	} else {
 		routingObjects.Ingresses = getIngressesForSpec(spec.Endpoints, workspaceMeta)

controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go

@@ -15,18 +15,17 @@ package solvers
 import (
 	"fmt"
 
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
+
+	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	maputils "github.com/devfile/devworkspace-operator/internal/map"
+	"github.com/devfile/devworkspace-operator/pkg/common"
 	"github.com/devfile/devworkspace-operator/pkg/constants"
 
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	oauthv1 "github.com/openshift/api/oauth/v1"
 	routeV1 "github.com/openshift/api/route/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
-	"github.com/devfile/devworkspace-operator/pkg/common"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type OpenShiftOAuthSolver struct {

controllers/controller/workspacerouting/solvers/solver.go

@@ -22,6 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
+	"github.com/devfile/devworkspace-operator/pkg/infrastructure"
 )
 
 type RoutingObjects struct {
@@ -73,7 +74,7 @@ type RoutingSolverGetter interface {
 	// the routingClass is not recognized, and any other error if the routingClass is invalid (e.g. an OpenShift-only
 	// routingClass on a vanilla Kubernetes platform). Note that an empty routingClass is handled by the DevWorkspace controller itself,
 	// and should not be handled by external controllers.
-	GetSolver(client client.Client, routingClass controllerv1alpha1.WorkspaceRoutingClass, isOpenShift bool) (solver RoutingSolver, err error)
+	GetSolver(client client.Client, routingClass controllerv1alpha1.WorkspaceRoutingClass) (solver RoutingSolver, err error)
 }
 
 type SolverGetter struct{}
@@ -97,10 +98,11 @@ func (_ *SolverGetter) HasSolver(routingClass controllerv1alpha1.WorkspaceRoutin
 	}
 }
 
-func (_ *SolverGetter) GetSolver(client client.Client, routingClass controllerv1alpha1.WorkspaceRoutingClass, isOpenShift bool) (RoutingSolver, error) {
+func (_ *SolverGetter) GetSolver(client client.Client, routingClass controllerv1alpha1.WorkspaceRoutingClass) (RoutingSolver, error) {
+	isOpenShift := infrastructure.IsOpenShift()
 	switch routingClass {
 	case controllerv1alpha1.WorkspaceRoutingBasic:
-		return &BasicSolver{isOpenShift: isOpenShift}, nil
+		return &BasicSolver{}, nil
 	case controllerv1alpha1.WorkspaceRoutingOpenShiftOauth:
 		if !isOpenShift {
 			return nil, fmt.Errorf("routing class %s only supported on OpenShift", routingClass)

controllers/controller/workspacerouting/workspacerouting_controller.go

@@ -18,13 +18,12 @@ import (
 	"time"
 
 	"github.com/devfile/devworkspace-operator/controllers/controller/workspacerouting/solvers"
-	"github.com/devfile/devworkspace-operator/internal/cluster"
 	maputils "github.com/devfile/devworkspace-operator/internal/map"
 	"github.com/devfile/devworkspace-operator/pkg/constants"
-
-	"github.com/google/go-cmp/cmp"
+	"github.com/devfile/devworkspace-operator/pkg/infrastructure"
 
 	"github.com/go-logr/logr"
+	"github.com/google/go-cmp/cmp"
 	routeV1 "github.com/openshift/api/route/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/api/extensions/v1beta1"
@@ -47,9 +46,8 @@ const workspaceRoutingFinalizer = "workspacerouting.controller.devfile.io"
 // WorkspaceRoutingReconciler reconciles a WorkspaceRouting object
 type WorkspaceRoutingReconciler struct {
 	client.Client
-	Log         logr.Logger
-	Scheme      *runtime.Scheme
-	IsOpenShift bool
+	Log    logr.Logger
+	Scheme *runtime.Scheme
 	// SolverGetter will be used to get solvers for a particular workspaceRouting
 	SolverGetter solvers.RoutingSolverGetter
 }
@@ -88,7 +86,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 		return reconcile.Result{}, r.markRoutingFailed(instance)
 	}
 
-	solver, err := r.SolverGetter.GetSolver(r.Client, instance.Spec.RoutingClass, r.IsOpenShift)
+	solver, err := r.SolverGetter.GetSolver(r.Client, instance.Spec.RoutingClass)
 	if err != nil {
 		if errors.Is(err, solvers.RoutingNotSupported) {
 			return reconcile.Result{}, nil
@@ -184,7 +182,7 @@ func (r *WorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, e
 		Services: clusterServices,
 	}
 
-	if r.IsOpenShift {
+	if infrastructure.IsOpenShift() {
 		routesInSync, clusterRoutes, err := r.syncRoutes(instance, routes)
 		if err != nil || !routesInSync {
 			reqLogger.Info("Routes not in sync")
@@ -295,13 +293,8 @@ func (r *WorkspaceRoutingReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&controllerv1alpha1.WorkspaceRouting{}).
 		Owns(&corev1.Service{}).
 		Owns(&v1beta1.Ingress{})
-	if isOS, err := cluster.IsOpenShift(); err != nil {
-		return err
-	} else if isOS {
+	if infrastructure.IsOpenShift() {
 		bld.Owns(&routeV1.Route{})
-		r.IsOpenShift = true
-	} else {
-		r.IsOpenShift = false
 	}
 	if r.SolverGetter == nil {
 		return NoSolversEnabled

controllers/workspace/provision/deployment.go

@@ -20,6 +20,7 @@ import (
 
 	maputils "github.com/devfile/devworkspace-operator/internal/map"
 	"github.com/devfile/devworkspace-operator/pkg/constants"
+	"github.com/devfile/devworkspace-operator/pkg/infrastructure"
 
 	"github.com/devfile/devworkspace-operator/pkg/common"
 
@@ -140,7 +141,7 @@ func DeleteWorkspaceDeployment(ctx context.Context, workspace *devworkspace.DevW
 }
 
 func GetDevWorkspaceSecurityContext() *corev1.PodSecurityContext {
-	if !config.ControllerCfg.IsOpenShift() {
+	if !infrastructure.IsOpenShift() {
 		uID := int64(1234)
 		rootGID := int64(0)
 		nonRoot := true

controllers/workspace/provision/pull_secret.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/constants"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"