Skip to content

Commit 844d1e2

Browse files
authored
Regenerate APIs with controller-gen v0.16.2 (#161)
This patch installs controller-gen v0.16.2 and regenerate all the common APIs/CRDs. Also fixes the generation script. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent b1d15c4 commit 844d1e2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

apis/core/v1alpha1/zz_generated.deepcopy.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/services.k8s.aws_adoptedresources.yaml

+1-6
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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: adoptedresources.services.k8s.aws
88
spec:
99
group: services.k8s.aws
@@ -78,11 +78,9 @@ spec:
7878
automatically converts this to an arbitrary string-string map.
7979
https://github.com/kubernetes-sigs/controller-tools/issues/385
8080
81-
8281
Active discussion about inclusion of this field in the spec is happening in this PR:
8382
https://github.com/kubernetes-sigs/controller-tools/pull/395
8483
85-
8684
Until this is allowed, or if it never is, we will produce a subset of the object meta
8785
that contains only the fields which the user is allowed to modify in the metadata.
8886
properties:
@@ -105,13 +103,11 @@ spec:
105103
and may be truncated by the length of the suffix required to make the value
106104
unique on the server.
107105
108-
109106
If this field is specified and the generated name exists, the server will
110107
NOT return a 409 - instead, it will either return 201 Created or 500 with Reason
111108
ServerTimeout indicating a unique name could not be found in the time allotted, and the client
112109
should retry (optionally after the time indicated in the Retry-After header).
113110
114-
115111
Applied only if Name is not specified.
116112
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
117113
type: string
@@ -140,7 +136,6 @@ spec:
140136
Not all objects are required to be scoped to a namespace - the value of this field for
141137
those objects will be empty.
142138
143-
144139
Must be a DNS_LABEL.
145140
Cannot be updated.
146141
More info: http://kubernetes.io/docs/user-guide/namespaces

config/crd/bases/services.k8s.aws_fieldexports.yaml

+1-1
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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: fieldexports.services.k8s.aws
88
spec:
99
group: services.k8s.aws

scripts/build-apis.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ controller-gen paths=$ROOT_DIR/apis/... \
2121
crd object:headerFile=$TEMPLATES_DIR/boilerplate.txt \
2222
output:crd:artifacts:config=$common_config_output_dir/crd/bases
2323

24-
bases=$(find "$common_config_output_dir/crd/bases" -maxdepth 1 -type f -printf "%f\n" | sed -e 's/^/ - bases\//')
24+
bases=$(find "$common_config_output_dir/crd/bases" -maxdepth 1 -type f | sed -e 's/.*\// - bases\//')
2525
cat <<EOF > $common_config_output_dir/crd/kustomization.yaml
2626
# Code generated in runtime. DO NOT EDIT.
2727

0 commit comments

Comments
 (0)