Skip to content

Commit 044db67

Browse files
author
openyurt-bot
committed
align with openyurt helm charts from commit 470292f503df16c3ca4f8e553b4b6473ed0beb68
1 parent 71b09a4 commit 044db67

File tree

2 files changed

+197
-8
lines changed

2 files changed

+197
-8
lines changed

Diff for: charts/yurt-manager/crds/apps.openyurt.io_nodepools.yaml

+189
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,195 @@ spec:
287287
type: object
288288
type: object
289289
served: true
290+
storage: false
291+
subresources:
292+
status: {}
293+
- additionalPrinterColumns:
294+
- description: The type of nodepool
295+
jsonPath: .spec.type
296+
name: Type
297+
type: string
298+
- description: The number of ready nodes in the pool
299+
jsonPath: .status.readyNodeNum
300+
name: ReadyNodes
301+
type: integer
302+
- jsonPath: .status.unreadyNodeNum
303+
name: NotReadyNodes
304+
type: integer
305+
- jsonPath: .metadata.creationTimestamp
306+
name: Age
307+
type: date
308+
name: v1beta2
309+
schema:
310+
openAPIV3Schema:
311+
description: NodePool is the Schema for the nodepools API
312+
properties:
313+
apiVersion:
314+
description: |-
315+
APIVersion defines the versioned schema of this representation of an object.
316+
Servers should convert recognized schemas to the latest internal value, and
317+
may reject unrecognized values.
318+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
319+
type: string
320+
kind:
321+
description: |-
322+
Kind is a string value representing the REST resource this object represents.
323+
Servers may infer this from the endpoint the client submits requests to.
324+
Cannot be updated.
325+
In CamelCase.
326+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
327+
type: string
328+
metadata:
329+
type: object
330+
spec:
331+
description: NodePoolSpec defines the desired state of NodePool
332+
properties:
333+
annotations:
334+
additionalProperties:
335+
type: string
336+
description: |-
337+
If specified, the Annotations will be added to all nodes.
338+
NOTE: existing labels with samy keys on the nodes will be overwritten.
339+
type: object
340+
hostNetwork:
341+
description: |-
342+
HostNetwork is used to specify that cni components(like flannel)
343+
will not be installed on the nodes of this NodePool.
344+
This means all pods on the nodes of this NodePool will use
345+
HostNetwork and share network namespace with host machine.
346+
type: boolean
347+
interConnectivity:
348+
description: |-
349+
InterConnectivity represents all nodes in the NodePool can access with each other
350+
through Layer 2 or Layer 3 network or not. If the field is true,
351+
nodepool-level list/watch requests reuse can be applied for this nodepool.
352+
otherwise, only node-level list/watch requests reuse can be applied for the nodepool.
353+
This field cannot be changed after creation.
354+
type: boolean
355+
labels:
356+
additionalProperties:
357+
type: string
358+
description: |-
359+
If specified, the Labels will be added to all nodes.
360+
NOTE: existing labels with samy keys on the nodes will be overwritten.
361+
type: object
362+
leaderElectionStrategy:
363+
description: |-
364+
LeaderElectionStrategy represents the policy how to elect a leader Yurthub in a nodepool.
365+
random: select one ready node as leader at random.
366+
mark: select one ready node as leader from nodes that are specified by labelselector.
367+
More strategies will be supported according to user's new requirements.
368+
type: string
369+
leaderNodeLabelSelector:
370+
additionalProperties:
371+
type: string
372+
description: |-
373+
LeaderNodeLabelSelector is used only when LeaderElectionStrategy is mark. leader Yurhub will be
374+
elected from nodes that filtered by this label selector.
375+
type: object
376+
poolScopeMetadata:
377+
description: |-
378+
PoolScopeMetadata is used for specifying resources which will be shared in the nodepool.
379+
And it is supported to modify dynamically. and the default value is v1.Service and discovery.Endpointslice.
380+
items:
381+
description: |-
382+
GroupVersionKind unambiguously identifies a kind. It doesn't anonymously include GroupVersion
383+
to avoid automatic coercion. It doesn't use a GroupVersion to avoid custom marshalling
384+
properties:
385+
group:
386+
type: string
387+
kind:
388+
type: string
389+
version:
390+
type: string
391+
required:
392+
- group
393+
- kind
394+
- version
395+
type: object
396+
type: array
397+
taints:
398+
description: If specified, the Taints will be added to all nodes.
399+
items:
400+
description: |-
401+
The node this Taint is attached to has the "effect" on
402+
any pod that does not tolerate the Taint.
403+
properties:
404+
effect:
405+
description: |-
406+
Required. The effect of the taint on pods
407+
that do not tolerate the taint.
408+
Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
409+
type: string
410+
key:
411+
description: Required. The taint key to be applied to a node.
412+
type: string
413+
timeAdded:
414+
description: |-
415+
TimeAdded represents the time at which the taint was added.
416+
It is only written for NoExecute taints.
417+
format: date-time
418+
type: string
419+
value:
420+
description: The taint value corresponding to the taint key.
421+
type: string
422+
required:
423+
- effect
424+
- key
425+
type: object
426+
type: array
427+
type:
428+
description: The type of the NodePool
429+
type: string
430+
type: object
431+
status:
432+
description: NodePoolStatus defines the observed state of NodePool
433+
properties:
434+
conditions:
435+
description: |-
436+
Conditions represents the latest available observations of a NodePool's
437+
current state that includes LeaderHubElection status.
438+
items:
439+
properties:
440+
lastTransitionTime:
441+
description: Last time the condition transitioned from one status to another.
442+
format: date-time
443+
type: string
444+
message:
445+
description: A human readable message indicating details about the transition.
446+
type: string
447+
reason:
448+
description: The reason for the condition's last transition.
449+
type: string
450+
status:
451+
description: Status of the condition, one of True, False, Unknown.
452+
type: string
453+
type:
454+
description: Type of NodePool condition.
455+
type: string
456+
type: object
457+
type: array
458+
leaderEndpoints:
459+
description: LeaderEndpoints is used for storing the address of Leader Yurthub.
460+
items:
461+
type: string
462+
type: array
463+
nodes:
464+
description: The list of nodes' names in the pool
465+
items:
466+
type: string
467+
type: array
468+
readyNodeNum:
469+
description: Total number of ready nodes in the pool.
470+
format: int32
471+
type: integer
472+
unreadyNodeNum:
473+
description: Total number of unready nodes in the pool.
474+
format: int32
475+
type: integer
476+
type: object
477+
type: object
478+
served: true
290479
storage: true
291480
subresources:
292481
status: {}

