Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Commit db51c47

Browse files
SataQiuSataQiu
authored
Merge pull request #10 from SataQiu/main
Support OpenYurt v0.6.0
2 parents eb5f2dc + d7e912c commit db51c47

26 files changed

+1840
-1557
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Image URL to use all building/pushing image targets
2-
TAG ?= v0.1.0
2+
TAG ?= v0.6.0
33
REPO ?= openyurt
44
MANAGER_IMG ?= ${REPO}/yurtcluster-operator-manager:${TAG}
55
AGENT_IMG ?= ${REPO}/yurtcluster-operator-agent:${TAG}

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ EOF
5050

5151
```shell
5252
# kubectl delete yurtclusters cluster
53+
# helm uninstall operator -n kube-system
5354
```

‎api/v1alpha1/defaults.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
const (
2424
// DefaultYurtVersion defines the default yurt version (image tag)
25-
DefaultYurtVersion = "v0.5.0"
25+
DefaultYurtVersion = "v0.6.0"
2626

2727
// DefaultYurtImageRepository defines the default repository for the yurt component images
2828
DefaultYurtImageRepository = "docker.io/openyurt"

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

+33-55
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: apiextensions.k8s.io/v1beta1
32
kind: CustomResourceDefinition
43
metadata:
@@ -8,29 +7,29 @@ metadata:
87
name: nodepools.apps.openyurt.io
98
spec:
109
additionalPrinterColumns:
11-
- JSONPath: .spec.type
12-
description: The type of nodepool
13-
name: Type
14-
type: string
15-
- JSONPath: .status.readyNodeNum
16-
description: The number of ready nodes in the pool
17-
name: ReadyNodes
18-
type: integer
19-
- JSONPath: .status.unreadyNodeNum
20-
name: NotReadyNodes
21-
type: integer
22-
- JSONPath: .metadata.creationTimestamp
23-
name: Age
24-
type: date
10+
- JSONPath: .spec.type
11+
description: The type of nodepool
12+
name: Type
13+
type: string
14+
- JSONPath: .status.readyNodeNum
15+
description: The number of ready nodes in the pool
16+
name: ReadyNodes
17+
type: integer
18+
- JSONPath: .status.unreadyNodeNum
19+
name: NotReadyNodes
20+
type: integer
21+
- JSONPath: .metadata.creationTimestamp
22+
name: Age
23+
type: date
2524
group: apps.openyurt.io
2625
names:
2726
categories:
28-
- all
27+
- all
2928
kind: NodePool
3029
listKind: NodePoolList
3130
plural: nodepools
3231
shortNames:
33-
- np
32+
- np
3433
singular: nodepool
3534
scope: Cluster
3635
subresources:
@@ -40,14 +39,10 @@ spec:
4039
description: NodePool is the Schema for the nodepools API
4140
properties:
4241
apiVersion:
43-
description: 'APIVersion defines the versioned schema of this representation
44-
of an object. Servers should convert recognized schemas to the latest
45-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
42+
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'
4643
type: string
4744
kind:
48-
description: 'Kind is a string value representing the REST resource this
49-
object represents. Servers may infer this from the endpoint the client
50-
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: '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'
5146
type: string
5247
metadata:
5348
type: object
@@ -57,64 +52,47 @@ spec:
5752
annotations:
5853
additionalProperties:
5954
type: string
60-
description: 'If specified, the Annotations will be added to all nodes.
61-
NOTE: existing labels with samy keys on the nodes will be overwritten.'
55+
description: 'If specified, the Annotations will be added to all nodes. NOTE: existing labels with samy keys on the nodes will be overwritten.'
6256
type: object
6357
labels:
6458
additionalProperties:
6559
type: string
66-
description: 'If specified, the Labels will be added to all nodes. NOTE:
67-
existing labels with samy keys on the nodes will be overwritten.'
60+
description: 'If specified, the Labels will be added to all nodes. NOTE: existing labels with samy keys on the nodes will be overwritten.'
6861
type: object
6962
selector:
70-
description: A label query over nodes to consider for adding to the
71-
pool
63+
description: A label query over nodes to consider for adding to the pool
7264
properties:
7365
matchExpressions:
74-
description: matchExpressions is a list of label selector requirements.
75-
The requirements are ANDed.
66+
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
7667
items:
77-
description: A label selector requirement is a selector that contains
78-
values, a key, and an operator that relates the key and values.
68+
description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
7969
properties:
8070
key:
81-
description: key is the label key that the selector applies
82-
to.
71+
description: key is the label key that the selector applies to.
8372
type: string
8473
operator:
85-
description: operator represents a key's relationship to a
86-
set of values. Valid operators are In, NotIn, Exists and
87-
DoesNotExist.
74+
description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
8875
type: string
8976
values:
90-
description: values is an array of string values. If the operator
91-
is In or NotIn, the values array must be non-empty. If the
92-
operator is Exists or DoesNotExist, the values array must
93-
be empty. This array is replaced during a strategic merge
94-
patch.
77+
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.
9578
items:
9679
type: string
9780
type: array
9881
required:
99-
- key
100-
- operator
82+
- key
83+
- operator
10184
type: object
10285
type: array
10386
matchLabels:
10487
additionalProperties:
10588
type: string
106-
description: matchLabels is a map of {key,value} pairs. A single
107-
{key,value} in the matchLabels map is equivalent to an element
108-
of matchExpressions, whose key field is "key", the operator is
109-
"In", and the values array contains only "value". The requirements
110-
are ANDed.
89+
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.
11190
type: object
11291
type: object
11392
taints:
11493
description: If specified, the Taints will be added to all nodes.
11594
items:
116-
description: The node this Taint is attached to has the "effect" on
117-
any pod that does not tolerate the Taint.
95+
description: The node this Taint is attached to has the "effect" on any pod that does not tolerate the Taint.
11896
type: object
11997
type: array
12098
type:
@@ -141,9 +119,9 @@ spec:
141119
type: object
142120
version: v1alpha1
143121
versions:
144-
- name: v1alpha1
145-
served: true
146-
storage: true
122+
- name: v1alpha1
123+
served: true
124+
storage: true
147125
status:
148126
acceptedNames:
149127
kind: ""

0 commit comments

Comments
 (0)