Fix resource editor api implementation (#281)

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

go.mod

@@ -46,7 +46,7 @@ require (
 	kmodules.xyz/custom-resources v0.29.0
 	kmodules.xyz/go-containerregistry v0.0.12
 	kmodules.xyz/monitoring-agent-api v0.29.0
-	kmodules.xyz/resource-metadata v0.18.2-0.20240118143554-f415526b8139
+	kmodules.xyz/resource-metadata v0.18.2-0.20240118152448-267a08d36cf0
 	kmodules.xyz/resource-metrics v0.29.0
 	kmodules.xyz/sets v0.29.0
 	kubeops.dev/scanner v0.0.16

go.sum

@@ -3456,8 +3456,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9
 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI=
 kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY=
 kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw=
-kmodules.xyz/resource-metadata v0.18.2-0.20240118143554-f415526b8139 h1:5aMsW8E+Cgvp5jgec/a7j8pQ2zfD00TyiZTuLu+Vw+0=
-kmodules.xyz/resource-metadata v0.18.2-0.20240118143554-f415526b8139/go.mod h1:I9HeSgkshwzwUy0IDhp4yIfRFbFQJ21syeSf4NsB04o=
+kmodules.xyz/resource-metadata v0.18.2-0.20240118152448-267a08d36cf0 h1:AH4FZ4XybovFyuPi0GuOMibM/ID2DVumdmxqic3SpHs=
+kmodules.xyz/resource-metadata v0.18.2-0.20240118152448-267a08d36cf0/go.mod h1:I9HeSgkshwzwUy0IDhp4yIfRFbFQJ21syeSf4NsB04o=
 kmodules.xyz/resource-metrics v0.29.0 h1:YBSVCbGdAugUqZK4igHu3fPhxvpYar4xejE6njryNM4=
 kmodules.xyz/resource-metrics v0.29.0/go.mod h1:OuG/QobZ7o8GFHl/u3lqaUR0fDZDegxtV8Vdh+MNBD4=
 kmodules.xyz/sets v0.29.0 h1:ZX/qOECzUob95JhhRtngJElHSlJ1UNNdwK4hTEy+nl0=

pkg/registry/meta/resourceeditor/storage.go

@@ -82,7 +82,10 @@ func (r *Storage) Get(ctx context.Context, name string, options *metav1.GetOptio
 	if err != nil {
 		return nil, kerr.NewNotFound(schema.GroupResource{Group: meta.GroupName, Resource: uiapi.ResourceKindResourceEditor}, name)
 	}
-	return complete(obj.DeepCopy()), err
+	return complete(&rsapi.ResourceEditor{
+		ObjectMeta: obj.ObjectMeta,
+		Spec:       *obj.Spec.DeepCopy(),
+	}), err
 }
 
 // Lister
@@ -116,7 +119,10 @@ func (r *Storage) List(ctx context.Context, options *metainternalversion.ListOpt
 		if options.LabelSelector != nil && !options.LabelSelector.Matches(labels.Set(obj.GetLabels())) {
 			continue
 		}
-		items = append(items, *complete(obj.DeepCopy()))
+		items = append(items, *complete(&rsapi.ResourceEditor{
+			ObjectMeta: obj.ObjectMeta,
+			Spec:       *obj.Spec.DeepCopy(),
+		}))
 	}
 
 	return &rsapi.ResourceEditorList{Items: items}, nil

vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourceeditor_types.go

@@ -16,9 +16,34 @@ limitations under the License.
 
 package v1alpha1
 
-import uiapi "kmodules.xyz/resource-metadata/apis/ui/v1alpha1"
+import (
+	uiapi "kmodules.xyz/resource-metadata/apis/ui/v1alpha1"
 
-type (
-	ResourceEditor     = uiapi.ResourceEditor
-	ResourceEditorList = uiapi.ResourceEditorList
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
+
+// +genclient
+// +genclient:nonNamespaced
+// +k8s:openapi-gen=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=resourceeditors,singular=resourceeditor,scope=Cluster
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+type ResourceEditor struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              uiapi.ResourceEditorSpec `json:"spec,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
+
+type ResourceEditorList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ResourceEditor `json:"items,omitempty"`
+}