[edgefunction] Split revisions into separate top-level object

Author: dilyevsky

api/extensions/v1alpha1/edgefunction_hooks.go

@@ -40,10 +40,6 @@ func (r *EdgeFunction) Default() {
 			r.Spec.Runtime.Port = ptr.To(int32(8080))
 		}
 	}
-
-	if r.Status.Phase == "" {
-		r.Status.Phase = EdgeFunctionPhasePreparing
-	}
 }
 
 var _ resourcestrategy.Validater = &EdgeFunction{}

api/extensions/v1alpha1/edgefunction_types.go

@@ -240,49 +240,11 @@ type EdgeFunctionSpec struct {
 	Runtime *EdgeFunctionRuntime `json:"runtime,omitempty"`
 }
 
-type EdgeFunctionRevision struct {
-	// Ref is the reference to the function revision.
-	Ref string `json:"ref"`
-
-	// CreatedAt is the time the function revision was created.
-	CreatedAt metav1.Time `json:"createdAt"`
-
-	// Conditions describe the current conditions of the revision.
-	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-}
-
-type EdgeFunctionPhase string
-
-const (
-	// EdgeFunctionPhasePreparing means the function is being prepared.
-	EdgeFunctionPhasePreparing EdgeFunctionPhase = "Preparing"
-	// EdgeFunctionPhaseReady means the function is ready.
-	EdgeFunctionPhaseReady EdgeFunctionPhase = "Ready"
-	// EdgeFunctionPhaseUpdating means the function is being updated.
-	EdgeFunctionPhaseUpdating EdgeFunctionPhase = "Updating"
-	// EdgeFunctionPhaseNotReady means the function has no revisions ready to be used.
-	EdgeFunctionPhaseNotReady EdgeFunctionPhase = "NotReady"
-	// EdgeFunctionPhaseUnknown means the function is in an unknown state.
-	EdgeFunctionPhaseUnknown EdgeFunctionPhase = "Unknown"
-)
-
 type EdgeFunctionStatus struct {
-	// Phase is the current phase of the function.
-	Phase EdgeFunctionPhase `json:"phase"`
-
-	// Message is a human-readable message indicating details about the function.
-	// +optional
-	Message string `json:"message,omitempty"`
-
-	// Revisions is a list of function revisions.
-	// Latest revision is the first element in the list.
-	// +optional
-	Revisions []EdgeFunctionRevision `json:"revisions,omitempty"`
-
-	// Live is the reference to the live function revision.
+	// LiveRevision is the revision of the function that is currently being served
+	// referenced by EdgeFunctionRevision object name.
 	// +optional
-	Live string `json:"live,omitempty"`
+	LiveRevision string `json:"liveRevision,omitempty"`
 
 	// Conditions describe the current conditions of the EdgeFunction.
 	// +optional

api/extensions/v1alpha1/edgefunctionrevision_types.go

@@ -0,0 +1,112 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/apiserver-runtime/pkg/builder/resource"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:subresource:log
+
+// +genclient
+// +genclient:nonNamespaced
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+//
+// EdgeFunctionRevision is a single revision of an EdgeFunction
+type EdgeFunctionRevision struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec EdgeFunctionSpec `json:"spec,omitempty"`
+
+	Status EdgeFunctionRevisionStatus `json:"status,omitempty"`
+}
+
+var (
+	_ runtime.Object                       = &EdgeFunctionRevision{}
+	_ resource.Object                      = &EdgeFunctionRevision{}
+	_ resource.ObjectWithStatusSubResource = &EdgeFunctionRevision{}
+	_ rest.SingularNameProvider            = &EdgeFunctionRevision{}
+)
+
+// GetObjectMeta implements resource.Object
+func (e *EdgeFunctionRevision) GetObjectMeta() *metav1.ObjectMeta {
+	return &e.ObjectMeta
+}
+
+// NamespaceScoped implements resource.Object
+func (e *EdgeFunctionRevision) NamespaceScoped() bool {
+	return false
+}
+
+// New implements resource.Object
+func (e *EdgeFunctionRevision) New() runtime.Object {
+	return &EdgeFunctionRevision{}
+}
+
+// NewList implements resource.Object
+func (e *EdgeFunctionRevision) NewList() runtime.Object {
+	return &EdgeFunctionRevisionList{}
+}
+
+// GetGroupVersionResource implements object.Object
+func (e *EdgeFunctionRevision) GetGroupVersionResource() schema.GroupVersionResource {
+	return schema.GroupVersionResource{
+		Group:    SchemeGroupVersion.Group,
+		Version:  SchemeGroupVersion.Version,
+		Resource: "edgefunctionrevisions",
+	}
+}
+
+// IsStorageVersion implements resource.Object
+func (e *EdgeFunctionRevision) IsStorageVersion() bool {
+	return true
+}
+
+// GetStatus implements resource.ObjectWithStatusSubResource
+func (e *EdgeFunctionRevision) GetStatus() resource.StatusSubResource {
+	return &e.Status
+}
+
+// GetSingularName implements rest.SingularNameProvider
+func (e *EdgeFunctionRevision) GetSingularName() string {
+	return "edgefunctionrevision"
+}
+
+// EdgeFunctionRevisionStatus defines the observed state of EdgeFunctionRevision
+type EdgeFunctionRevisionStatus struct {
+	// Ref is the functions' uniquely identifying reference.
+	Ref string `json:"ref"`
+
+	// Conditions represent the latest available observations of an EdgeFunctionRevision's current state.
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
+var _ resource.StatusSubResource = &EdgeFunctionRevisionStatus{}
+
+func (ps *EdgeFunctionRevisionStatus) SubResourceName() string {
+	return "status"
+}
+
+func (ps *EdgeFunctionRevisionStatus) CopyTo(parent resource.ObjectWithStatusSubResource) {
+	parent.(*EdgeFunctionRevision).Status = *ps
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type EdgeFunctionRevisionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []EdgeFunctionRevision `json:"items"`
+}
+
+var _ resource.ObjectList = &EdgeFunctionRevisionList{}
+
+func (pl *EdgeFunctionRevisionList) GetListMeta() *metav1.ListMeta {
+	return &pl.ListMeta
+}