Skip to content

Commit 31fc981

Browse files
oilbeateroilbeater
committed
fix the crd with supported schema
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
1 parent 856988a commit 31fc981

File tree

3 files changed

+81
-54
lines changed

3 files changed

+81
-54
lines changed

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

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,6 @@ spec:
322322
properties:
323323
key:
324324
type: string
325-
x-kubernetes-patch-strategy: merge
326-
x-kubernetes-patch-merge-key: key
327325
operator:
328326
type: string
329327
values:
@@ -335,6 +333,9 @@ spec:
335333
- operator
336334
type: object
337335
type: array
336+
x-kubernetes-list-type: map
337+
x-kubernetes-list-map-keys:
338+
- key
338339
matchLabels:
339340
additionalProperties:
340341
type: string
@@ -368,8 +369,6 @@ spec:
368369
properties:
369370
key:
370371
type: string
371-
x-kubernetes-patch-strategy: merge
372-
x-kubernetes-patch-merge-key: key
373372
operator:
374373
type: string
375374
values:
@@ -381,6 +380,9 @@ spec:
381380
- operator
382381
type: object
383382
type: array
383+
x-kubernetes-list-type: map
384+
x-kubernetes-list-map-keys:
385+
- key
384386
matchLabels:
385387
additionalProperties:
386388
type: string
@@ -411,8 +413,6 @@ spec:
411413
properties:
412414
key:
413415
type: string
414-
x-kubernetes-patch-strategy: merge
415-
x-kubernetes-patch-merge-key: key
416416
operator:
417417
type: string
418418
values:
@@ -424,6 +424,9 @@ spec:
424424
- operator
425425
type: object
426426
type: array
427+
x-kubernetes-list-type: map
428+
x-kubernetes-list-map-keys:
429+
- key
427430
matchLabels:
428431
additionalProperties:
429432
type: string
@@ -457,8 +460,6 @@ spec:
457460
properties:
458461
key:
459462
type: string
460-
x-kubernetes-patch-strategy: merge
461-
x-kubernetes-patch-merge-key: key
462463
operator:
463464
type: string
464465
values:
@@ -470,6 +471,9 @@ spec:
470471
- operator
471472
type: object
472473
type: array
474+
x-kubernetes-list-type: map
475+
x-kubernetes-list-map-keys:
476+
- key
473477
matchLabels:
474478
additionalProperties:
475479
type: string
@@ -673,8 +677,6 @@ spec:
673677
properties:
674678
key:
675679
type: string
676-
x-kubernetes-patch-strategy: merge
677-
x-kubernetes-patch-merge-key: key
678680
operator:
679681
type: string
680682
values:
@@ -686,6 +688,9 @@ spec:
686688
- operator
687689
type: object
688690
type: array
691+
x-kubernetes-list-type: map
692+
x-kubernetes-list-map-keys:
693+
- key
689694
matchLabels:
690695
additionalProperties:
691696
type: string
@@ -719,8 +724,6 @@ spec:
719724
properties:
720725
key:
721726
type: string
722-
x-kubernetes-patch-strategy: merge
723-
x-kubernetes-patch-merge-key: key
724727
operator:
725728
type: string
726729
values:
@@ -732,6 +735,9 @@ spec:
732735
- operator
733736
type: object
734737
type: array
738+
x-kubernetes-list-type: map
739+
x-kubernetes-list-map-keys:
740+
- key
735741
matchLabels:
736742
additionalProperties:
737743
type: string
@@ -762,8 +768,6 @@ spec:
762768
properties:
763769
key:
764770
type: string
765-
x-kubernetes-patch-strategy: merge
766-
x-kubernetes-patch-merge-key: key
767771
operator:
768772
type: string
769773
values:
@@ -775,6 +779,9 @@ spec:
775779
- operator
776780
type: object
777781
type: array
782+
x-kubernetes-list-type: map
783+
x-kubernetes-list-map-keys:
784+
- key
778785
matchLabels:
779786
additionalProperties:
780787
type: string
@@ -808,8 +815,6 @@ spec:
808815
properties:
809816
key:
810817
type: string
811-
x-kubernetes-patch-strategy: merge
812-
x-kubernetes-patch-merge-key: key
813818
operator:
814819
type: string
815820
values:
@@ -821,6 +826,9 @@ spec:
821826
- operator
822827
type: object
823828
type: array
829+
x-kubernetes-list-type: map
830+
x-kubernetes-list-map-keys:
831+
- key
824832
matchLabels:
825833
additionalProperties:
826834
type: string
@@ -2964,8 +2972,6 @@ spec:
29642972
properties:
29652973
key:
29662974
type: string
2967-
x-kubernetes-patch-strategy: merge
2968-
x-kubernetes-patch-merge-key: key
29692975
operator:
29702976
type: string
29712977
values:
@@ -2977,6 +2983,9 @@ spec:
29772983
- operator
29782984
type: object
29792985
type: array
2986+
x-kubernetes-list-type: map
2987+
x-kubernetes-list-map-keys:
2988+
- key
29802989
matchLabels:
29812990
additionalProperties:
29822991
type: string

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

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,6 @@ spec:
322322
properties:
323323
key:
324324
type: string
325-
x-kubernetes-patch-strategy: merge
326-
x-kubernetes-patch-merge-key: key
327325
operator:
328326
type: string
329327
values:
@@ -335,6 +333,9 @@ spec:
335333
- operator
336334
type: object
337335
type: array
336+
x-kubernetes-list-type: map
337+
x-kubernetes-list-map-keys:
338+
- key
338339
matchLabels:
339340
additionalProperties:
340341
type: string
@@ -368,8 +369,6 @@ spec:
368369
properties:
369370
key:
370371
type: string
371-
x-kubernetes-patch-strategy: merge
372-
x-kubernetes-patch-merge-key: key
373372
operator:
374373
type: string
375374
values:
@@ -381,6 +380,9 @@ spec:
381380
- operator
382381
type: object
383382
type: array
383+
x-kubernetes-list-type: map
384+
x-kubernetes-list-map-keys:
385+
- key
384386
matchLabels:
385387
additionalProperties:
386388
type: string
@@ -411,8 +413,6 @@ spec:
411413
properties:
412414
key:
413415
type: string
414-
x-kubernetes-patch-strategy: merge
415-
x-kubernetes-patch-merge-key: key
416416
operator:
417417
type: string
418418
values:
@@ -424,6 +424,9 @@ spec:
424424
- operator
425425
type: object
426426
type: array
427+
x-kubernetes-list-type: map
428+
x-kubernetes-list-map-keys:
429+
- key
427430
matchLabels:
428431
additionalProperties:
429432
type: string
@@ -457,8 +460,6 @@ spec:
457460
properties:
458461
key:
459462
type: string
460-
x-kubernetes-patch-strategy: merge
461-
x-kubernetes-patch-merge-key: key
462463
operator:
463464
type: string
464465
values:
@@ -470,6 +471,9 @@ spec:
470471
- operator
471472
type: object
472473
type: array
474+
x-kubernetes-list-type: map
475+
x-kubernetes-list-map-keys:
476+
- key
473477
matchLabels:
474478
additionalProperties:
475479
type: string
@@ -673,8 +677,6 @@ spec:
673677
properties:
674678
key:
675679
type: string
676-
x-kubernetes-patch-strategy: merge
677-
x-kubernetes-patch-merge-key: key
678680
operator:
679681
type: string
680682
values:
@@ -686,6 +688,9 @@ spec:
686688
- operator
687689
type: object
688690
type: array
691+
x-kubernetes-list-type: map
692+
x-kubernetes-list-map-keys:
693+
- key
689694
matchLabels:
690695
additionalProperties:
691696
type: string
@@ -719,8 +724,6 @@ spec:
719724
properties:
720725
key:
721726
type: string
722-
x-kubernetes-patch-strategy: merge
723-
x-kubernetes-patch-merge-key: key
724727
operator:
725728
type: string
726729
values:
@@ -732,6 +735,9 @@ spec:
732735
- operator
733736
type: object
734737
type: array
738+
x-kubernetes-list-type: map
739+
x-kubernetes-list-map-keys:
740+
- key
735741
matchLabels:
736742
additionalProperties:
737743
type: string
@@ -762,8 +768,6 @@ spec:
762768
properties:
763769
key:
764770
type: string
765-
x-kubernetes-patch-strategy: merge
766-
x-kubernetes-patch-merge-key: key
767771
operator:
768772
type: string
769773
values:
@@ -775,6 +779,9 @@ spec:
775779
- operator
776780
type: object
777781
type: array
782+
x-kubernetes-list-type: map
783+
x-kubernetes-list-map-keys:
784+
- key
778785
matchLabels:
779786
additionalProperties:
780787
type: string
@@ -808,8 +815,6 @@ spec:
808815
properties:
809816
key:
810817
type: string
811-
x-kubernetes-patch-strategy: merge
812-
x-kubernetes-patch-merge-key: key
813818
operator:
814819
type: string
815820
values:
@@ -821,6 +826,9 @@ spec:
821826
- operator
822827
type: object
823828
type: array
829+
x-kubernetes-list-type: map
830+
x-kubernetes-list-map-keys:
831+
- key
824832
matchLabels:
825833
additionalProperties:
826834
type: string
@@ -2964,8 +2972,6 @@ spec:
29642972
properties:
29652973
key:
29662974
type: string
2967-
x-kubernetes-patch-strategy: merge
2968-
x-kubernetes-patch-merge-key: key
29692975
operator:
29702976
type: string
29712977
values:
@@ -2977,6 +2983,9 @@ spec:
29772983
- operator
29782984
type: object
29792985
type: array
2986+
x-kubernetes-list-type: map
2987+
x-kubernetes-list-map-keys:
2988+
- key
29802989
matchLabels:
29812990
additionalProperties:
29822991
type: string

0 commit comments

Comments
 (0)