Skip to content

Commit 9169dbf

Browse files
bdevcichbdevcich
committed
Update controller-gen to v0.14 and pin setup-env version.
See kubernetes-sigs/controller-runtime#2720 Signed-off-by: Blake Devcich <[email protected]>
1 parent ab6218b commit 9169dbf

13 files changed

+10158
-11581
lines changed

‎Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
307307

308308
## Tool Versions
309309
KUSTOMIZE_VERSION ?= v5.1.1
310-
CONTROLLER_TOOLS_VERSION ?= v0.13.0
310+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
311311

312312
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
313313
.PHONY: kustomize
@@ -325,8 +325,9 @@ controller-gen: $(LOCALBIN) ## Download controller-gen locally if necessary.
325325

326326
.PHONY: envtest
327327
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
328+
# TODO: revisit pinned version once https://github.com/kubernetes-sigs/controller-runtime/issues/2720 is fixed
328329
$(ENVTEST): $(LOCALBIN)
329-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
330+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9
330331

331332
.PHONY: bundle
332333
bundle: manifests kustomize ## Generate bundle manifests and metadata, then validate generated files.

‎config/crd/bases/nnf.cray.hpe.com_nnfaccesses.yaml

Lines changed: 76 additions & 52 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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: nnfaccesses.nnf.cray.hpe.com
88
spec:
99
group: nnf.cray.hpe.com
@@ -39,55 +39,68 @@ spec:
3939
description: NnfAccess is the Schema for the nnfaccesses API
4040
properties:
4141
apiVersion:
42-
description: 'APIVersion defines the versioned schema of this representation
43-
of an object. Servers should convert recognized schemas to the latest
44-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
42+
description: |-
43+
APIVersion defines the versioned schema of this representation of an object.
44+
Servers should convert recognized schemas to the latest internal value, and
45+
may reject unrecognized values.
46+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4547
type: string
4648
kind:
47-
description: 'Kind is a string value representing the REST resource this
48-
object represents. Servers may infer this from the endpoint the client
49-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
49+
description: |-
50+
Kind is a string value representing the REST resource this object represents.
51+
Servers may infer this from the endpoint the client submits requests to.
52+
Cannot be updated.
53+
In CamelCase.
54+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5055
type: string
5156
metadata:
5257
type: object
5358
spec:
5459
description: NnfAccessSpec defines the desired state of NnfAccess
5560
properties:
5661
clientReference:
57-
description: ClientReference is for a client resource. (DWS) Computes
58-
is the only client resource type currently supported
62+
description: |-
63+
ClientReference is for a client resource. (DWS) Computes is the only client
64+
resource type currently supported
5965
properties:
6066
apiVersion:
6167
description: API version of the referent.
6268
type: string
6369
fieldPath:
64-
description: 'If referring to a piece of an object instead of
65-
an entire object, this string should contain a valid JSON/Go
66-
field access statement, such as desiredState.manifest.containers[2].
67-
For example, if the object reference is to a container within
68-
a pod, this would take on a value like: "spec.containers{name}"
69-
(where "name" refers to the name of the container that triggered
70-
the event) or if no container name is specified "spec.containers[2]"
71-
(container with index 2 in this pod). This syntax is chosen
72-
only to have some well-defined way of referencing a part of
73-
an object. TODO: this design is not final and this field is
74-
subject to change in the future.'
70+
description: |-
71+
If referring to a piece of an object instead of an entire object, this string
72+
should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
73+
For example, if the object reference is to a container within a pod, this would take on a value like:
74+
"spec.containers{name}" (where "name" refers to the name of the container that triggered
75+
the event) or if no container name is specified "spec.containers[2]" (container with
76+
index 2 in this pod). This syntax is chosen only to have some well-defined way of
77+
referencing a part of an object.
78+
TODO: this design is not final and this field is subject to change in the future.
7579
type: string
7680
kind:
77-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
81+
description: |-
82+
Kind of the referent.
83+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
7884
type: string
7985
name:
80-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
86+
description: |-
87+
Name of the referent.
88+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
8189
type: string
8290
namespace:
83-
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
91+
description: |-
92+
Namespace of the referent.
93+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
8494
type: string
8595
resourceVersion:
86-
description: 'Specific resourceVersion to which this reference
87-
is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
96+
description: |-
97+
Specific resourceVersion to which this reference is made, if any.
98+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
8899
type: string
89100
uid:
90-
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
101+
description: |-
102+
UID of the referent.
103+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
91104
type: string
92105
type: object
93106
x-kubernetes-map-type: atomic
@@ -106,8 +119,9 @@ spec:
106119
description: MountPath for the storage target on the client
107120
type: string
108121
mountPathPrefix:
109-
description: MountPathPrefix to mount the storage target on the client
110-
when there is more than one mount on a client
122+
description: |-
123+
MountPathPrefix to mount the storage target on the client when there is
124+
more than one mount on a client
111125
type: string
112126
storageReference:
113127
description: StorageReference is the NnfStorage reference
@@ -116,40 +130,48 @@ spec:
116130
description: API version of the referent.
117131
type: string
118132
fieldPath:
119-
description: 'If referring to a piece of an object instead of
120-
an entire object, this string should contain a valid JSON/Go
121-
field access statement, such as desiredState.manifest.containers[2].
122-
For example, if the object reference is to a container within
123-
a pod, this would take on a value like: "spec.containers{name}"
124-
(where "name" refers to the name of the container that triggered
125-
the event) or if no container name is specified "spec.containers[2]"
126-
(container with index 2 in this pod). This syntax is chosen
127-
only to have some well-defined way of referencing a part of
128-
an object. TODO: this design is not final and this field is
129-
subject to change in the future.'
133+
description: |-
134+
If referring to a piece of an object instead of an entire object, this string
135+
should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
136+
For example, if the object reference is to a container within a pod, this would take on a value like:
137+
"spec.containers{name}" (where "name" refers to the name of the container that triggered
138+
the event) or if no container name is specified "spec.containers[2]" (container with
139+
index 2 in this pod). This syntax is chosen only to have some well-defined way of
140+
referencing a part of an object.
141+
TODO: this design is not final and this field is subject to change in the future.
130142
type: string
131143
kind:
132-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
144+
description: |-
145+
Kind of the referent.
146+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
133147
type: string
134148
name:
135-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
149+
description: |-
150+
Name of the referent.
151+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
136152
type: string
137153
namespace:
138-
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
154+
description: |-
155+
Namespace of the referent.
156+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
139157
type: string
140158
resourceVersion:
141-
description: 'Specific resourceVersion to which this reference
142-
is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
159+
description: |-
160+
Specific resourceVersion to which this reference is made, if any.
161+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
143162
type: string
144163
uid:
145-
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
164+
description: |-
165+
UID of the referent.
166+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
146167
type: string
147168
type: object
148169
x-kubernetes-map-type: atomic
149170
target:
150-
description: 'Target specifies which storage targets the client should
151-
mount - single: Only one of the storage the client can access -
152-
all: All of the storage the client can access'
171+
description: |-
172+
Target specifies which storage targets the client should mount
173+
- single: Only one of the storage the client can access
174+
- all: All of the storage the client can access
153175
enum:
154176
- single
155177
- all
@@ -168,8 +190,9 @@ spec:
168190
- PreRun
169191
- PostRun
170192
- Teardown
171-
description: TeardownState is the desired state of the workflow for
172-
this NNF Access resource to be torn down and deleted.
193+
description: |-
194+
TeardownState is the desired state of the workflow for this NNF Access resource to
195+
be torn down and deleted.
173196
type: string
174197
userID:
175198
description: UserID for the new mount. Currently only used for raw
@@ -193,8 +216,9 @@ spec:
193216
description: Internal debug message for the error
194217
type: string
195218
severity:
196-
description: Indication of how severe the error is. Minor will
197-
likely succeed, Major may succeed, and Fatal will never succeed.
219+
description: |-
220+
Indication of how severe the error is. Minor will likely succeed, Major may
221+
succeed, and Fatal will never succeed.
198222
enum:
199223
- Minor
200224
- Major

0 commit comments

Comments
 (0)