Merge branch 'main' into update-readme-with-shortname

Author: creydr

api/v1alpha1/function_types.go

@@ -23,8 +23,11 @@ import (
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:shortName=func
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="Ready status"
 // +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].reason",description="Ready reason"
+// +kubebuilder:printcolumn:name="Middleware",type="string",JSONPath=".status.middleware.current",description="Current deployed Middleware Version"
+// +kubebuilder:printcolumn:name="Pending Rebuild",type="string",JSONPath=".status.middleware.pendingRebuild",description="Pending Rebuild"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Function is the Schema for the functions API.

config/crd/bases/functions.dev_functions.yaml

@@ -11,6 +11,8 @@ spec:
     kind: Function
     listKind: FunctionList
     plural: functions
+    shortNames:
+    - func
     singular: function
   scope: Namespaced
   versions:
@@ -23,6 +25,14 @@ spec:
       jsonPath: .status.conditions[?(@.type=="Ready")].reason
       name: Reason
       type: string
+    - description: Current deployed Middleware Version
+      jsonPath: .status.middleware.current
+      name: Middleware
+      type: string
+    - description: Pending Rebuild
+      jsonPath: .status.middleware.pendingRebuild
+      name: Pending Rebuild
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date