fix crd

kyma-project · Oct 5, 2023 · dd7e7e8 · dd7e7e8
1 parent 9643df2
commit dd7e7e8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 20 deletions.
diff --git a/components/function-controller/Makefile b/components/function-controller/Makefile
@@ -43,7 +43,7 @@ manifests: controller-gen-local generate-local
 	kustomize build config/crd > config/crd/crd-serverless.yaml
 	cp config/crd/crd-serverless.yaml ../../installation/resources/crds/serverless/
 	cp config/crd/crd-serverless.yaml ../../resources/serverless/templates/crds.yaml
-	(cd ../../hack/table-gen && make serverless-docs )
+	#(cd ../../hack/table-gen && make serverless-docs )
 
 # Generate code
 .PHONY: generate-local

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
@@ -242,9 +242,6 @@ 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
@@ -286,9 +283,6 @@ 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

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,7 +114,6 @@ 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"`
 }
 

diff --git a/components/function-controller/pkg/apis/serverless/v1alpha2/function_validation_test.go b/components/function-controller/pkg/apis/serverless/v1alpha2/function_validation_test.go
@@ -962,6 +962,7 @@ func Test_XKubernetesValidations(t *testing.T) {
 			err := k8sClient.Create(ctx, tc.fn)
 			//THEN
 			require.Error(t, err)
+			//TODO: cast err to v1.Status and from details, I can get causes with Type, Message and field
 		})
 	}
 }
diff --git a/installation/resources/crds/serverless/crd-serverless.yaml b/installation/resources/crds/serverless/crd-serverless.yaml
@@ -241,9 +241,6 @@ 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
@@ -285,9 +282,6 @@ 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

diff --git a/resources/serverless/templates/crds.yaml b/resources/serverless/templates/crds.yaml
@@ -241,9 +241,6 @@ 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
@@ -285,9 +282,6 @@ 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