remove check & maxItems

Signed-off-by: Omer Aplatony <[email protected]>

Author: omerap12

vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes/kubernetes/pull/63797
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: verticalpodautoscalercheckpoints.autoscaling.k8s.io
 spec:
   group: autoscaling.k8s.io
@@ -225,7 +225,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes/kubernetes/pull/63797
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: verticalpodautoscalers.autoscaling.k8s.io
 spec:
   group: autoscaling.k8s.io
@@ -379,12 +379,6 @@ spec:
                           - "Off"
                           type: string
                       type: object
-                      x-kubernetes-validations:
-                      - message: ControlledValues shouldn't be specified if container
-                          scaling mode is off
-                        rule: '!has(self.mode) || !has(self.controlledValues) || self.mode
-                          != ''Off'' || self.controlledValues != ''RequestsAndLimits'''
-                    maxItems: 100
                     type: array
                 type: object
               targetRef:

vertical-pod-autoscaler/pkg/admission-controller/resource/vpa/handler.go

@@ -136,6 +136,12 @@ func ValidateVPA(vpa *vpa_types.VerticalPodAutoscaler, isCreate bool) error {
 					return fmt.Errorf("MaxAllowed: %v", err)
 				}
 			}
+			ControlledValues := policy.ControlledValues
+			if mode != nil && ControlledValues != nil {
+				if *mode == vpa_types.ContainerScalingModeOff && *ControlledValues == vpa_types.ContainerControlledValuesRequestsAndLimits {
+					return fmt.Errorf("ControlledValues shouldn't be specified if container scaling mode is off.")
+				}
+			}
 		}
 	}
 	return nil

vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go

@@ -185,13 +185,11 @@ type PodResourcePolicy struct {
 	// +optional
 	// +patchMergeKey=containerName
 	// +patchStrategy=merge
-	// +kubebuilder:validation:MaxItems=100
 	ContainerPolicies []ContainerResourcePolicy `json:"containerPolicies,omitempty" patchStrategy:"merge" patchMergeKey:"containerName" protobuf:"bytes,1,rep,name=containerPolicies"`
 }
 
 // ContainerResourcePolicy controls how autoscaler computes the recommended
 // resources for a specific container.
-// +kubebuilder:validation:XValidation:rule="!has(self.mode) || !has(self.controlledValues) || self.mode != 'Off' || self.controlledValues != 'RequestsAndLimits'",message="ControlledValues shouldn't be specified if container scaling mode is off"
 type ContainerResourcePolicy struct {
 	// Name of the container or DefaultContainerResourcePolicy, in which
 	// case the policy is used by the containers that don't have their own