Skip to content

Commit b6e8073

Browse files
committed
Re-generate CRDs
1 parent 823e694 commit b6e8073

8 files changed

+91
-90
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ generate: $(CONTROLLER_GEN) ## Generate code
134134
generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate targets
135135
$(CONTROLLER_GEN) \
136136
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
137+
crd:preserveUnknownFields=false \
137138
paths=./api/... \
138139
paths=./bootstrap/kubeadm/api/...
139140
$(CONVERSION_GEN) \
@@ -147,13 +148,13 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
147148
paths=./api/... \
148149
paths=./controllers/... \
149150
paths=./bootstrap/kubeadm/controllers/... \
150-
crd \
151+
crd:preserveUnknownFields=false \
151152
rbac:roleName=manager-role \
152153
output:crd:dir=./config/crd/bases \
153154
webhook
154155
$(CONTROLLER_GEN) \
155156
paths=./bootstrap/kubeadm/api/... \
156-
crd:trivialVersions=true \
157+
crd:trivialVersions=true,preserveUnknownFields=false \
157158
output:crd:dir=./config/crd/bases
158159
## Copy files in CI folders.
159160
cp -f ./config/rbac/*.yaml ./config/ci/rbac/

config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.2.3
7+
controller-gen.kubebuilder.io/version: v0.2.4
88
creationTimestamp: null
99
name: kubeadmconfigs.bootstrap.cluster.x-k8s.io
1010
spec:
@@ -27,12 +27,12 @@ spec:
2727
apiVersion:
2828
description: 'APIVersion defines the versioned schema of this representation
2929
of an object. Servers should convert recognized schemas to the latest
30-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
30+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
3131
type: string
3232
kind:
3333
description: 'Kind is a string value representing the REST resource this
3434
object represents. Servers may infer this from the endpoint the client
35-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
35+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3636
type: string
3737
metadata:
3838
type: object
@@ -102,7 +102,7 @@ spec:
102102
description: 'APIVersion defines the versioned schema of this representation
103103
of an object. Servers should convert recognized schemas to the
104104
latest internal value, and may reject unrecognized values. More
105-
info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
105+
info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
106106
type: string
107107
certificatesDir:
108108
description: CertificatesDir specifies where to store or look for
@@ -278,7 +278,7 @@ spec:
278278
description: 'Kind is a string value representing the REST resource
279279
this object represents. Servers may infer this from the endpoint
280280
the client submits requests to. Cannot be updated. In CamelCase.
281-
More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
281+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
282282
type: string
283283
kubernetesVersion:
284284
description: 'KubernetesVersion is the target version of the control
@@ -400,7 +400,7 @@ spec:
400400
description: 'APIVersion defines the versioned schema of this representation
401401
of an object. Servers should convert recognized schemas to the
402402
latest internal value, and may reject unrecognized values. More
403-
info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
403+
info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
404404
type: string
405405
bootstrapTokens:
406406
description: BootstrapTokens is respected at `kubeadm init` time
@@ -452,7 +452,7 @@ spec:
452452
description: 'Kind is a string value representing the REST resource
453453
this object represents. Servers may infer this from the endpoint
454454
the client submits requests to. Cannot be updated. In CamelCase.
455-
More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
455+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
456456
type: string
457457
localAPIEndpoint:
458458
description: LocalAPIEndpoint represents the endpoint of the API
@@ -550,7 +550,7 @@ spec:
550550
description: 'APIVersion defines the versioned schema of this representation
551551
of an object. Servers should convert recognized schemas to the
552552
latest internal value, and may reject unrecognized values. More
553-
info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
553+
info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
554554
type: string
555555
caCertPath:
556556
description: 'CACertPath is the path to the SSL certificate authority
@@ -653,7 +653,7 @@ spec:
653653
description: 'Kind is a string value representing the REST resource
654654
this object represents. Servers may infer this from the endpoint
655655
the client submits requests to. Cannot be updated. In CamelCase.
656-
More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
656+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
657657
type: string
658658
nodeRegistration:
659659
description: NodeRegistration holds fields that relate to registering

config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.2.3
7+
controller-gen.kubebuilder.io/version: v0.2.4
88
creationTimestamp: null
99
name: kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io
1010
spec:
@@ -26,12 +26,12 @@ spec:
2626
apiVersion:
2727
description: 'APIVersion defines the versioned schema of this representation
2828
of an object. Servers should convert recognized schemas to the latest
29-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
29+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
3030
type: string
3131
kind:
3232
description: 'Kind is a string value representing the REST resource this
3333
object represents. Servers may infer this from the endpoint the client
34-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
34+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
3535
type: string
3636
metadata:
3737
type: object
@@ -109,7 +109,7 @@ spec:
109109
description: 'APIVersion defines the versioned schema of
110110
this representation of an object. Servers should convert
111111
recognized schemas to the latest internal value, and may
112-
reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
112+
reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
113113
type: string
114114
certificatesDir:
115115
description: CertificatesDir specifies where to store or
@@ -296,7 +296,7 @@ spec:
296296
description: 'Kind is a string value representing the REST
297297
resource this object represents. Servers may infer this
298298
from the endpoint the client submits requests to. Cannot
299-
be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
299+
be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
300300
type: string
301301
kubernetesVersion:
302302
description: 'KubernetesVersion is the target version of
@@ -424,7 +424,7 @@ spec:
424424
description: 'APIVersion defines the versioned schema of
425425
this representation of an object. Servers should convert
426426
recognized schemas to the latest internal value, and may
427-
reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
427+
reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
428428
type: string
429429
bootstrapTokens:
430430
description: BootstrapTokens is respected at `kubeadm init`
@@ -479,7 +479,7 @@ spec:
479479
description: 'Kind is a string value representing the REST
480480
resource this object represents. Servers may infer this
481481
from the endpoint the client submits requests to. Cannot
482-
be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
482+
be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
483483
type: string
484484
localAPIEndpoint:
485485
description: LocalAPIEndpoint represents the endpoint of
@@ -585,7 +585,7 @@ spec:
585585
description: 'APIVersion defines the versioned schema of
586586
this representation of an object. Servers should convert
587587
recognized schemas to the latest internal value, and may
588-
reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
588+
reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
589589
type: string
590590
caCertPath:
591591
description: 'CACertPath is the path to the SSL certificate
@@ -693,7 +693,7 @@ spec:
693693
description: 'Kind is a string value representing the REST
694694
resource this object represents. Servers may infer this
695695
from the endpoint the client submits requests to. Cannot
696-
be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
696+
be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
697697
type: string
698698
nodeRegistration:
699699
description: NodeRegistration holds fields that relate to

config/crd/bases/cluster.x-k8s.io_clusters.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.2.3
7+
controller-gen.kubebuilder.io/version: v0.2.4
88
creationTimestamp: null
99
name: clusters.cluster.x-k8s.io
1010
spec:
@@ -37,12 +37,12 @@ spec:
3737
apiVersion:
3838
description: 'APIVersion defines the versioned schema of this representation
3939
of an object. Servers should convert recognized schemas to the latest
40-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
40+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
4141
type: string
4242
kind:
4343
description: 'Kind is a string value representing the REST resource this
4444
object represents. Servers may infer this from the endpoint the client
45-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
45+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
4646
type: string
4747
metadata:
4848
type: object
@@ -103,7 +103,7 @@ spec:
103103
subject to change in the future.'
104104
type: string
105105
kind:
106-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
106+
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
107107
type: string
108108
name:
109109
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
@@ -113,7 +113,7 @@ spec:
113113
type: string
114114
resourceVersion:
115115
description: 'Specific resourceVersion to which this reference
116-
is made, if any. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency'
116+
is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
117117
type: string
118118
uid:
119119
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
@@ -173,12 +173,12 @@ spec:
173173
apiVersion:
174174
description: 'APIVersion defines the versioned schema of this representation
175175
of an object. Servers should convert recognized schemas to the latest
176-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
176+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
177177
type: string
178178
kind:
179179
description: 'Kind is a string value representing the REST resource this
180180
object represents. Servers may infer this from the endpoint the client
181-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
181+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
182182
type: string
183183
metadata:
184184
type: object
@@ -254,7 +254,7 @@ spec:
254254
subject to change in the future.'
255255
type: string
256256
kind:
257-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
257+
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
258258
type: string
259259
name:
260260
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
@@ -264,7 +264,7 @@ spec:
264264
type: string
265265
resourceVersion:
266266
description: 'Specific resourceVersion to which this reference
267-
is made, if any. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency'
267+
is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
268268
type: string
269269
uid:
270270
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'

0 commit comments

Comments
 (0)