Merge pull request #22 from jinminhao/buildAnnotations

Build annotations and bug fix
PaddleFlow · Jan 13, 2021 · abffb39 · abffb39
2 parents 490045c + ef38a97
commit abffb39
Show file tree

Hide file tree

Showing 10 changed files with 320 additions and 51 deletions.
diff --git a/config/crd/bases/elasticserving.paddlepaddle.org_paddleservices.yaml b/config/crd/bases/elasticserving.paddlepaddle.org_paddleservices.yaml
@@ -34,13 +34,6 @@ spec:
             deploymentName:
               maxLength: 64
               type: string
-            port:
-              format: int32
-              type: integer
-            replicas:
-              format: int32
-              minimum: 0
-              type: integer
             resources:
               properties:
                 limits:
@@ -62,6 +55,34 @@ spec:
               type: object
             runtimeVersion:
               type: string
+            service:
+              properties:
+                autoscaler:
+                  enum:
+                  - kpa.autoscaling.knative.dev
+                  - hpa.autoscaling.knative.dev
+                  type: string
+                maxScale:
+                  type: integer
+                metric:
+                  enum:
+                  - concurrency
+                  - rps
+                  - cpu
+                  type: string
+                minScale:
+                  type: integer
+                panicThreshold:
+                  type: string
+                panicWindow:
+                  type: string
+                target:
+                  type: integer
+                targetUtilization:
+                  type: string
+                window:
+                  type: string
+              type: object
             storageUri:
               type: string
           required:
@@ -78,8 +99,6 @@ spec:
               additionalProperties:
                 type: string
               type: object
-            canaryTraffic:
-              type: integer
             conditions:
               items:
                 properties:
@@ -114,8 +133,6 @@ spec:
               format: int32
               minimum: 0
               type: integer
-            traffic:
-              type: integer
             url:
               type: string
           type: object

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -6,13 +6,41 @@ metadata:
   creationTimestamp: null
   name: manager-role
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:
   - events
   verbs:
   - create
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - '*'
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts
+  verbs:
+  - create
+  - get
+  - list
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - '*'
 - apiGroups:
   - apps
   resources:
@@ -89,3 +117,39 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  verbs:
+  - create
+  - get
+  - list
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - roles
+  verbs:
+  - create
+  - get
+  - list
+- apiGroups:
+  - serving.knative.dev
+  resources:
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - serving.knative.dev
+  resources:
+  - services/status
+  verbs:
+  - get
+  - patch
+  - update
diff --git a/config/samples/elasticserving_v1_paddle.yaml b/config/samples/elasticserving_v1_paddle.yaml
@@ -5,13 +5,10 @@ metadata:
   namespace: paddleservice-system
 spec:
   # Add fields here
-  resources:
-    requests:
-      cpu: 80m
   deploymentName: paddleservice
-  replicas: 2
   storageUri: hub.baidubce.com/paddlepaddle/serving:latest
   runtimeVersion: paddleserving
-  port: 9292
+  service:
+    minScale: 2
   # storageUri: nginx:latest
   # runtimeVersion: nginx
diff --git a/pkg/apis/elasticserving/v1/paddleservice_status.go b/pkg/apis/elasticserving/v1/paddleservice_status.go
@@ -54,8 +54,12 @@ func (ss *PaddleServiceStatus) GetCondition(t apis.ConditionType) *apis.Conditio
 	return conditionSet.Manage(ss).GetCondition(t)
 }
 
