Skip to content

Commit 2e47650

Browse files
LavenderQAQLavenderQAQ
committed
fix: update controller-gen version to fix make manifests bugs and fix lint issues
Signed-off-by: LavenderQAQ <[email protected]>
1 parent 9e2331e commit 2e47650

17 files changed

+3975
-4858
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ newcontroller:
226226
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
227227
.PHONY: controller-gen
228228
controller-gen: ## Download controller-gen locally if necessary.
229-
ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.13.0")
229+
ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.14.0")
230230
else
231231
rm -rf $(CONTROLLER_GEN)
232-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0)
232+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
233233
endif
234234

235235
.PHONY: kubectl

‎charts/yurt-manager/crds/apps.openyurt.io_nodebuckets.yaml

+12-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.13.0
5+
controller-gen.kubebuilder.io/version: v0.14.0
66
name: nodebuckets.apps.openyurt.io
77
spec:
88
group: apps.openyurt.io
@@ -35,14 +35,19 @@ spec:
3535
description: NodeBucket is the Schema for the samples API
3636
properties:
3737
apiVersion:
38-
description: 'APIVersion defines the versioned schema of this representation
39-
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/sig-architecture/api-conventions.md#resources'
38+
description: |-
39+
APIVersion defines the versioned schema of this representation of an object.
40+
Servers should convert recognized schemas to the latest internal value, and
41+
may reject unrecognized values.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4143
type: string
4244
kind:
43-
description: 'Kind is a string value representing the REST resource this
44-
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/sig-architecture/api-conventions.md#types-kinds'
45+
description: |-
46+
Kind is a string value representing the REST resource this object represents.
47+
Servers may infer this from the endpoint the client submits requests to.
48+
Cannot be updated.
49+
In CamelCase.
50+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4651
type: string
4752
metadata:
4853
type: object

‎charts/yurt-manager/crds/apps.openyurt.io_nodepools.yaml

