use http trigger as the default trigger

Signed-off-by: wanjunlei <wanjunlei@kubesphere.io>
wanjunlei · May 26, 2023 · f1eafee · f1eafee
1 parent da591c7
commit f1eafee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/apis/core/v1beta2/function_webhook.go b/apis/core/v1beta2/function_webhook.go
@@ -101,6 +101,21 @@ func (r *Function) Default() {
 		r.Spec.Version = &version
 	}
 
+	if r.Spec.Serving.Triggers == nil {
+		r.Spec.Serving.Triggers = &Triggers{}
+	}
+
+	if len(r.Spec.Serving.Triggers.Dapr) == 0 {
+		if r.Spec.Serving.Triggers.Http == nil {
+			r.Spec.Serving.Triggers.Http = &HttpTrigger{}
+		}
+
+		if r.Spec.Serving.Triggers.Http.Port == nil || *r.Spec.Serving.Triggers.Http.Port == 0 {
+			port := int32(constants.DefaultFuncPort)
+			r.Spec.Serving.Triggers.Http.Port = &port
+		}
+	}
+
 	if r.Spec.Serving != nil &&
 		r.Spec.Serving.Triggers != nil &&
 		r.Spec.Serving.Triggers.Http != nil {
@@ -267,12 +282,6 @@ func (r *Function) ValidateBuild() error {
 }
 
 func (r *Function) ValidateServing() error {
-	if r.Spec.Serving.Triggers.Http == nil &&
-		(r.Spec.Serving.Triggers.Dapr == nil || len(r.Spec.Serving.Triggers.Dapr) == 0) {
-		return field.Required(field.NewPath("spec", "serving", "Triggers"),
-			"must specify one of: `http` or `dapr`")
-	}
-
 	if r.Spec.Serving.ScaleOptions != nil {
 		scaleOptions := r.Spec.Serving.ScaleOptions
 		minReplicas := int32(0)

diff --git a/apis/core/v1beta2/serving_types.go b/apis/core/v1beta2/serving_types.go
@@ -170,9 +170,9 @@ type Exporter struct {
 }
 
 type ServingImpl struct {
-	// Triggers used to trigge the Function.
+	// Triggers used to trigger the Function.
 	// +optional
-	Triggers *Triggers `json:"triggers"`
+	Triggers *Triggers `json:"triggers,omitempty"`
 	// The ScaleOptions will help us to set up guidelines for the autoscaling of function workloads.
 	// +optional
 	ScaleOptions *ScaleOptions `json:"scaleOptions,omitempty"`