Diff for: charts/yurt-manager/templates/yurt-manager-auto-generated.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1500,19 +1500,19 @@ webhooks:
15001500
sideEffects: None
15011501
- admissionReviewVersions:
15021502
- v1
1503-
- v1beta1
1503+
- v1beta2
15041504
clientConfig:
15051505
service:
15061506
name: yurt-manager-webhook-service
15071507
namespace: {{ .Release.Namespace }}
1508-
path: /mutate-apps-openyurt-io-v1beta1-nodepool
1508+
path: /mutate-apps-openyurt-io-v1beta2-nodepool
15091509
failurePolicy: Fail
1510-
name: m.v1beta1.nodepool.kb.io
1510+
name: m.v1beta2.nodepool.kb.io
15111511
rules:
15121512
- apiGroups:
15131513
- apps.openyurt.io
15141514
apiVersions:
1515-
- v1beta1
1515+
- v1beta2
15161516
operations:
15171517
- CREATE
15181518
resources:
@@ -1690,19 +1690,19 @@ webhooks:
16901690
sideEffects: None
16911691
- admissionReviewVersions:
16921692
- v1
1693-
- v1beta1
1693+
- v1beta2
16941694
clientConfig:
16951695
service:
16961696
name: yurt-manager-webhook-service
16971697
namespace: {{ .Release.Namespace }}
1698-
path: /validate-apps-openyurt-io-v1beta1-nodepool
1698+
path: /validate-apps-openyurt-io-v1beta2-nodepool
16991699
failurePolicy: Fail
1700-
name: v.v1beta1.nodepool.kb.io
1700+
name: v.v1beta2.nodepool.kb.io
17011701
rules:
17021702
- apiGroups:
17031703
- apps.openyurt.io
17041704
apiVersions:
1705-
- v1beta1
1705+
- v1beta2
17061706
operations:
17071707
- CREATE
17081708
- UPDATE

0 commit comments

Comments
 (0)