+75-20
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.13.0
5+
controller-gen.kubebuilder.io/version: v0.14.0
66
name: nodepools.apps.openyurt.io
77
spec:
88
group: apps.openyurt.io
@@ -40,10 +40,19 @@ spec:
4040
description: NodePool is the Schema for the nodepools API
4141
properties:
4242
apiVersion:
43-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
43+
description: |-
44+
APIVersion defines the versioned schema of this representation of an object.
45+
Servers should convert recognized schemas to the latest internal value, and
46+
may reject unrecognized values.
47+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4448
type: string
4549
kind:
46-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
50+
description: |-
51+
Kind is a string value representing the REST resource this object represents.
52+
Servers may infer this from the endpoint the client submits requests to.
53+
Cannot be updated.
54+
In CamelCase.
55+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4756
type: string
4857
metadata:
4958
type: object
@@ -53,29 +62,41 @@ spec:
5362
annotations:
5463
additionalProperties:
5564
type: string
56-
description: 'If specified, the Annotations will be added to all nodes. NOTE: existing labels with samy keys on the nodes will be overwritten.'
65+
description: |-
66+
If specified, the Annotations will be added to all nodes.
67+
NOTE: existing labels with samy keys on the nodes will be overwritten.
5768
type: object
5869
labels:
5970
additionalProperties:
6071
type: string
61-
description: 'If specified, the Labels will be added to all nodes. NOTE: existing labels with samy keys on the nodes will be overwritten.'
72+
description: |-
73+
If specified, the Labels will be added to all nodes.
74+
NOTE: existing labels with samy keys on the nodes will be overwritten.
6275
type: object
6376
selector:
6477
description: A label query over nodes to consider for adding to the pool
6578
properties:
6679
matchExpressions:
6780
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
6881
items:
69-
description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
82+
description: |-
83+
A label selector requirement is a selector that contains values, a key, and an operator that
84+
relates the key and values.
7085
properties:
7186
key:
7287
description: key is the label key that the selector applies to.
7388
type: string
7489
operator:
75-
description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
90+
description: |-
91+
operator represents a key's relationship to a set of values.
92+
Valid operators are In, NotIn, Exists and DoesNotExist.
7693
type: string
7794
values:
78-
description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
95+
description: |-
96+
values is an array of string values. If the operator is In or NotIn,
97+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
98+
the values array must be empty. This array is replaced during a strategic
99+
merge patch.
79100
items:
80101
type: string
81102
type: array
@@ -87,23 +108,33 @@ spec:
87108
matchLabels:
88109
additionalProperties:
89110
type: string
90-
description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
111+
description: |-
112+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
113+
map is equivalent to an element of matchExpressions, whose key field is "key", the
114+
operator is "In", and the values array contains only "value". The requirements are ANDed.
91115
type: object
92116
type: object
93117
x-kubernetes-map-type: atomic
94118
taints:
95119
description: If specified, the Taints will be added to all nodes.
96120
items:
97-
description: The node this Taint is attached to has the "effect" on any pod that does not tolerate the Taint.
121+
description: |-
122+
The node this Taint is attached to has the "effect" on
123+
any pod that does not tolerate the Taint.
98124
properties:
99125
effect:
100-
description: Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
126+
description: |-
127+
Required. The effect of the taint on pods
128+
that do not tolerate the taint.
129+
Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
101130
type: string
102131
key:
103132
description: Required. The taint key to be applied to a node.
104133
type: string
105134
timeAdded:
106-
description: TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.
135+
description: |-
136+
TimeAdded represents the time at which the taint was added.
137+
It is only written for NoExecute taints.
107138
format: date-time
108139
type: string
109140
value:
@@ -161,10 +192,19 @@ spec:
161192
description: NodePool is the Schema for the nodepools API
162193
properties:
163194
apiVersion:
164-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
195+
description: |-
196+
APIVersion defines the versioned schema of this representation of an object.
197+
Servers should convert recognized schemas to the latest internal value, and
198+
may reject unrecognized values.
199+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
165200
type: string
166201
kind:
167-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
202+
description: |-
203+
Kind is a string value representing the REST resource this object represents.
204+
Servers may infer this from the endpoint the client submits requests to.
205+
Cannot be updated.
206+
In CamelCase.
207+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
168208
type: string
169209
metadata:
170210
type: object
@@ -174,29 +214,44 @@ spec:
174214
annotations:
175215
additionalProperties:
176216
type: string
177-
description: 'If specified, the Annotations will be added to all nodes. NOTE: existing labels with samy keys on the nodes will be overwritten.'
217+
description: |-
218+
If specified, the Annotations will be added to all nodes.
219+
NOTE: existing labels with samy keys on the nodes will be overwritten.
178220
type: object
179221
hostNetwork:
180-
description: HostNetwork is used to specify that cni components(like flannel) will not be installed on the nodes of this NodePool. This means all pods on the nodes of this NodePool will use HostNetwork and share network namespace with host machine.
222+
description: |-
223+
HostNetwork is used to specify that cni components(like flannel)
224+
will not be installed on the nodes of this NodePool.
225+
This means all pods on the nodes of this NodePool will use
226+
HostNetwork and share network namespace with host machine.
181227
type: boolean
182228
labels:
183229
additionalProperties:
184230
type: string
185-
description: 'If specified, the Labels will be added to all nodes. NOTE: existing labels with samy keys on the nodes will be overwritten.'
231+
description: |-
232+
If specified, the Labels will be added to all nodes.
233+
NOTE: existing labels with samy keys on the nodes will be overwritten.
186234
type: object
187235
taints:
188236
description: If specified, the Taints will be added to all nodes.
189237
items:
190-
description: The node this Taint is attached to has the "effect" on any pod that does not tolerate the Taint.
238+
description: |-
239+
The node this Taint is attached to has the "effect" on
240+
any pod that does not tolerate the Taint.
191241
properties:
192242
effect:
193-
description: Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
243+
description: |-
244+
Required. The effect of the taint on pods
245+
that do not tolerate the taint.
246+
Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
194247
type: string
195248
key:
196249
description: Required. The taint key to be applied to a node.
197250
type: string
198251
timeAdded:
199-
description: TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.
252+
description: |-
253+
TimeAdded represents the time at which the taint was added.
254+
It is only written for NoExecute taints.
200255
format: date-time
201256
type: string
202257
value:

0 commit comments

Comments
 (0)