Skip to content

Commit 85ec0be

Browse files
Till0196Till0196
committed
Merge branch 'main' into support-multiplatform-yq
2 parents f8c9e99 + db8f54b commit 85ec0be

File tree

5 files changed

+76
-15
lines changed

5 files changed

+76
-15
lines changed

‎v2/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ manifests: manifests-ipam manifests-egress
8989
.PHONY: manifests-egress
9090
manifests-egress: $(CONTROLLER_GEN) $(ROLES) $(YQ)
9191
mkdir -p tmp/egress
92-
cp api/v2/egress_webhook.go tmp/egress
93-
$(CONTROLLER_GEN) $(CRD_OPTIONS) webhook paths="./tmp/egress/..." output:stdout output:crd:artifacts:config=config/crd/bases > config/webhook/egress/manifests.yaml
92+
cp api/v2/egress_webhook.go api/v2/egress_types.go api/v2/groupversion_info.go tmp/egress
93+
$(CONTROLLER_GEN) $(CRD_OPTIONS) webhook paths="./tmp/egress/..." output:webhook:stdout output:crd:artifacts:config=config/crd/bases > config/webhook/egress/manifests.yaml
9494
sed -i 's/webhook-/egress-webhook-/g' config/webhook/egress/manifests.yaml
9595
# Reduce the size of Egress CRD by deleting `description` fields below the pod's template because it exceeds the limit of `metadata.annotations` length when it's applied with client-side mode.
9696
$(YQ) -i 'del(.spec.versions.[].schema.openAPIV3Schema.properties.spec.properties.template | .. |select(key == "description"))' config/crd/bases/coil.cybozu.com_egresses.yaml
@@ -99,8 +99,8 @@ manifests-egress: $(CONTROLLER_GEN) $(ROLES) $(YQ)
9999
.PHONY: manifests-ipam
100100
manifests-ipam: $(CONTROLLER_GEN) $(ROLES) $(YQ)
101101
mkdir -p tmp/ipam
102-
cp api/v2/addresspool_webhook.go tmp/ipam
103-
$(CONTROLLER_GEN) $(CRD_OPTIONS) webhook paths="./tmp/ipam/..." output:stdout output:crd:artifacts:config=config/crd/bases > config/webhook/ipam/manifests.yaml
102+
cp api/v2/addresspool_webhook.go api/v2/addresspool_types.go api/v2/addressblock_types.go api/v2/blockrequest_types.go api/v2/groupversion_info.go tmp/ipam
103+
$(CONTROLLER_GEN) $(CRD_OPTIONS) webhook paths="./tmp/ipam/..." output:webhook:stdout output:crd:artifacts:config=config/crd/bases > config/webhook/ipam/manifests.yaml
104104
sed -i 's/webhook-/ipam-webhook-/g' config/webhook/ipam/manifests.yaml
105105
rm -rf tmp 2> /dev/null
106106

‎v2/config/crd/bases/coil.cybozu.com_addressblocks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: addressblocks.coil.cybozu.com
88
spec:
99
group: coil.cybozu.com

‎v2/config/crd/bases/coil.cybozu.com_addresspools.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: addresspools.coil.cybozu.com
88
spec:
99
group: coil.cybozu.com

‎v2/config/crd/bases/coil.cybozu.com_blockrequests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: blockrequests.coil.cybozu.com
88
spec:
99
group: coil.cybozu.com

‎v2/config/crd/bases/coil.cybozu.com_egresses.yaml‎

