fix: config not loaded correctly in v1 (#154)

* fix wrong config parsing

* feat: release v1.1.1

Author: Diaphteiros

VERSION

@@ -1 +1 @@
-v1.1.0-dev
+v1.1.1

charts/project-workspace-operator/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: project-workspace-operator
 description: A Helm chart for the project-workspace-operator
 type: application
-version: v1.1.0
-appVersion: v1.1.0
+version: v1.1.1
+appVersion: v1.1.1

charts/project-workspace-operator/values.yaml

@@ -20,7 +20,7 @@ image:
   repository: ghcr.io/openmcp-project/images/project-workspace-operator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v1.1.0
+  tag: v1.1.1
 
 imagePullSecrets: []
 nameOverride: ""

cmd/project-workspace-operator/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	goflag "flag"
 	"fmt"
 	"os"
@@ -349,11 +350,21 @@ func (o *Options) Complete() error {
 		return err
 	}
 
+	clog := o.Log.WithName("config")
 	if o.ProjectWorkspaceConfigPath != "" {
+		clog.Info("Loading project workspace config", "path", o.ProjectWorkspaceConfigPath)
 		o.ProjectWorkspaceConfig, err = config.LoadConfig(o.ProjectWorkspaceConfigPath)
 		if err != nil {
 			return err
 		}
+		cfgJson, err := json.Marshal(o.ProjectWorkspaceConfig)
+		if err != nil {
+			clog.Error(err, "Unable to marshal loaded config for logging")
+		} else {
+			clog.Info("Successfully loaded project workspace config", "config", string(cfgJson))
+		}
+	} else {
+		clog.Info("No config argument specified, skipping config loading")
 	}
 
 	if o.ProjectWorkspaceConfig == nil {

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2
 	github.com/openmcp-project/controller-utils v0.24.0
-	github.com/openmcp-project/project-workspace-operator/api v1.1.0
+	github.com/openmcp-project/project-workspace-operator/api v1.1.1
 	github.com/stretchr/testify v1.11.1
 	k8s.io/api v0.34.2
 	k8s.io/apimachinery v0.34.2

internal/controller/core/config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"errors"
 	"fmt"
 	"os"
 
@@ -27,15 +26,21 @@ func LoadConfig(path string) (*pwv1alpha1.ProjectWorkspaceConfig, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error reading config file: %w", err)
 	}
+	raw := map[string]any{}
+	err = yaml.Unmarshal(data, &raw)
+	if err != nil {
+		return nil, fmt.Errorf("error unmarshaling config file: %w", err)
+	}
 	cfg := &pwv1alpha1.ProjectWorkspaceConfig{}
-	err = yaml.Unmarshal(data, cfg)
+	_, hasKind := raw["kind"]
+	_, hasApiVersion := raw["apiVersion"]
+	if hasKind && hasApiVersion {
+		err = yaml.Unmarshal(data, cfg)
+	} else {
+		err = yaml.Unmarshal(data, &cfg.Spec)
+	}
 	if err != nil {
-		cfgSpec := &pwv1alpha1.ProjectWorkspaceConfigSpec{}
-		err2 := yaml.Unmarshal(data, cfgSpec)
-		if err2 != nil {
-			return nil, fmt.Errorf("config can neither be parsed as full config nor as spec: %w", errors.Join(err, err2))
-		}
-		cfg.Spec = *cfgSpec
+		return nil, fmt.Errorf("config can neither be parsed as full config nor as spec: %w", err)
 	}
 	return cfg, nil
 }

internal/controller/core/config/config_test.go

@@ -12,13 +12,27 @@ import (
 )
 
 func TestLoadConfig(t *testing.T) {
-	pwConfig, err := config.LoadConfig("./testdata/config_valid.yaml")
+	for _, validConfig := range []string{
+		"./testdata/config_valid.yaml",
+		"./testdata/config_valid2.yaml",
+	} {
+		pwConfig, err := config.LoadConfig(validConfig)
 
-	if assert.NoError(t, err) {
-		assert.NotNil(t, pwConfig)
+		if assert.NoError(t, err) {
+			assert.NotNil(t, pwConfig)
+			resourcesBlockingDeletion := []metav1.GroupVersionKind{
+				{
+					Group:   "",
+					Version: "v1",
+					Kind:    "Secret",
+				},
+			}
+			assert.ElementsMatch(t, pwConfig.Spec.Project.ResourcesBlockingDeletion, resourcesBlockingDeletion)
+			assert.ElementsMatch(t, pwConfig.Spec.Workspace.ResourcesBlockingDeletion, resourcesBlockingDeletion)
+		}
 	}
 
-	pwConfig, err = config.LoadConfig("./testdata/config_invalid.yaml")
+	pwConfig, err := config.LoadConfig("./testdata/config_invalid.yaml")
 
 	if assert.Error(t, err) {
 		assert.Nil(t, pwConfig)

internal/controller/core/config/testdata/config_valid2.yaml

@@ -0,0 +1,16 @@
+apiVersion: core.openmcp.cloud/v1alpha1
+kind: ProjectWorkspaceConfig
+metadata:
+  name: project-workspace-config
+spec:
+  project:
+    resourcesBlockingDeletion:
+      - group: ""
+        version: "v1"
+        kind: "Secret"
+
+  workspace:
+    resourcesBlockingDeletion:
+      - group: ""
+        version: "v1"
+        kind: "Secret"