Skip to content

Commit b8a050f

Browse files
fernando-villalbafernando-villalba
committed
fix: optimize CEL validation cost and refactor controller tests
- api/v1alpha1/common_types.go: Re-enable `XValidation` for `PodAnnotations` and `PodLabels` but optimize the rule cost by reducing `MaxProperties` to 20. Removed invalid `MaxLength` markers on map fields to fix `controller-gen` build errors. This ensures validation remains active while staying within the Kubernetes API server's estimated cost budget. - pkg/cluster-handler/controller/multigrescluster/multigrescluster_controller_test.go: Refactor the test runner to default `tc.multigrescluster` to `baseCluster.DeepCopy()`. This removes repetitive boilerplate from individual test cases. Moved inline cluster modifications to `preReconcileUpdate` for better consistency across tests.
1 parent c57aef6 commit b8a050f

File tree

9 files changed

+74
-115
lines changed

9 files changed

+74
-115
lines changed

‎api/v1alpha1/common_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ type StatelessSpec struct {
4545

4646
// PodAnnotations are annotations to add to the pods.
4747
// +optional
48-
// +kubebuilder:validation:MaxProperties=48
48+
// +kubebuilder:validation:MaxProperties=20
4949
// +kubebuilder:validation:XValidation:rule="self.all(k, size(k) < 64 && size(self[k]) < 256)",message="annotation keys must be <64 chars and values <256 chars"
5050
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
5151

5252
// PodLabels are additional labels to add to the pods.
5353
// +optional
54-
// +kubebuilder:validation:MaxProperties=48
54+
// +kubebuilder:validation:MaxProperties=20
5555
// +kubebuilder:validation:XValidation:rule="self.all(k, size(k) < 64 && size(self[k]) < 64)",message="label keys and values must be <64 chars"
5656
PodLabels map[string]string `json:"podLabels,omitempty"`
5757
}

‎config/crd/bases/multigres.com_cells.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ spec:
10061006
additionalProperties:
10071007
type: string
10081008
description: PodAnnotations are annotations to add to the pods.
1009-
maxProperties: 48
1009+
maxProperties: 20
10101010
type: object
10111011
x-kubernetes-validations:
10121012
- message: annotation keys must be <64 chars and values <256 chars
@@ -1015,7 +1015,7 @@ spec:
10151015
additionalProperties:
10161016
type: string
10171017
description: PodLabels are additional labels to add to the pods.
1018-
maxProperties: 48
1018+
maxProperties: 20
10191019
type: object
10201020
x-kubernetes-validations:
10211021
- message: label keys and values must be <64 chars

‎config/crd/bases/multigres.com_celltemplates.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ spec:
10931093
additionalProperties:
10941094
type: string
10951095
description: PodAnnotations are annotations to add to the pods.
1096-
maxProperties: 48
1096+
maxProperties: 20
10971097
type: object
10981098
x-kubernetes-validations:
10991099
- message: annotation keys must be <64 chars and values <256 chars
@@ -1102,7 +1102,7 @@ spec:
11021102
additionalProperties:
11031103
type: string
11041104
description: PodLabels are additional labels to add to the pods.
1105-
maxProperties: 48
1105+
maxProperties: 20
11061106
type: object
11071107
x-kubernetes-validations:
11081108
- message: label keys and values must be <64 chars

‎config/crd/bases/multigres.com_coretemplates.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ spec:
10621062
additionalProperties:
10631063
type: string
10641064
description: PodAnnotations are annotations to add to the pods.
1065-
maxProperties: 48
1065+
maxProperties: 20
10661066
type: object
10671067
x-kubernetes-validations:
10681068
- message: annotation keys must be <64 chars and values <256 chars
@@ -1071,7 +1071,7 @@ spec:
10711071
additionalProperties:
10721072
type: string
10731073
description: PodLabels are additional labels to add to the pods.
1074-
maxProperties: 48
1074+
maxProperties: 20
10751075
type: object
10761076
x-kubernetes-validations:
10771077
- message: label keys and values must be <64 chars

