Buildless adjust function api to old serverless (#1610)

Author: anoipm

components/buildless-serverless/api/v1alpha2/function_types.go

@@ -50,21 +50,31 @@ type FunctionSpec struct {
 	// Specifies an array of key-value pairs to be used as environment variables for the Function.
 	// You can define values as static strings or reference values from ConfigMaps or Secrets.
 	// For configuration details, see the [official Kubernetes documentation](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/).
-	// +kubebuilder:validation:XValidation:message="Following envs are reserved and cannot be used: ['FUNC_RUNTIME','FUNC_HANDLER','FUNC_PORT','FUNC_HANDLER_SOURCE','FUNC_HANDLER_DEPENDENCIES','MOD_NAME','NODE_PATH','PYTHONPATH']",rule="(self.all(e, !(e.name in ['FUNC_RUNTIME','FUNC_HANDLER','FUNC_PORT','MOD_NAME','NODE_PATH','PYTHONPATH'])))"
+	// +kubebuilder:validation:XValidation:message="Following envs are reserved and cannot be used: ['FUNC_RUNTIME','FUNC_HANDLER','FUNC_PORT','FUNC_HANDLER_SOURCE','FUNC_HANDLER_DEPENDENCIES','MOD_NAME','NODE_PATH','PYTHONPATH']",rule="(self.all(e, !(e.name in ['FUNC_RUNTIME','FUNC_HANDLER','FUNC_PORT','FUNC_HANDLER_SOURCE','FUNC_HANDLER_DEPENDENCIES','MOD_NAME','NODE_PATH','PYTHONPATH'])))"
 	Env []corev1.EnvVar `json:"env,omitempty"`
 
 	// Specifies resources requested by the Function and the build Job.
 	// +optional
 	ResourceConfiguration *ResourceConfiguration `json:"resourceConfiguration,omitempty"`
 
+	// Deprecated:
+	// This setting will be removed. Serverless no longer automatically creates HPA.
+	// +optional
+	ScaleConfig *ScaleConfig `json:"scaleConfig,omitempty"`
+
 	// Defines the exact number of Function's Pods to run at a time.
-	// If  the Function is targeted by an external scaler,
+	// If the Function is targeted by an external scaler,
 	// then the **Replicas** field is used by the relevant HorizontalPodAutoscaler to control the number of active replicas.
 	// +kubebuilder:validation:Minimum=0
 	// +kubebuilder:default:=1
 	// +optional
 	Replicas *int32 `json:"replicas,omitempty"`
 
+	// Deprecated: Use **Labels** and **Annotations** to label and/or annotate Function's Pods.
+	// +optional
+	// +kubebuilder:validation:XValidation:message="Not supported: Use spec.labels and spec.annotations to label and/or annotate Function's Pods.",rule="!has(self.labels) && !has(self.annotations)"
+	Template *Template `json:"template,omitempty"`
+
 	// Specifies Secrets to mount into the Function's container filesystem.
 	SecretMounts []SecretMount `json:"secretMounts,omitempty"`
 
@@ -155,6 +165,13 @@ type Repository struct {
 }
 
 type ResourceConfiguration struct {
+	// Deprecated: Specifies resources requested by the build Job's Pod.
+	// This setting will be removed. Functions don't require building images.
+	// +optional
+	// +kubebuilder:validation:XValidation:message="Use profile or resources",rule="has(self.profile) && !has(self.resources) || !has(self.profile) && has(self.resources)"
+	// +kubebuilder:validation:XValidation:message="Invalid profile, please use one of: ['local-dev','slow','normal','fast']",rule="(!has(self.profile) || self.profile in ['local-dev','slow','normal','fast'])"
+	Build *ResourceRequirements `json:"build,omitempty"`
+
 	// Specifies resources requested by the Function's Pod.
 	// +optional
 	// +kubebuilder:validation:XValidation:message="Use profile or resources",rule="has(self.profile) && !has(self.resources) || !has(self.profile) && has(self.resources)"
@@ -175,6 +192,16 @@ type ResourceRequirements struct {
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
+type ScaleConfig struct {
+	// Defines the minimum number of Function's Pods to run at a time.
+	// +kubebuilder:validation:Minimum:=1
+	MinReplicas *int32 `json:"minReplicas"`
+
+	// Defines the maximum number of Function's Pods to run at a time.
+	// +kubebuilder:validation:Minimum:=1
+	MaxReplicas *int32 `json:"maxReplicas"`
+}
+
 type SecretMount struct {
 	// Specifies the name of the Secret in the Function's Namespace.
 	// +kubebuilder:validation:Required
@@ -188,7 +215,16 @@ type SecretMount struct {
 	MountPath string `json:"mountPath"`
 }
 
-// FunctionStatus defines the observed state of Function.
+type Template struct {
+	// Deprecated: Use **FunctionSpec.Labels**  to label Function's Pods.
+	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// Deprecated: Use **FunctionSpec.Annotations** to annotate Function's Pods.
+	// +optional
+	Annotations map[string]string `json:"annotations,omitempty"`
+}
+
+// FunctionStatus defines the observed state of the Function.
 type FunctionStatus struct {
 	// Specifies the **Runtime** type of the Function.
 	Runtime Runtime `json:"runtime,omitempty"`
@@ -246,6 +282,14 @@ const (
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.podSelector
+// +kubebuilder:resource:categories={all},shortName={fn,fns}
+// +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="Configured",type="string",JSONPath=".status.conditions[?(@.type=='ConfigurationReady')].status"
+// +kubebuilder:printcolumn:name="Running",type="string",JSONPath=".status.conditions[?(@.type=='Running')].status"
+// +kubebuilder:printcolumn:name="Runtime",type="string",JSONPath=".spec.runtime"
+// +kubebuilder:printcolumn:name="Version",type="integer",JSONPath=".metadata.generation"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Function is the Schema for the functions API.
 type Function struct {