Log resolved config string instead of internal config

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

Author: amisevsk

controllers/workspace/devworkspace_controller.go

@@ -127,7 +127,7 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	if err != nil {
 		reqLogger.Error(err, "Error applying external DevWorkspace-Operator configuration")
 	}
-	configString := wkspConfig.GetCurrentConfigString()
+	configString := wkspConfig.GetCurrentConfigString(config)
 	workspace := &common.DevWorkspaceWithConfig{}
 	workspace.DevWorkspace = rawWorkspace
 	workspace.Config = config

pkg/config/sync.go

@@ -300,12 +300,12 @@ func mergeConfig(from, to *controller.OperatorConfiguration) {
 	}
 }
 
-func GetCurrentConfigString() string {
-	if internalConfig == nil {
+func GetCurrentConfigString(currConfig *controller.OperatorConfiguration) string {
+	if currConfig == nil {
 		return ""
 	}
 
-	routing := internalConfig.Routing
+	routing := currConfig.Routing
 	var config []string
 	if routing != nil {
 		if routing.ClusterHostSuffix != "" && routing.ClusterHostSuffix != defaultConfig.Routing.ClusterHostSuffix {
@@ -315,7 +315,7 @@ func GetCurrentConfigString() string {
 			config = append(config, fmt.Sprintf("routing.defaultRoutingClass=%s", routing.DefaultRoutingClass))
 		}
 	}
-	workspace := internalConfig.Workspace
+	workspace := currConfig.Workspace
 	if workspace != nil {
 		if workspace.ImagePullPolicy != defaultConfig.Workspace.ImagePullPolicy {
 			config = append(config, fmt.Sprintf("workspace.imagePullPolicy=%s", workspace.ImagePullPolicy))
@@ -345,7 +345,7 @@ func GetCurrentConfigString() string {
 			config = append(config, "workspace.defaultTemplate is set")
 		}
 	}
-	if internalConfig.EnableExperimentalFeatures != nil && *internalConfig.EnableExperimentalFeatures {
+	if currConfig.EnableExperimentalFeatures != nil && *currConfig.EnableExperimentalFeatures {
 		config = append(config, "enableExperimentalFeatures=true")
 	}
 	if len(config) == 0 {
@@ -357,7 +357,7 @@ func GetCurrentConfigString() string {
 
 // logCurrentConfig formats the current operator configuration as a plain string
 func logCurrentConfig() {
-	currConfig := GetCurrentConfigString()
+	currConfig := GetCurrentConfigString(internalConfig)
 	if len(currConfig) == 0 {
 		log.Info("Updated config to [(default config)]")
 	} else {