Fix slices values

The only valid slice type for `unstructured` is `[]any` or `[]interface{}`.
vshn · Jan 7, 2025 · 7bbb14d · 7bbb14d
1 parent efb45b7
commit 7bbb14d
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 52 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/apis/.DS_Store b/apis/.DS_Store
diff --git a/apis/apiserver/.DS_Store b/apis/apiserver/.DS_Store
diff --git a/apis/vshn/.DS_Store b/apis/vshn/.DS_Store
diff --git a/docs/modules/ROOT/assets/.DS_Store b/docs/modules/ROOT/assets/.DS_Store
diff --git a/pkg/.DS_Store b/pkg/.DS_Store
diff --git a/pkg/apiserver/.DS_Store b/pkg/apiserver/.DS_Store
diff --git a/pkg/apiserver/vshn/.DS_Store b/pkg/apiserver/vshn/.DS_Store
diff --git a/pkg/comp-functions/functions/vshnnextcloud/deploy.go b/pkg/comp-functions/functions/vshnnextcloud/deploy.go
@@ -22,7 +22,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/yaml"
 )
 
 const (
@@ -397,57 +396,54 @@ func newRelease(ctx context.Context, svc *runtime.ServiceRuntime, comp *vshnv1.V
 }
 
 func configureCronSidecar(values map[string]interface{}, version string) error {
-	extraSidecarContainers := map[string]any{
-		"name": "cron",
-		"command": []string{
-			"/cron.sh",
-		},
-		"image": "nextcloud:" + version,
-		"volumeMounts": []map[string]any{
-			{
-				"mountPath": "/var/www",
-				"name":      "nextcloud-data",
-				"subpath":   "root",
-			},
-			{
-				"mountPath": "/var/www/html",
-				"name":      "nextcloud-data",
-				"subPath":   "html",
+	extraSidecarContainers := []any{
+		map[string]any{
+			"name": "cron",
+			"command": []any{
+				"/cron.sh",
 			},
-			{
-				"mountPath": "/var/www/html/data",
-				"name":      "nextcloud-data",
-				"subPath":   "data",
-			},
-			{
-				"mountPath": "/var/www/html/config",
-				"name":      "nextcloud-data",
-				"subPath":   "config",
-			},
-			{
-				"mountPath": "/var/www/html/custom_apps",
-				"name":      "nextcloud-data",
-				"subPath":   "custom_apps",
-			},
-			{
-				"mountPath": "/var/www/tmp",
-				"name":      "nextcloud-data",
-				"subPath":   "tmp",
-			},
-			{
-				"mountPath": "/var/www/html/themes",
-				"name":      "nextcloud-data",
-				"subPath":   "themes",
+			"image": "nextcloud:" + version,
+			"volumeMounts": []any{
+				map[string]any{
+					"mountPath": "/var/www",
+					"name":      "nextcloud-data",
+					"subpath":   "root",
+				},
+				map[string]any{
+					"mountPath": "/var/www/html",
+					"name":      "nextcloud-data",
+					"subPath":   "html",
+				},
+				map[string]any{
+					"mountPath": "/var/www/html/data",
+					"name":      "nextcloud-data",
+					"subPath":   "data",
+				},
+				map[string]any{
+					"mountPath": "/var/www/html/config",
+					"name":      "nextcloud-data",
+					"subPath":   "config",
+				},
+				map[string]any{
+					"mountPath": "/var/www/html/custom_apps",
+					"name":      "nextcloud-data",
+					"subPath":   "custom_apps",
+				},
+				map[string]any{
+					"mountPath": "/var/www/tmp",
+					"name":      "nextcloud-data",
+					"subPath":   "tmp",
+				},
+				map[string]any{
+					"mountPath": "/var/www/html/themes",
+					"name":      "nextcloud-data",
+					"subPath":   "themes",
+				},
 			},
 		},
 	}
 
-	stringSidecarContainers, err := toYAML(extraSidecarContainers)
-	if err != nil {
-		return fmt.Errorf("cannot parse extraSidecarContainers: %w", err)
-	}
-
-	return unstructured.SetNestedField(values, []string{stringSidecarContainers}, []string{"nextcloud", "extraSidecarContainers"}...)
+	return unstructured.SetNestedSlice(values, extraSidecarContainers, []string{"nextcloud", "extraSidecarContainers"}...)
 }
 
 func addApacheConfig(svc *runtime.ServiceRuntime, comp *vshnv1.VSHNNextcloud) error {
@@ -505,8 +501,3 @@ func validateFQDNs(fqdns []string) error {
 	}
 	return nil
 }
-
-func toYAML(obj any) (string, error) {
-	yamlBytes, err := yaml.Marshal(obj)
-	return string(yamlBytes), err
-}