Merge resource editor when loaded from cluster with missing defaults

Signed-off-by: Tamal Saha <[email protected]>

Author: tamalsaha

go.mod

@@ -32,7 +32,7 @@ require (
 	kmodules.xyz/client-go v0.24.0
 	kmodules.xyz/custom-resources v0.24.0
 	kmodules.xyz/monitoring-agent-api v0.24.0
-	kmodules.xyz/resource-metadata v0.11.4-0.20220615081635-1e5360d67b56
+	kmodules.xyz/resource-metadata v0.11.4-0.20220616232800-ad7e72b89ad2
 	kmodules.xyz/resource-metrics v0.10.1
 	kmodules.xyz/sets v0.24.0
 	kubepack.dev/kubepack v0.4.0

go.sum

@@ -1791,8 +1791,8 @@ kmodules.xyz/monitoring-agent-api v0.24.0 h1:CPFvzDppUKckMBLwaMnZbpYCuP7+NhcS4t7
 kmodules.xyz/monitoring-agent-api v0.24.0/go.mod h1:lu1TmXRMx9IcjMpY8s5nc4HNOhOix5/z9caEnbL8JxA=
 kmodules.xyz/offshoot-api v0.24.1 h1:8KCVNkLwdebzWmHcTdZPTQGxqI92bqA+vrmz65ueULY=
 kmodules.xyz/offshoot-api v0.24.1/go.mod h1:fYu0051hoJXXs70OjmIE+Q5smOgmzvYFhRJXCiFShaY=
-kmodules.xyz/resource-metadata v0.11.4-0.20220615081635-1e5360d67b56 h1:8W1WbxolW1CQb6fxlbCA3q2Ml+5tHbsxTSx9kI0AA44=
-kmodules.xyz/resource-metadata v0.11.4-0.20220615081635-1e5360d67b56/go.mod h1:N3pgffPM+AOTBfswdZvCfFsB1IuZ8yzAceZAlnCm1eA=
+kmodules.xyz/resource-metadata v0.11.4-0.20220616232800-ad7e72b89ad2 h1:klAVnT4sw3RBG58fYxcbNVsCdVVymrbFsYjreU7AOZE=
+kmodules.xyz/resource-metadata v0.11.4-0.20220616232800-ad7e72b89ad2/go.mod h1:N3pgffPM+AOTBfswdZvCfFsB1IuZ8yzAceZAlnCm1eA=
 kmodules.xyz/resource-metrics v0.10.1 h1:q1dhk0eYxkZqd1peRy9wHGd8tOktBBH3kzgeTVaNBiY=
 kmodules.xyz/resource-metrics v0.10.1/go.mod h1:YK0hjiLq6oBaGROmLSVcVDbmEgSxT1vpt8BCZZ+9teY=
 kmodules.xyz/sets v0.24.0 h1:GbltLEPVnURjcmWyf8eFstgJBpm9o151wsrABkByGrc=

vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/lib.go

@@ -119,13 +119,46 @@ func LoadByGVR(kc client.Client, gvr schema.GroupVersionResource) (*v1alpha1.Res
 	var ed v1alpha1.ResourceEditor
 	err := kc.Get(context.TODO(), client.ObjectKey{Name: DefaultEditorName(gvr)}, &ed)
 	if err == nil {
-		return &ed, true
+		d, _ := LoadDefaultByGVR(gvr)
+		return merge(&ed, d), true
 	} else if client.IgnoreNotFound(err) != nil {
 		klog.V(3).InfoS(fmt.Sprintf("failed to load resource editor for %+v", gvr))
 	}
 	return LoadDefaultByGVR(gvr)
 }
 
+func merge(in, d *v1alpha1.ResourceEditor) *v1alpha1.ResourceEditor {
+	if d == nil {
+		return in
+	}
+
+	in.Labels = d.Labels
+	in.Spec.Resource = d.Spec.Resource
+
+	if d.Spec.UI != nil {
+		if in.Spec.UI == nil {
+			in.Spec.UI = &v1alpha1.UIParameters{
+				InstanceLabelPaths: d.Spec.UI.InstanceLabelPaths,
+			}
+		}
+
+		if d.Spec.UI.Options != nil && in.Spec.UI.Options == nil {
+			in.Spec.UI.Options = d.Spec.UI.Options
+		}
+		if d.Spec.UI.Editor != nil && in.Spec.UI.Editor == nil {
+			in.Spec.UI.Editor = d.Spec.UI.Editor
+		}
+	}
+
+	if len(in.Spec.Icons) == 0 {
+		in.Spec.Icons = d.Spec.Icons
+	}
+	if in.Spec.Installer == nil {
+		in.Spec.Installer = d.Spec.Installer
+	}
+	return in
+}
+
 func LoadByResourceID(kc client.Client, rid *kmapi.ResourceID) (*v1alpha1.ResourceEditor, bool) {
 	if rid == nil {
 		return nil, false

vendor/modules.txt

@@ -1900,7 +1900,7 @@ kmodules.xyz/monitoring-agent-api/client
 # kmodules.xyz/offshoot-api v0.24.1
 ## explicit; go 1.18
 kmodules.xyz/offshoot-api/api/v1
-# kmodules.xyz/resource-metadata v0.11.4-0.20220615081635-1e5360d67b56
+# kmodules.xyz/resource-metadata v0.11.4-0.20220616232800-ad7e72b89ad2
 ## explicit; go 1.18
 kmodules.xyz/resource-metadata/apis/core/install
 kmodules.xyz/resource-metadata/apis/core/v1alpha1