Lines changed: 69 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: egresses.coil.cybozu.com
88
spec:
99
group: coil.cybozu.com
@@ -844,6 +844,8 @@ spec:
844844
- port
845845
type: object
846846
type: object
847+
stopSignal:
848+
type: string
847849
type: object
848850
livenessProbe:
849851
properties:
@@ -1053,6 +1055,8 @@ spec:
10531055
properties:
10541056
name:
10551057
type: string
1058+
request:
1059+
type: string
10561060
required:
10571061
- name
10581062
type: object
@@ -1552,6 +1556,8 @@ spec:
15521556
- port
15531557
type: object
15541558
type: object
1559+
stopSignal:
1560+
type: string
15551561
type: object
15561562
livenessProbe:
15571563
properties:
@@ -1761,6 +1767,8 @@ spec:
17611767
properties:
17621768
name:
17631769
type: string
1770+
request:
1771+
type: string
17641772
required:
17651773
- name
17661774
type: object
@@ -2274,6 +2282,8 @@ spec:
22742282
- port
22752283
type: object
22762284
type: object
2285+
stopSignal:
2286+
type: string
22772287
type: object
22782288
livenessProbe:
22792289
properties:
@@ -2483,6 +2493,8 @@ spec:
24832493
properties:
24842494
name:
24852495
type: string
2496+
request:
2497+
type: string
24862498
required:
24872499
- name
24882500
type: object
@@ -2765,20 +2777,50 @@ spec:
27652777
properties:
27662778
name:
27672779
type: string
2768-
source:
2769-
properties:
2770-
resourceClaimName:
2771-
type: string
2772-
resourceClaimTemplateName:
2773-
type: string
2774-
type: object
2780+
resourceClaimName:
2781+
type: string
2782+
resourceClaimTemplateName:
2783+
type: string
27752784
required:
27762785
- name
27772786
type: object
27782787
type: array
27792788
x-kubernetes-list-map-keys:
27802789
- name
27812790
x-kubernetes-list-type: map
2791+
resources:
2792+
properties:
2793+
claims:
2794+
items:
2795+
properties:
2796+
name:
2797+
type: string
2798+
request:
2799+
type: string
2800+
required:
2801+
- name
2802+
type: object
2803+
type: array
2804+
x-kubernetes-list-map-keys:
2805+
- name
2806+
x-kubernetes-list-type: map
2807+
limits:
2808+
additionalProperties:
2809+
anyOf:
2810+
- type: integer
2811+
- type: string
2812+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2813+
x-kubernetes-int-or-string: true
2814+
type: object
2815+
requests:
2816+
additionalProperties:
2817+
anyOf:
2818+
- type: integer
2819+
- type: string
2820+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2821+
x-kubernetes-int-or-string: true
2822+
type: object
2823+
type: object
27822824
restartPolicy:
27832825
type: string
27842826
runtimeClassName:
@@ -2821,6 +2863,8 @@ spec:
28212863
runAsUser:
28222864
format: int64
28232865
type: integer
2866+
seLinuxChangePolicy:
2867+
type: string
28242868
seLinuxOptions:
28252869
properties:
28262870
level:
@@ -2847,6 +2891,8 @@ spec:
28472891
type: integer
28482892
type: array
28492893
x-kubernetes-list-type: atomic
2894+
supplementalGroupsPolicy:
2895+
type: string
28502896
sysctls:
28512897
items:
28522898
properties:
@@ -2986,10 +3032,12 @@ spec:
29863032
diskURI:
29873033
type: string
29883034
fsType:
3035+
default: ext4
29893036
type: string
29903037
kind:
29913038
type: string
29923039
readOnly:
3040+
default: false
29933041
type: boolean
29943042
required:
29953043
- diskName
@@ -3349,6 +3397,13 @@ spec:
33493397
required:
33503398
- path
33513399
type: object
3400+
image:
3401+
properties:
3402+
pullPolicy:
3403+
type: string
3404+
reference:
3405+
type: string
3406+
type: object
33523407
iscsi:
33533408
properties:
33543409
chapAuthDiscovery:
@@ -3362,6 +3417,7 @@ spec:
33623417
iqn:
33633418
type: string
33643419
iscsiInterface:
3420+
default: default
33653421
type: string
33663422
lun:
33673423
format: int32
@@ -3610,13 +3666,15 @@ spec:
36103666
image:
36113667
type: string
36123668
keyring:
3669+
default: /etc/ceph/keyring
36133670
type: string
36143671
monitors:
36153672
items:
36163673
type: string
36173674
type: array
36183675
x-kubernetes-list-type: atomic
36193676
pool:
3677+
default: rbd
36203678
type: string
36213679
readOnly:
36223680
type: boolean
@@ -3628,6 +3686,7 @@ spec:
36283686
type: object
36293687
x-kubernetes-map-type: atomic
36303688
user:
3689+
default: admin
36313690
type: string
36323691
required:
36333692
- image
@@ -3636,6 +3695,7 @@ spec:
36363695
scaleIO:
36373696
properties:
36383697
fsType:
3698+
default: xfs
36393699
type: string
36403700
gateway:
36413701
type: string
@@ -3653,6 +3713,7 @@ spec:
36533713
sslEnabled:
36543714
type: boolean
36553715
storageMode:
3716+
default: ThinProvisioned
36563717
type: string
36573718
storagePool:
36583719
type: string

0 commit comments

Comments
 (0)