-func (ss *PaddleServiceStatus) propagateStatus(conditionType apis.ConditionType, serviceStatus *knservingv1.ServiceStatus) {
+func (ss *PaddleServiceStatus) PropagateStatus(serviceStatus *knservingv1.ServiceStatus) {
+	conditionType := DefaultPaddleServiceReady
 	statusSpec := StatusConfigurationSpec{}
+	if ss.Default == nil {
+		ss.Default = &statusSpec
+	}
 	statusSpec.Name = serviceStatus.LatestCreatedRevisionName
 	serviceCondition := serviceStatus.GetCondition(knservingv1.ServiceConditionReady)
 

diff --git a/pkg/apis/elasticserving/v1/paddleservice_types.go b/pkg/apis/elasticserving/v1/paddleservice_types.go
@@ -39,12 +39,39 @@ type PaddleServiceSpec struct {
 	// Defaults to requests and limits of 1CPU, 2Gb MEM.
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 	// +optional
-	// +kubebuilder:validation:Minimum=0
-	Replicas *int32 `json:"replicas,omitempty"`
-	// Port
-	Port int32 `json:"port,omitempty"`
+	Service ServiceSpec `json:"service,omitempty"`
+}
+
+// ServiceSpec defines the configuration for Knative Service.
+type ServiceSpec struct {
+	//+optional
+	Autoscaler Autoscaler `json:"autoscaler,omitempty"`
+	//+optional
+	Metric AutoscalerMetric `json:"metric,omitempty"`
+	//+optional
+	Window string `json:"window,omitempty"`
+	//+optional
+	PanicWindow string `json:"panicWindow,omitempty"`
+	//+optional
+	PanicThreshold string `json:"panicThreshold,omitempty"`
+	//+optional
+	MinScale *int `json:"minScale,omitempty"`
+	//+optional
+	MaxScale int `json:"maxScale,omitempty"`
+	//+optional
+	Target int `json:"target,omitempty"`
+	//+optional
+	TargetUtilization string `json:"targetUtilization,omitempty"`
 }
 
+// Autoscaler defines the autoscaler class
+//+kubebuilder:validation:Enum=kpa.autoscaling.knative.dev;hpa.autoscaling.knative.dev
+type Autoscaler string
+
+// AutoscalerMetric defines the metric for the autoscaler
+//+kubebuilder:validation:Enum=concurrency;rps;cpu
+type AutoscalerMetric string
+
 // PaddleServiceStatus defines the observed state of PaddleService
 type PaddleServiceStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
@@ -53,11 +80,6 @@ type PaddleServiceStatus struct {
 	duckv1beta1.Status `json:",inline"`
 	// URL of the PaddleService
 	URL string `json:"url,omitempty"`
-	// Traffic percentage that goes to default services
-	Traffic int `json:"traffic,omitempty"`
-	// Traffic percentage that goes to canary services
-	CanaryTraffic int `json:"canaryTraffic,omitempty"`
-
 	// Statuses for the default endpoints of the PaddleService
 	Default *StatusConfigurationSpec `json:"default,omitempty"`
 	// Addressable URL for eventing

diff --git a/pkg/apis/elasticserving/v1/zz_generated.deepcopy.go b/pkg/apis/elasticserving/v1/zz_generated.deepcopy.go
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -1,5 +1,9 @@
 package constants
 
+import (
+	"knative.dev/serving/pkg/apis/autoscaling"
+)
+
 // PaddleService Key
 const (
 	PaddleService               = "paddleService"
@@ -19,10 +23,33 @@ var (
 
 // PaddleService resource defaults
 var (
-	PaddleServiceDefaultCPU      = "0.1"
-	PaddleServiceDefaultMemory   = "128Mi"
-	PaddleServiceDefaultMinScale = 0 // 0 if scale-to-zero is desired
-	PaddleServiceDefaultMaxScale = 0 // 0 means limitless
+	PaddleServiceDefaultCPU                               = "0.1"
+	PaddleServiceDefaultMemory                            = "128Mi"
+	PaddleServiceDefaultMinScale                          = 1  // 0 if scale-to-zero is desired
+	PaddleServiceDefaultMaxScale                          = 10 // 0 means limitless
+	PaddleServiceDefaultTimeout                     int64 = 300
+	PaddleServiceDefaultScalingClass                      = autoscaling.KPA // kpa or hpa
+	PaddleServiceDefaultScalingMetric                     = "concurrency"   // concurrency, rps or cpu (hpa required)
+	PaddleServiceDefaultScalingTarget                     = 100
+	PaddleServiceDefaultTargetUtilizationPercentage       = "70"
+	PaddleServiceDefaultWindow                            = "60s"
+	PaddleServiceDefaultPanicWindow                       = "10" // percentage of StableWindow
+	PaddleServiceDefaultPanicThreshold                    = "200"
+)
+
+var (
+	ServiceAnnotationsList = []string{
+		autoscaling.MinScaleAnnotationKey,
+		autoscaling.MaxScaleAnnotationKey,
+		autoscaling.ClassAnnotationKey,
+		autoscaling.MetricAnnotationKey,
+		autoscaling.TargetAnnotationKey,
+		autoscaling.TargetUtilizationPercentageKey,
+		autoscaling.WindowAnnotationKey,
+		autoscaling.PanicWindowPercentageAnnotationKey,
+		autoscaling.PanicThresholdPercentageAnnotationKey,
+		"kubectl.kubernetes.io/last-applied-configuration",
+	}
 )
 
 func DefaultServiceName(name string) string {

diff --git a/pkg/controllers/elasticserving/reconcilers/knative/service_reconciler.go b/pkg/controllers/elasticserving/reconcilers/knative/service_reconciler.go
@@ -37,6 +37,18 @@ func NewServiceReconciler(client client.Client, scheme *runtime.Scheme, configMa
 	}
 }
 
+// +kubebuilder:rbac:groups=serving.knative.dev,resources=services,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=serving.knative.dev,resources=services/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=roles,verbs=get;list;create;
+// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=rolebindings,verbs=get;list;create;
+// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=get;list;create;
+// +kubebuilder:rbac:groups="",resources=services,verbs=*
+// +kubebuilder:rbac:groups="",resources=pods,verbs=*
+// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
+// +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch
+// +kubebuilder:rbac:groups=elasticserving.paddlepaddle.org,resources=paddlesvcs,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=elasticserving.paddlepaddle.org,resources=paddlesvcs/status,verbs=get;update;patch
+
 func (r *ServiceReconciler) Reconcile(paddlesvc *elasticservingv1.PaddleService) error {
 	var service *knservingv1.Service
 	var err error
@@ -52,14 +64,17 @@ func (r *ServiceReconciler) Reconcile(paddlesvc *elasticservingv1.PaddleService)
 		}
 
 		// TODO: Modify status
+		// paddlesvc.Status.PropagateStatus(nil)
 		return nil
 	}
 
 	if _, err := r.reconcileService(paddlesvc, service); err != nil {
 		return err
+	} else {
+		// TODO: Modify status
+		// paddlesvc.Status.PropagateStatus(status)
 	}
 
-	// TODO: Modify status
 	return nil
 }