‎config/crd/bases/multigres.com_multigresclusters.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ spec:
10071007
type: string
10081008
description: PodAnnotations are annotations to add to
10091009
the pods.
1010-
maxProperties: 48
1010+
maxProperties: 20
10111011
type: object
10121012
x-kubernetes-validations:
10131013
- message: annotation keys must be <64 chars and values
@@ -1019,7 +1019,7 @@ spec:
10191019
type: string
10201020
description: PodLabels are additional labels to add
10211021
to the pods.
1022-
maxProperties: 48
1022+
maxProperties: 20
10231023
type: object
10241024
x-kubernetes-validations:
10251025
- message: label keys and values must be <64 chars
@@ -2175,7 +2175,7 @@ spec:
21752175
type: string
21762176
description: PodAnnotations are annotations to add to
21772177
the pods.
2178-
maxProperties: 48
2178+
maxProperties: 20
21792179
type: object
21802180
x-kubernetes-validations:
21812181
- message: annotation keys must be <64 chars and values
@@ -2187,7 +2187,7 @@ spec:
21872187
type: string
21882188
description: PodLabels are additional labels to add
21892189
to the pods.
2190-
maxProperties: 48
2190+
maxProperties: 20
21912191
type: object
21922192
x-kubernetes-validations:
21932193
- message: label keys and values must be <64 chars
@@ -3319,7 +3319,7 @@ spec:
33193319
type: string
33203320
description: PodAnnotations are annotations
33213321
to add to the pods.
3322-
maxProperties: 48
3322+
maxProperties: 20
33233323
type: object
33243324
x-kubernetes-validations:
33253325
- message: annotation keys must be <64 chars
@@ -3331,7 +3331,7 @@ spec:
33313331
type: string
33323332
description: PodLabels are additional labels
33333333
to add to the pods.
3334-
maxProperties: 48
3334+
maxProperties: 20
33353335
type: object
33363336
x-kubernetes-validations:
33373337
- message: label keys and values must be
@@ -5587,7 +5587,7 @@ spec:
55875587
type: string
55885588
description: PodAnnotations are annotations
55895589
to add to the pods.
5590-
maxProperties: 48
5590+
maxProperties: 20
55915591
type: object
55925592
x-kubernetes-validations:
55935593
- message: annotation keys must be <64 chars
@@ -5599,7 +5599,7 @@ spec:
55995599
type: string
56005600
description: PodLabels are additional labels
56015601
to add to the pods.
5602-
maxProperties: 48
5602+
maxProperties: 20
56035603
type: object
56045604
x-kubernetes-validations:
56055605
- message: label keys and values must be
@@ -8007,7 +8007,7 @@ spec:
80078007
type: string
80088008
description: PodAnnotations are annotations to add to the
80098009
pods.
8010-
maxProperties: 48
8010+
maxProperties: 20
80118011
type: object
80128012
x-kubernetes-validations:
80138013
- message: annotation keys must be <64 chars and values <256
@@ -8018,7 +8018,7 @@ spec:
80188018
type: string
80198019
description: PodLabels are additional labels to add to the
80208020
pods.
8021-
maxProperties: 48
8021+
maxProperties: 20
80228022
type: object
80238023
x-kubernetes-validations:
80248024
- message: label keys and values must be <64 chars

‎config/crd/bases/multigres.com_shards.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,7 @@ spec:
10341034
additionalProperties:
10351035
type: string
10361036
description: PodAnnotations are annotations to add to the pods.
1037-
maxProperties: 48
1037+
maxProperties: 20
10381038
type: object
10391039
x-kubernetes-validations:
10401040
- message: annotation keys must be <64 chars and values <256 chars
@@ -1043,7 +1043,7 @@ spec:
10431043
additionalProperties:
10441044
type: string
10451045
description: PodLabels are additional labels to add to the pods.
1046-
maxProperties: 48
1046+
maxProperties: 20
10471047
type: object
10481048
x-kubernetes-validations:
10491049
- message: label keys and values must be <64 chars

‎config/crd/bases/multigres.com_shardtemplates.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ spec:
978978
additionalProperties:
979979
type: string
980980
description: PodAnnotations are annotations to add to the pods.
981-
maxProperties: 48
981+
maxProperties: 20
982982
type: object
983983
x-kubernetes-validations:
984984
- message: annotation keys must be <64 chars and values <256 chars
@@ -987,7 +987,7 @@ spec:
987987
additionalProperties:
988988
type: string
989989
description: PodLabels are additional labels to add to the pods.
990-
maxProperties: 48
990+
maxProperties: 20
991991
type: object
992992
x-kubernetes-validations:
993993
- message: label keys and values must be <64 chars

‎config/crd/bases/multigres.com_tablegroups.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ spec:
10501050
type: string
10511051
description: PodAnnotations are annotations to add to the
10521052
pods.
1053-
maxProperties: 48
1053+
maxProperties: 20
10541054
type: object
10551055
x-kubernetes-validations:
10561056
- message: annotation keys must be <64 chars and values
@@ -1061,7 +1061,7 @@ spec:
10611061
type: string
10621062
description: PodLabels are additional labels to add to the
10631063
pods.
1064-
maxProperties: 48
1064+
maxProperties: 20
10651065
type: object
10661066
x-kubernetes-validations:
10671067
- message: label keys and values must be <64 chars

0 commit comments

Comments
 (0)