Skip to content

Commit a2dba9a

Browse files
zhangzujianzhangzujian
committed
crd: fix unrecognized format int32/int64 (#5671)
Signed-off-by: zhangzujian <[email protected]>
1 parent ce1bd7b commit a2dba9a

File tree

3 files changed

+73
-31
lines changed

3 files changed

+73
-31
lines changed

‎charts/kube-ovn-v2/crds/kube-ovn-crd.yaml

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,9 @@ spec:
257257
type: array
258258
type: object
259259
weight:
260-
format: int32
261260
type: integer
261+
minimum: 1
262+
maximum: 100
262263
required:
263264
- preference
264265
- weight
@@ -349,8 +350,9 @@ spec:
349350
- topologyKey
350351
type: object
351352
weight:
352-
format: int32
353353
type: integer
354+
minimum: 1
355+
maximum: 100
354356
required:
355357
- podAffinityTerm
356358
- weight
@@ -437,8 +439,9 @@ spec:
437439
- topologyKey
438440
type: object
439441
weight:
440-
format: int32
441442
type: integer
443+
minimum: 1
444+
maximum: 100
442445
required:
443446
- podAffinityTerm
444447
- weight
@@ -593,8 +596,9 @@ spec:
593596
type: array
594597
type: object
595598
weight:
596-
format: int32
597599
type: integer
600+
minimum: 1
601+
maximum: 100
598602
required:
599603
- preference
600604
- weight
@@ -685,8 +689,9 @@ spec:
685689
- topologyKey
686690
type: object
687691
weight:
688-
format: int32
689692
type: integer
693+
minimum: 1
694+
maximum: 100
690695
required:
691696
- podAffinityTerm
692697
- weight
@@ -773,8 +778,9 @@ spec:
773778
- topologyKey
774779
type: object
775780
weight:
776-
format: int32
777781
type: integer
782+
minimum: 1
783+
maximum: 100
778784
required:
779785
- podAffinityTerm
780786
- weight
@@ -876,12 +882,25 @@ spec:
876882
storage: true
877883
subresources:
878884
status: {}
885+
scale:
886+
# specReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Spec.Replicas.
887+
specReplicasPath: .spec.replicas
888+
# statusReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Status.Replicas.
889+
statusReplicasPath: .status.replicas
890+
# labelSelectorPath defines the JSONPath inside of a custom resource that corresponds to Scale.Status.Selector.
891+
labelSelectorPath: .status.labelSelector
879892
schema:
880893
openAPIV3Schema:
881894
type: object
882895
properties:
883896
status:
884897
properties:
898+
replicas:
899+
type: integer
900+
minimum: 0
901+
maximum: 10
902+
labelSelector:
903+
type: string
885904
conditions:
886905
items:
887906
properties:
@@ -895,7 +914,6 @@ spec:
895914
maxLength: 32768
896915
type: string
897916
observedGeneration:
898-
format: int64
899917
minimum: 0
900918
type: integer
901919
reason:
@@ -1024,12 +1042,18 @@ spec:
10241042
minRX:
10251043
type: integer
10261044
default: 1000
1045+
minimum: 1
1046+
maximum: 3600000
10271047
minTX:
10281048
type: integer
10291049
default: 1000
1050+
minimum: 1
1051+
maximum: 3600000
10301052
multiplier:
10311053
type: integer
10321054
default: 3
1055+
minimum: 1
1056+
maximum: 3600000
10331057
selectors:
10341058
type: array
10351059
items:
@@ -2595,6 +2619,8 @@ spec:
25952619
type: boolean
25962620
enableMulticastSnoop:
25972621
type: boolean
2622+
enableExternalLBAddress:
2623+
type: boolean
25982624
routeTable:
25992625
type: string
26002626
namespaceSelectors:

‎charts/kube-ovn/templates/kube-ovn-crd.yaml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,9 @@ spec:
257257
type: array
258258
type: object
259259
weight:
260-
format: int32
261260
type: integer
261+
minimum: 1
262+
maximum: 100
262263
required:
263264
- preference
264265
- weight
@@ -349,8 +350,9 @@ spec:
349350
- topologyKey
350351
type: object
351352
weight:
352-
format: int32
353353
type: integer
354+
minimum: 1
355+
maximum: 100
354356
required:
355357
- podAffinityTerm
356358
- weight
@@ -437,8 +439,9 @@ spec:
437439
- topologyKey
438440
type: object
439441
weight:
440-
format: int32
441442
type: integer
443+
minimum: 1
444+
maximum: 100
442445
required:
443446
- podAffinityTerm
444447
- weight
@@ -593,8 +596,9 @@ spec:
593596
type: array
594597
type: object
595598
weight:
596-
format: int32
597599
type: integer
600+
minimum: 1
601+
maximum: 100
598602
required:
599603
- preference
600604
- weight
@@ -685,8 +689,9 @@ spec:
685689
- topologyKey
686690
type: object
687691
weight:
688-
format: int32
689692
type: integer
693+
minimum: 1
694+
maximum: 100
690695
required:
691696
- podAffinityTerm
692697
- weight
@@ -773,8 +778,9 @@ spec:
773778
- topologyKey
774779
type: object
775780
weight:
776-
format: int32
777781
type: integer
782+
minimum: 1
783+
maximum: 100
778784
required:
779785
- podAffinityTerm
780786
- weight
@@ -891,7 +897,8 @@ spec:
891897
properties:
892898
replicas:
893899
type: integer
894-
format: int32
900+
minimum: 0
901+
maximum: 10
895902
labelSelector:
896903
type: string
897904
conditions:
@@ -907,7 +914,6 @@ spec:
907914
maxLength: 32768
908915
type: string
909916
observedGeneration:
910-
format: int64
911917
minimum: 0
912918
type: integer
913919
reason:
@@ -988,7 +994,6 @@ spec:
988994
properties:
989995
replicas:
990996
type: integer
991-
format: int32
992997
default: 1
993998
minimum: 0
994999
maximum: 10
@@ -1036,16 +1041,19 @@ spec:
10361041
default: false
10371042
minRX:
10381043
type: integer
1039-
format: int32
10401044
default: 1000
1045+
minimum: 1
1046+
maximum: 3600000
10411047
minTX:
10421048
type: integer
1043-
format: int32
10441049
default: 1000
1050+
minimum: 1
1051+
maximum: 3600000
10451052
multiplier:
10461053
type: integer
1047-
format: int32
10481054
default: 3
1055+
minimum: 1
1056+
maximum: 3600000
10491057
selectors:
10501058
type: array
10511059
items:

‎dist/images/install.sh

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,9 @@ spec:
498498
type: array
499499
type: object
500500
weight:
501-
format: int32
502501
type: integer
502+
minimum: 1
503+
maximum: 100
503504
required:
504505
- preference
505506
- weight
@@ -590,8 +591,9 @@ spec:
590591
- topologyKey
591592
type: object
592593
weight:
593-
format: int32
594594
type: integer
595+
minimum: 1
596+
maximum: 100
595597
required:
596598
- podAffinityTerm
597599
- weight
@@ -678,8 +680,9 @@ spec:
678680
- topologyKey
679681
type: object
680682
weight:
681-
format: int32
682683
type: integer
684+
minimum: 1
685+
maximum: 100
683686
required:
684687
- podAffinityTerm
685688
- weight
@@ -834,8 +837,9 @@ spec:
834837
type: array
835838
type: object
836839
weight:
837-
format: int32
838840
type: integer
841+
minimum: 1
842+
maximum: 100
839843
required:
840844
- preference
841845
- weight
@@ -926,8 +930,9 @@ spec:
926930
- topologyKey
927931
type: object
928932
weight:
929-
format: int32
930933
type: integer
934+
minimum: 1
935+
maximum: 100
931936
required:
932937
- podAffinityTerm
933938
- weight
@@ -1014,8 +1019,9 @@ spec:
10141019
- topologyKey
10151020
type: object
10161021
weight:
1017-
format: int32
10181022
type: integer
1023+
minimum: 1
1024+
maximum: 100
10191025
required:
10201026
- podAffinityTerm
10211027
- weight
@@ -1132,7 +1138,8 @@ spec:
11321138
properties:
11331139
replicas:
11341140
type: integer
1135-
format: int32
1141+
minimum: 0
1142+
maximum: 10
11361143
labelSelector:
11371144
type: string
11381145
conditions:
@@ -1148,7 +1155,6 @@ spec:
11481155
maxLength: 32768
11491156
type: string
11501157
observedGeneration:
1151-
format: int64
11521158
minimum: 0
11531159
type: integer
11541160
reason:
@@ -1229,7 +1235,6 @@ spec:
12291235
properties:
12301236
replicas:
12311237
type: integer
1232-
format: int32
12331238
default: 1
12341239
minimum: 0
12351240
maximum: 10
@@ -1277,16 +1282,19 @@ spec:
12771282
default: false
12781283
minRX:
12791284
type: integer
1280-
format: int32
12811285
default: 1000
1286+
minimum: 1
1287+
maximum: 3600000
12821288
minTX:
12831289
type: integer
1284-
format: int32
12851290
default: 1000
1291+
minimum: 1
1292+
maximum: 3600000
12861293
multiplier:
12871294
type: integer
1288-
format: int32
12891295
default: 3
1296+
minimum: 1
1297+
maximum: 3600000
12901298
selectors:
12911299
type: array
12921300
items:

0 commit comments

Comments
 (0)