Skip to content

Commit e93bcb3

Browse files
a-hilalya-hilaly
authored
Regenerate CRDs with controller-gen v0.14.0 (#135)
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent b8ace6e commit e93bcb3

File tree

3 files changed

+149
-112
lines changed

3 files changed

+149
-112
lines changed

‎apis/core/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
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

Lines changed: 117 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: adoptedresources.services.k8s.aws
98
spec:
109
group: services.k8s.aws
@@ -21,14 +20,19 @@ spec:
2120
description: AdoptedResource is the schema for the AdoptedResource API.
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
@@ -42,126 +46,149 @@ spec:
4246
additionalKeys:
4347
additionalProperties:
4448
type: string
45-
description: AdditionalKeys represents any additional arbitrary
46-
identifiers used when describing the target resource.
49+
description: |-
50+
AdditionalKeys represents any additional arbitrary identifiers used when
51+
describing the target resource.
4752
type: object
4853
arn:
49-
description: ARN is the AWS Resource Name for the resource. It
50-
is a globally unique identifier.
54+
description: |-
55+
ARN is the AWS Resource Name for the resource. It is a globally
56+
unique identifier.
5157
type: string
5258
nameOrID:
53-
description: NameOrId is a user-supplied string identifier for
54-
the resource. It may or may not be globally unique, depending
55-
on the type of resource.
59+
description: |-
60+
NameOrId is a user-supplied string identifier for the resource. It may
61+
or may not be globally unique, depending on the type of resource.
5662
type: string
5763
type: object
5864
kubernetes:
59-
description: ResourceWithMetadata provides the values necessary to
60-
create a Kubernetes resource and override any of its metadata values.
65+
description: |-
66+
ResourceWithMetadata provides the values necessary to create a
67+
Kubernetes resource and override any of its metadata values.
6168
properties:
6269
group:
6370
type: string
6471
kind:
6572
type: string
6673
metadata:
67-
description: "ObjectMeta is metadata that all persisted resources
68-
must have, which includes all objects users must create. It
69-
is not possible to use `metav1.ObjectMeta` inside spec, as the
70-
controller-gen automatically converts this to an arbitrary string-string
71-
map. https://github.com/kubernetes-sigs/controller-tools/issues/385
72-
\n Active discussion about inclusion of this field in the spec
73-
is happening in this PR: https://github.com/kubernetes-sigs/controller-tools/pull/395
74-
\n Until this is allowed, or if it never is, we will produce
75-
a subset of the object meta that contains only the fields which
76-
the user is allowed to modify in the metadata."
74+
description: |-
75+
ObjectMeta is metadata that all persisted resources must have, which includes all objects
76+
users must create.
77+
It is not possible to use `metav1.ObjectMeta` inside spec, as the controller-gen
78+
automatically converts this to an arbitrary string-string map.
79+
https://github.com/kubernetes-sigs/controller-tools/issues/385
80+
81+
82+
Active discussion about inclusion of this field in the spec is happening in this PR:
83+
https://github.com/kubernetes-sigs/controller-tools/pull/395
84+
85+
86+
Until this is allowed, or if it never is, we will produce a subset of the object meta
87+
that contains only the fields which the user is allowed to modify in the metadata.
7788
properties:
7889
annotations:
7990
additionalProperties:
8091
type: string
81-
description: 'Annotations is an unstructured key value map
82-
stored with a resource that may be set by external tools
83-
to store and retrieve arbitrary metadata. They are not queryable
84-
and should be preserved when modifying objects. More info:
85-
http://kubernetes.io/docs/user-guide/annotations'
92+
description: |-
93+
Annotations is an unstructured key value map stored with a resource that may be
94+
set by external tools to store and retrieve arbitrary metadata. They are not
95+
queryable and should be preserved when modifying objects.
96+
More info: http://kubernetes.io/docs/user-guide/annotations
8697
type: object
8798
generateName:
88-
description: "GenerateName is an optional prefix, used by
89-
the server, to generate a unique name ONLY IF the Name field
90-
has not been provided. If this field is used, the name returned
91-
to the client will be different than the name passed. This
92-
value will also be combined with a unique suffix. The provided
93-
value has the same validation rules as the Name field, and
94-
may be truncated by the length of the suffix required to
95-
make the value unique on the server. \n If this field is
96-
specified and the generated name exists, the server will
97-
NOT return a 409 - instead, it will either return 201 Created
98-
or 500 with Reason ServerTimeout indicating a unique name
99-
could not be found in the time allotted, and the client
100-
should retry (optionally after the time indicated in the
101-
Retry-After header). \n Applied only if Name is not specified.
102-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency"
99+
description: |-
100+
GenerateName is an optional prefix, used by the server, to generate a unique
101+
name ONLY IF the Name field has not been provided.
102+
If this field is used, the name returned to the client will be different
103+
than the name passed. This value will also be combined with a unique suffix.
104+
The provided value has the same validation rules as the Name field,
105+
and may be truncated by the length of the suffix required to make the value
106+
unique on the server.
107+
108+
109+
If this field is specified and the generated name exists, the server will
110+
NOT return a 409 - instead, it will either return 201 Created or 500 with Reason
111+
ServerTimeout indicating a unique name could not be found in the time allotted, and the client
112+
should retry (optionally after the time indicated in the Retry-After header).
113+
114+
115+
Applied only if Name is not specified.
116+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
103117
type: string
104118
labels:
105119
additionalProperties:
106120
type: string
107-
description: 'Map of string keys and values that can be used
108-
to organize and categorize (scope and select) objects. May
109-
match selectors of replication controllers and services.
110-
More info: http://kubernetes.io/docs/user-guide/labels'
121+
description: |-
122+
Map of string keys and values that can be used to organize and categorize
123+
(scope and select) objects. May match selectors of replication controllers
124+
and services.
125+
More info: http://kubernetes.io/docs/user-guide/labels
111126
type: object
112127
name:
113-
description: 'Name must be unique within a namespace. Is required
114-
when creating resources, although some resources may allow
115-
a client to request the generation of an appropriate name
116-
automatically. Name is primarily intended for creation idempotence
117-
and configuration definition. Cannot be updated. More info:
118-
http://kubernetes.io/docs/user-guide/identifiers#names'
128+
description: |-
129+
Name must be unique within a namespace. Is required when creating resources, although
130+
some resources may allow a client to request the generation of an appropriate name
131+
automatically. Name is primarily intended for creation idempotence and configuration
132+
definition.
133+
Cannot be updated.
134+
More info: http://kubernetes.io/docs/user-guide/identifiers#names
119135
type: string
120136
namespace:
121-
description: "Namespace defines the space within each name
122-
must be unique. An empty namespace is equivalent to the
123-
\"default\" namespace, but \"default\" is the canonical
124-
representation. Not all objects are required to be scoped
125-
to a namespace - the value of this field for those objects
126-
will be empty. \n Must be a DNS_LABEL. Cannot be updated.
127-
More info: http://kubernetes.io/docs/user-guide/namespaces"
137+
description: |-
138+
Namespace defines the space within each name must be unique. An empty namespace is
139+
equivalent to the "default" namespace, but "default" is the canonical representation.
140+
Not all objects are required to be scoped to a namespace - the value of this field for
141+
those objects will be empty.
142+
143+
144+
Must be a DNS_LABEL.
145+
Cannot be updated.
146+
More info: http://kubernetes.io/docs/user-guide/namespaces
128147
type: string
129148
ownerReferences:
130-
description: List of objects depended by this object. If ALL
131-
objects in the list have been deleted, this object will
132-
be garbage collected. If this object is managed by a controller,
133-
then an entry in this list will point to this controller,
134-
with the controller field set to true. There cannot be more
135-
than one managing controller.
149+
description: |-
150+
List of objects depended by this object. If ALL objects in the list have
151+
been deleted, this object will be garbage collected. If this object is managed by a controller,
152+
then an entry in this list will point to this controller, with the controller field set to true.
153+
There cannot be more than one managing controller.
136154
items:
137-
description: OwnerReference contains enough information
138-
to let you identify an owning object. An owning object
139-
must be in the same namespace as the dependent, or be
140-
cluster-scoped, so there is no namespace field.
155+
description: |-
156+
OwnerReference contains enough information to let you identify an owning
157+
object. An owning object must be in the same namespace as the dependent, or
158+
be cluster-scoped, so there is no namespace field.
141159
properties:
142160
apiVersion:
143161
description: API version of the referent.
144162
type: string
145163
blockOwnerDeletion:
146-
description: If true, AND if the owner has the "foregroundDeletion"
147-
finalizer, then the owner cannot be deleted from the
148-
key-value store until this reference is removed. Defaults
149-
to false. To set this field, a user needs "delete"
150-
permission of the owner, otherwise 422 (Unprocessable
151-
Entity) will be returned.
164+
description: |-
165+
If true, AND if the owner has the "foregroundDeletion" finalizer, then
166+
the owner cannot be deleted from the key-value store until this
167+
reference is removed.
168+
See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion
169+
for how the garbage collector interacts with this field and enforces the foreground deletion.
170+
Defaults to false.
171+
To set this field, a user needs "delete" permission of the owner,
172+
otherwise 422 (Unprocessable Entity) will be returned.
152173
type: boolean
153174
controller:
154175
description: If true, this reference points to the managing
155176
controller.
156177
type: boolean
157178
kind:
158-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
179+
description: |-
180+
Kind of the referent.
181+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
159182
type: string
160183
name:
161-
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
184+
description: |-
185+
Name of the referent.
186+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names
162187
type: string
163188
uid:
164-
description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
189+
description: |-
190+
UID of the referent.
191+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids
165192
type: string
166193
required:
167194
- apiVersion
@@ -185,13 +212,14 @@ spec:
185212
AdoptedResource.
186213
properties:
187214
conditions:
188-
description: A collection of `ackv1alpha1.Condition` objects that
189-
describe the various terminal states of the adopted resource CR
190-
and its target custom resource
215+
description: |-
216+
A collection of `ackv1alpha1.Condition` objects that describe the various
217+
terminal states of the adopted resource CR and its target custom resource
191218
items:
192-
description: Condition is the common struct used by all CRDs managed
193-
by ACK service controllers to indicate terminal states of the
194-
CR and its backend AWS service API resource
219+
description: |-
220+
Condition is the common struct used by all CRDs managed by ACK service
221+
controllers to indicate terminal states of the CR and its backend AWS
222+
service API resource
195223
properties:
196224
lastTransitionTime:
197225
description: Last time the condition transitioned from one status

0 commit comments

Comments
 (0)