fixes

Signed-off-by: Anatolii Bazko <[email protected]>

Author: tolusha

pkg/common/infrastructure/cluster.go

@@ -14,6 +14,7 @@ package infrastructure
 
 import (
 	"os"
+	"slices"
 	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -28,7 +29,6 @@ const (
 	Unknown Type = iota
 	Kubernetes
 	OpenShiftV4
-	OpenShiftV5
 
 	LeasesResources                = "leases"
 	OAuthClientsResources          = "oauthclients"
@@ -57,7 +57,7 @@ func GetOperatorNamespace() (string, error) {
 
 func IsOpenShift() bool {
 	initializeIfNeeded()
-	return infrastructure == OpenShiftV4 || infrastructure == OpenShiftV5
+	return infrastructure == OpenShiftV4
 }
 
 func IsOpenShiftOAuthEnabled() bool {
@@ -111,7 +111,7 @@ func initializeIfNeeded() {
 		os.Exit(1)
 	}
 
-	if hasAPIGroup(apiGroups, "route.openshift.io") {
+	if hasAPIGroup(apiGroups, "config.openshift.io") {
 		infrastructure = OpenShiftV4
 		isOpenShiftOAuthEnabled = hasAPIResource(apiResources, OAuthClientsResources)
 	} else {
@@ -124,13 +124,9 @@ func initializeIfNeeded() {
 }
 
 func hasAPIGroup(source []*metav1.APIGroup, apiName string) bool {
-	for i := 0; i < len(source); i++ {
-		if source[i].Name == apiName {
-			return true
-		}
-	}
-
-	return false
+	return slices.ContainsFunc(source, func(g *metav1.APIGroup) bool {
+		return g.Name == apiName
+	})
 }
 
 func hasAPIResource(resources []*metav1.APIResourceList, resourceName string) bool {

pkg/common/operator-defaults/defaults.go

@@ -20,9 +20,9 @@ import (
 	"github.com/eclipse-che/che-operator/pkg/common/infrastructure"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	util "github.com/eclipse-che/che-operator/pkg/common/utils"
-	"github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 )
 
@@ -52,17 +52,23 @@ var (
 	defaultDevfileRegistryExternalDevfileRegistries         string
 
 	initialized = false
+
+	log = ctrl.Log.WithName("defaults")
 )
 
 func InitializeForTesting(operatorDeploymentFilePath string) {
 	operatorDeployment := &appsv1.Deployment{}
 	if err := util.ReadObjectInto(operatorDeploymentFilePath, operatorDeployment); err != nil {
-		logrus.Fatalf("Failed to read operator deployment from '%s', cause: %v", operatorDeploymentFilePath, err)
+		log.Error(err, "Error reading operator deployment")
+		os.Exit(1)
 	}
 
 	for _, container := range operatorDeployment.Spec.Template.Spec.Containers {
 		for _, env := range container.Env {
-			os.Setenv(env.Name, env.Value)
+			err := os.Setenv(env.Name, env.Value)
+			if err != nil {
+				log.Error(err, "Error setting env variable", "name", env.Name)
+			}
 		}
 	}
 
@@ -109,191 +115,192 @@ func Initialize() {
 func ensureEnv(name string) string {
 	value := os.Getenv(name)
 	if value == "" {
-		logrus.Fatalf("Failed to initialize default value: '%s'. Environment variable not found.", name)
+		log.Error(fmt.Errorf("environment variable %s not set", name), "unable to determine required environment variable")
+		os.Exit(1)
 	}
 
 	return value
 }
 
 func GetCheServerImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultCheServerImage)
 }
 
 func GetCheTLSSecretsCreationJobImage() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultCheTLSSecretsCreationJobImage
 }
 
 func GetCheVersion() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultCheVersion
 }
 
 func GetDashboardImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultDashboardImage)
 }
 
 func GetPluginRegistryImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultPluginRegistryImage)
 }
 
 func GetGatewayImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultSingleHostGatewayImage)
 }
 
 func GetGatewayConfigSidecarImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultSingleHostGatewayConfigSidecarImage)
 }
 
 func GetGatewayKubernetesAuthenticationSidecarImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultGatewayKubernetesAuthenticationSidecarImage)
 }
 
 func GetGatewayKubernetesAuthorizationSidecarImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultGatewayKubernetesAuthorizationSidecarImage)
 }
 
 func GetGatewayOpenShiftAuthenticationSidecarImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultGatewayOpenShiftAuthenticationSidecarImage)
 }
 
 func GetGatewayOpenShiftAuthorizationSidecarImage(checluster interface{}) string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return PatchDefaultImageName(checluster, defaultGatewayOpenShiftAuthorizationSidecarImage)
 }
 
 func GetCheFlavor() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultCheFlavor
 }
 
 func GetConsoleLinkName() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultConsoleLinkName
 }
 
 func GetConsoleLinkDisplayName() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultConsoleLinkDisplayName
 }
 
 func GetConsoleLinkSection() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultConsoleLinkSection
 }
 
 func GetConsoleLinkImage() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultsConsoleLinkImage
 }
 
 func GetDevfileRegistryExternalDevfileRegistries() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultDevfileRegistryExternalDevfileRegistries
 }
 
 func GetPluginRegistryOpenVSXURL() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultPluginRegistryOpenVSXURL
 }
 
 func GetDashboardHeaderMessageText() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultDashboardHeaderMessageText
 }
 
 func GetDevEnvironmentsDefaultEditor() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultDevEnvironmentsDefaultEditor
 }
 
 func GetDevEnvironmentsDefaultComponents() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultDevEnvironmentsDefaultComponents
 }
 
 func GetDevEnvironmentsContainerSecurityContext() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultDevEnvironmentsContainerSecurityContext
 }
 
 func GetDevEnvironmentsDisableContainerBuildCapabilities() string {
 	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
+		Initialize()
 	}
 
 	return defaultDevEnvironmentsDisableContainerBuildCapabilities

pkg/deploy/gateway/oauth_proxy.go

@@ -199,21 +199,14 @@ func getOauthProxyContainerSpec(ctx *chetypes.DeployContext) corev1.Container {
 	configMapRevision := map[bool]string{true: cm.GetResourceVersion(), false: ""}[exists]
 
 	var image, probePath string
-	var args []string
+	var args = []string{"--config=/etc/oauth-proxy/oauth-proxy.cfg"}
 	if infrastructure.IsOpenShiftOAuthEnabled() {
 		image = defaults.GetGatewayOpenShiftAuthenticationSidecarImage(ctx.CheCluster)
 		probePath = "/oauth/healthz"
-		args = []string{
-			"--config=/etc/oauth-proxy/oauth-proxy.cfg",
-		}
 	} else {
 		image = defaults.GetGatewayKubernetesAuthenticationSidecarImage(ctx.CheCluster)
 		probePath = "/ping"
-		args = []string{
-			"--config=/etc/oauth-proxy/oauth-proxy.cfg",
-			"--ping-path=/ping",
-			"--exclude-logging-path=/ping",
-		}
+		args = append(args, "--ping-path=/ping", "--exclude-logging-path=/ping")
 	}
 
 	return corev1.Container{