wip

kyma-project · Aug 25, 2023 · bd94206 · bd94206
1 parent dee9f9c
commit bd94206
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/components/function-controller/config/crd/bases/serverless.kyma-project.io_functions.yaml b/components/function-controller/config/crd/bases/serverless.kyma-project.io_functions.yaml
@@ -240,9 +240,12 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                        x-kubernetes-validations:
+                        - message: Limit for CPU
+                          rule: has(self.resources.requests) && 'cpu' in has(self.resources.requests)
                     type: object
                     x-kubernetes-validations:
-                    - message: Profile or resolurces
+                    - message: Profile or resources
                       rule: has(self.profile) && !has(self.resources) || !has(self.profile)
                         && has(self.resources)
                   function:
@@ -281,7 +284,14 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                        x-kubernetes-validations:
+                        - message: Limit for CPU
+                          rule: has(self.resources.requests) && 'cpu' in has(self.resources.requests)
                     type: object
+                    x-kubernetes-validations:
+                    - message: Profile or resources
+                      rule: has(self.profile) && !has(self.resources) || !has(self.profile)
+                        && has(self.resources)
                 type: object
               runtime:
                 description: Specifies the runtime of the Function. The available

diff --git a/components/function-controller/fn.yaml b/components/function-controller/fn.yaml
@@ -12,7 +12,7 @@ spec:
             return "hello world"
   resourceConfiguration:
     build:
-      profile: XL
+#      profile: XL
       resources:
         limits:
           cpu: 100m

diff --git a/components/function-controller/pkg/apis/serverless/v1alpha2/function_types.go b/components/function-controller/pkg/apis/serverless/v1alpha2/function_types.go
@@ -114,6 +114,7 @@ type ResourceRequirements struct {
 	// Can't be used together with **Profile**.
 	// For configuration details, see the [official Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/).
 	// +optional
+	// +kubebuilder:validation:XValidation:message="Limit for CPU",rule="has(self.resources.requests) && 'cpu' in has(self.resources.requests)"
 	Resources *v1.ResourceRequirements `json:"resources,omitempty"`
 }
 
@@ -135,6 +136,7 @@ type ResourceConfiguration struct {
 
 	// Specifies resources requested by the Function's Pod.
 	// +optional
+	// +kubebuilder:validation:XValidation:message="Profile or resources",rule="has(self.profile) && !has(self.resources) || !has(self.profile) && has(self.resources)"
 	Function *ResourceRequirements `json:"function,omitempty"`
 }
 

diff --git a/installation/resources/crds/serverless/crd-serverless.yaml b/installation/resources/crds/serverless/crd-serverless.yaml
@@ -239,9 +239,12 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                        x-kubernetes-validations:
+                        - message: Limit for CPU
+                          rule: has(self.resources.requests) && 'cpu' in has(self.resources.requests)
                     type: object
                     x-kubernetes-validations:
-                    - message: Profile or resolurces
+                    - message: Profile or resources
                       rule: has(self.profile) && !has(self.resources) || !has(self.profile)
                         && has(self.resources)
                   function:
@@ -280,7 +283,14 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                        x-kubernetes-validations:
+                        - message: Limit for CPU
+                          rule: has(self.resources.requests) && 'cpu' in has(self.resources.requests)
                     type: object
+                    x-kubernetes-validations:
+                    - message: Profile or resources
+                      rule: has(self.profile) && !has(self.resources) || !has(self.profile)
+                        && has(self.resources)
                 type: object
               runtime:
                 description: Specifies the runtime of the Function. The available

diff --git a/resources/serverless/templates/crds.yaml b/resources/serverless/templates/crds.yaml
@@ -239,9 +239,12 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                        x-kubernetes-validations:
+                        - message: Limit for CPU
+                          rule: has(self.resources.requests) && 'cpu' in has(self.resources.requests)
                     type: object
                     x-kubernetes-validations:
-                    - message: Profile or resolurces
+                    - message: Profile or resources
                       rule: has(self.profile) && !has(self.resources) || !has(self.profile)
                         && has(self.resources)
                   function:
@@ -280,7 +283,14 @@ spec:
                               More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                             type: object
                         type: object
+                        x-kubernetes-validations:
+                        - message: Limit for CPU
+                          rule: has(self.resources.requests) && 'cpu' in has(self.resources.requests)
                     type: object
+                    x-kubernetes-validations:
+                    - message: Profile or resources
+                      rule: has(self.profile) && !has(self.resources) || !has(self.profile)
+                        && has(self.resources)
                 type: object
               runtime:
                 description: Specifies the runtime of the Function. The available