Support generic resource in FunctionMesh CRD

Author: jiangpengcheng

api/compute/v1alpha1/common.go

@@ -369,20 +369,23 @@ const (
 
 // ResourceCondition The `Status` of a given `Condition` and the `Action` needed to reach the `Status`
 type ResourceCondition struct {
-	Condition ResourceConditionType  `json:"condition,omitempty"`
-	Status    metav1.ConditionStatus `json:"status,omitempty"`
-	Action    ReconcileAction        `json:"action,omitempty"`
+	Condition  ResourceConditionType  `json:"condition,omitempty"`
+	Status     metav1.ConditionStatus `json:"status,omitempty"`
+	Action     ReconcileAction        `json:"action,omitempty"`
+	ApiVersion string                 `json:"apiVersion,omitempty"`
+	Kind       string                 `json:"kind,omitempty"`
 }
 
 type ResourceConditionType string
 
 const (
 	Orphaned ResourceConditionType = "Orphaned"
 
-	MeshReady     ResourceConditionType = "MeshReady"
-	FunctionReady ResourceConditionType = "FunctionReady"
-	SourceReady   ResourceConditionType = "SourceReady"
-	SinkReady     ResourceConditionType = "SinkReady"
+	MeshReady            ResourceConditionType = "MeshReady"
+	FunctionReady        ResourceConditionType = "FunctionReady"
+	SourceReady          ResourceConditionType = "SourceReady"
+	SinkReady            ResourceConditionType = "SinkReady"
+	GenericResourceReady ResourceConditionType = "GenericResourceReady"
 
 	StatefulSetReady ResourceConditionType = "StatefulSetReady"
 	ServiceReady     ResourceConditionType = "ServiceReady"

api/compute/v1alpha1/functionmesh_types.go

@@ -29,20 +29,50 @@ type FunctionMeshSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	Sources   []SourceSpec   `json:"sources,omitempty"`
-	Sinks     []SinkSpec     `json:"sinks,omitempty"`
-	Functions []FunctionSpec `json:"functions,omitempty"`
+	Sources          []SourceSpec          `json:"sources,omitempty"`
+	Sinks            []SinkSpec            `json:"sinks,omitempty"`
+	Functions        []FunctionSpec        `json:"functions,omitempty"`
+	GenericResources []GenericResourceSpec `json:"genericResources,omitempty"`
+}
+
+type GenericResourceSpec struct {
+	// +kubebuilder:validation:Required
+	APIVersion string `json:"apiVersion"`
+
+	// +kubebuilder:validation:Required
+	Kind string `json:"kind"`
+
+	// +kubebuilder:validation:Required
+	Name string `json:"name"`
+
+	// the field in the resource used to get the spec, default to "spec"
+	// +kubebuilder:validation:Optional
+	SpecFieldName string `json:"specFieldName,omitempty"`
+
+	// the field in the resource used to get the status, default to "status"
+	// +kubebuilder:validation:Optional
+	StatusFieldName string `json:"statusFieldName,omitempty"`
+
+	// the spec fields of the resource
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Spec *Config `json:"spec,omitempty"`
+
+	// The filed in the `Status` field of Resource used to check whether the resource is ready
+	// should equal to ConditionTrue when it's ready
+	ReadyField string `json:"readyField,omitempty"`
 }
 
 // FunctionMeshStatus defines the observed state of FunctionMesh
 type FunctionMeshStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	SourceConditions   map[string]ResourceCondition `json:"sourceConditions,omitempty"`
-	SinkConditions     map[string]ResourceCondition `json:"sinkConditions,omitempty"`
-	FunctionConditions map[string]ResourceCondition `json:"functionConditions,omitempty"`
-	ObservedGeneration int64                        `json:"observedGeneration,omitempty"`
-	Condition          *ResourceCondition           `json:"condition,omitempty"`
+	SourceConditions          map[string]ResourceCondition `json:"sourceConditions,omitempty"`
+	SinkConditions            map[string]ResourceCondition `json:"sinkConditions,omitempty"`
+	FunctionConditions        map[string]ResourceCondition `json:"functionConditions,omitempty"`
+	GenericResourceConditions map[string]ResourceCondition `json:"genericCRConditions,omitempty"`
+	ObservedGeneration        int64                        `json:"observedGeneration,omitempty"`
+	Condition                 *ResourceCondition           `json:"condition,omitempty"`
 }
 
 // +genclient

api/compute/v1alpha1/zz_generated.deepcopy.go

@@ -6,7 +6,7 @@ metadata:
     {{- if eq .Values.admissionWebhook.certificate.provider "cert-manager" }}
       {{- include "function-mesh-operator.certManager.annotation" . | nindent 4 -}}
     {{- end }}
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: backendconfigs.compute.functionmesh.io
 spec:
   conversion: