Skip to content

Commit 0b7cec2

Browse files
authored
Update.
Signed-off-by: GitHub <[email protected]>
1 parent d9de97e commit 0b7cec2

11 files changed

+64
-64
lines changed

cluster/v1/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml

+11-10
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ spec:
3636
openAPIV3Schema:
3737
description: "ManagedCluster represents the desired state and current status
3838
of a managed cluster. ManagedCluster is a cluster-scoped resource. The name
39-
is the cluster UID. \n The cluster join process follows a double opt-in
40-
process: \n 1. The agent on the managed cluster creates a CSR on the hub
41-
with the cluster UID and agent name. 2. The agent on the managed cluster
42-
creates a ManagedCluster on the hub. 3. The cluster admin on the hub approves
43-
the CSR for the UID and agent name of the ManagedCluster. 4. The cluster
44-
admin sets the spec.acceptClient of the ManagedCluster to true. 5. The cluster
45-
admin on the managed cluster creates a credential of the kubeconfig for
46-
the hub. \n Once the hub creates the cluster namespace, the Klusterlet agent
47-
on the ManagedCluster pushes the credential to the hub to use against the
48-
kube-apiserver of the ManagedCluster."
39+
is the cluster UID. \n The cluster join process is a double opt-in process.
40+
See the following join process steps: \n 1. The agent on the managed cluster
41+
creates a CSR on the hub with the cluster UID and agent name. 2. The agent
42+
on the managed cluster creates a ManagedCluster on the hub. 3. The cluster
43+
admin on the hub cluster approves the CSR for the UID and agent name of
44+
the ManagedCluster. 4. The cluster admin sets the spec.acceptClient of the
45+
ManagedCluster to true. 5. The cluster admin on the managed cluster creates
46+
a credential of the kubeconfig for the hub cluster. \n After the hub cluster
47+
creates the cluster namespace, the klusterlet agent on the ManagedCluster
48+
pushes the credential to the hub cluster to use against the kube-apiserver
49+
of the ManagedCluster."
4950
properties:
5051
apiVersion:
5152
description: 'APIVersion defines the versioned schema of this representation

cluster/v1/types.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ import (
1616
// +kubebuilder:printcolumn:JSONPath=`.status.conditions[?(@.type=="ManagedClusterConditionAvailable")].status`,name="Available",type=string
1717
// +kubebuilder:printcolumn:JSONPath=`.metadata.creationTimestamp`,name="Age",type=date
1818

19-
// ManagedCluster represents the desired state and current status of a managed
20-
// cluster. ManagedCluster is a cluster-scoped resource. The name is the cluster
21-
// UID.
19+
// ManagedCluster represents the desired state and current status
20+
// of a managed cluster. ManagedCluster is a cluster-scoped resource. The name
21+
// is the cluster UID.
2222
//
23-
// The cluster join process follows a double opt-in process:
23+
// The cluster join process is a double opt-in process. See the following join process steps:
2424
//
2525
// 1. The agent on the managed cluster creates a CSR on the hub with the cluster UID and agent name.
2626
// 2. The agent on the managed cluster creates a ManagedCluster on the hub.
27-
// 3. The cluster admin on the hub approves the CSR for the UID and agent name of the ManagedCluster.
27+
// 3. The cluster admin on the hub cluster approves the CSR for the UID and agent name of the ManagedCluster.
2828
// 4. The cluster admin sets the spec.acceptClient of the ManagedCluster to true.
29-
// 5. The cluster admin on the managed cluster creates a credential of the kubeconfig for the hub.
29+
// 5. The cluster admin on the managed cluster creates a credential of the kubeconfig for the hub cluster.
3030
//
31-
// Once the hub creates the cluster namespace, the Klusterlet agent on the ManagedCluster
32-
// pushes the credential to the hub to use against the kube-apiserver of the ManagedCluster.
31+
// After the hub cluster creates the cluster namespace, the klusterlet agent on the ManagedCluster pushes
32+
// the credential to the hub cluster to use against the kube-apiserver of the ManagedCluster.
3333
type ManagedCluster struct {
3434
metav1.TypeMeta `json:",inline"`
3535
metav1.ObjectMeta `json:"metadata,omitempty"`

cluster/v1/zz_generated.swagger_doc_generated.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster/v1beta1/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ spec:
1616
schema:
1717
openAPIV3Schema:
1818
description: "PlacementDecision indicates a decision from a placement. PlacementDecision
19-
should have a label cluster.open-cluster-management.io/placement={placement
20-
name} to reference a certain placement. \n If a placement has spec.numberOfClusters
19+
must have a cluster.open-cluster-management.io/placement={placement name}
20+
label to reference a certain placement. \n If a placement has spec.numberOfClusters
2121
specified, the total number of decisions contained in the status.decisions
22-
of PlacementDecisions should always equal NumberOfClusters; otherwise, the
23-
total number of decisions should equal the number of ManagedClusters that
22+
of PlacementDecisions must be the same as NumberOfClusters. Otherwise, the
23+
total number of decisions must equal the number of ManagedClusters that
2424
match the placement requirements. \n Some of the decisions might be empty
2525
when there are not enough ManagedClusters to meet the placement requirements."
2626
properties:

cluster/v1beta1/types_placementdecision.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
88
// +kubebuilder:subresource:status
99

1010
// PlacementDecision indicates a decision from a placement.
11-
// PlacementDecision should have a label cluster.open-cluster-management.io/placement={placement name}
12-
// to reference a certain placement.
11+
// PlacementDecision must have a cluster.open-cluster-management.io/placement={placement name} label to reference a certain placement.
1312
//
1413
// If a placement has spec.numberOfClusters specified, the total number of decisions contained in
15-
// the status.decisions of PlacementDecisions should always equal NumberOfClusters; otherwise, the total
16-
// number of decisions should equal the number of ManagedClusters that match the placement requirements.
14+
// the status.decisions of PlacementDecisions must be the same as NumberOfClusters. Otherwise, the
15+
// total number of decisions must equal the number of ManagedClusters that
16+
// match the placement requirements.
1717
//
18-
// Some of the decisions might be empty when there are not enough ManagedClusters to meet the placement
19-
// requirements.
18+
// Some of the decisions might be empty when there are not enough ManagedClusters to meet the placement requirements.
2019
type PlacementDecision struct {
2120
metav1.TypeMeta `json:",inline"`
2221
metav1.ObjectMeta `json:"metadata,omitempty"`

cluster/v1beta1/zz_generated.swagger_doc_generated.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster/v1beta2/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ spec:
2525
name: v1beta2
2626
schema:
2727
openAPIV3Schema:
28-
description: "ManagedClusterSet defines a group of ManagedClusters that users'
29-
workloads can run on. A workload can be defined to be deployed on a ManagedClusterSet,
30-
which means: 1. The workload can run on any ManagedCluster in the ManagedClusterSet
31-
2. The workload cannot run on any ManagedCluster outside the ManagedClusterSet
32-
3. The service exposed by the workload can be shared in any ManagedCluster
33-
in the ManagedClusterSet \n In order to assign a ManagedCluster to a certain
34-
ManagedClusterSet, add a label with the name `cluster.open-cluster-management.io/clusterset`
35-
on the ManagedCluster to refer to the ManagedClusterSet. The user is not
36-
allowed to add/remove this label on a ManagedCluster unless they have an
37-
RBAC rule to CREATE on a virtual subresource of managedclustersets/join.
38-
In order to update this label, the user must have the permission on both
39-
the old and new ManagedClusterSet."
28+
description: "ManagedClusterSet defines a group of ManagedClusters that you
29+
can run workloads on. You can define a workload to be deployed on a ManagedClusterSet.
30+
See the following options for the workload: - The workload can run on any
31+
ManagedCluster in the ManagedClusterSet - The workload cannot run on any
32+
ManagedCluster outside the ManagedClusterSet - The service exposed by the
33+
workload can be shared in any ManagedCluster in the ManagedClusterSet \n
34+
To assign a ManagedCluster to a certain ManagedClusterSet, add a label with
35+
the name cluster.open-cluster-management.io/clusterset on the ManagedCluster
36+
to refer to the ManagedClusterSet. You are not allowed to add or remove
37+
this label on a ManagedCluster unless you have an RBAC rule to CREATE on
38+
a virtual subresource of managedclustersets/join. To update this label,
39+
you must have the permission on both the old and new ManagedClusterSet."
4040
properties:
4141
apiVersion:
4242
description: 'APIVersion defines the versioned schema of this representation

cluster/v1beta2/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ spec:
1919
schema:
2020
openAPIV3Schema:
2121
description: ManagedClusterSetBinding projects a ManagedClusterSet into a
22-
certain namespace. A user is able to create a ManagedClusterSetBinding in
23-
a namespace and bind it to a ManagedClusterSet if they have an RBAC rule
24-
to CREATE on the virtual subresource of managedclustersets/bind. Workloads
25-
created in the same namespace can only be distributed to ManagedClusters
26-
in ManagedClusterSets that are bound in this namespace by higher-level controllers.
22+
certain namespace. You can create a ManagedClusterSetBinding in a namespace
23+
and bind it to a ManagedClusterSet if both have a RBAC rules to CREATE on
24+
the virtual subresource of managedclustersets/bind. Workloads that you create
25+
in the same namespace can only be distributed to ManagedClusters in ManagedClusterSets
26+
that are bound in this namespace by higher-level controllers.
2727
properties:
2828
apiVersion:
2929
description: 'APIVersion defines the versioned schema of this representation

cluster/v1beta2/types_managedclusterset.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@ const ClusterSetLabel = "cluster.open-cluster-management.io/clusterset"
1616
// +kubebuilder:printcolumn:name="Empty",type="string",JSONPath=".status.conditions[?(@.type==\"ClusterSetEmpty\")].status"
1717
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
1818

19-
// ManagedClusterSet defines a group of ManagedClusters that users' workloads can run on.
20-
// A workload can be defined to be deployed on a ManagedClusterSet, which means:
21-
// 1. The workload can run on any ManagedCluster in the ManagedClusterSet
22-
// 2. The workload cannot run on any ManagedCluster outside the ManagedClusterSet
23-
// 3. The service exposed by the workload can be shared in any ManagedCluster in the ManagedClusterSet
19+
// ManagedClusterSet defines a group of ManagedClusters that you can run
20+
// workloads on. You can define a workload to be deployed on a ManagedClusterSet. See the following options for the workload:
21+
// - The workload can run on any ManagedCluster in the ManagedClusterSet
22+
// - The workload cannot run on any ManagedCluster outside the ManagedClusterSet
23+
// - The service exposed by the workload can be shared in any ManagedCluster in the ManagedClusterSet
2424
//
25-
// In order to assign a ManagedCluster to a certain ManagedClusterSet, add a label with the name
26-
// `cluster.open-cluster-management.io/clusterset` on the ManagedCluster to refer to the ManagedClusterSet.
27-
// The user is not allowed to add/remove this label on a ManagedCluster unless they have an RBAC rule to CREATE on
28-
// a virtual subresource of managedclustersets/join. In order to update this label, the user must have the permission
29-
// on both the old and new ManagedClusterSet.
25+
// To assign a ManagedCluster to a certain ManagedClusterSet, add a label with the name cluster.open-cluster-management.io/clusterset
26+
// on the ManagedCluster to refer to the ManagedClusterSet. You are not
27+
// allowed to add or remove this label on a ManagedCluster unless you have an
28+
// RBAC rule to CREATE on a virtual subresource of managedclustersets/join.
29+
// To update this label, you must have the permission on both
30+
// the old and new ManagedClusterSet.
3031
type ManagedClusterSet struct {
3132
metav1.TypeMeta `json:",inline"`
3233
metav1.ObjectMeta `json:"metadata,omitempty"`

cluster/v1beta2/types_managedclustersetbinding.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ import (
1111
// +kubebuilder:storageversion
1212

1313
// ManagedClusterSetBinding projects a ManagedClusterSet into a certain namespace.
14-
// A user is able to create a ManagedClusterSetBinding in a namespace and bind it to a
15-
// ManagedClusterSet if they have an RBAC rule to CREATE on the virtual subresource of
16-
// managedclustersets/bind. Workloads created in the same namespace can only be
17-
// distributed to ManagedClusters in ManagedClusterSets that are bound in this namespace by
18-
// higher-level controllers.
14+
// You can create a ManagedClusterSetBinding in a namespace and bind it to a
15+
// ManagedClusterSet if both have a RBAC rules to CREATE on the virtual subresource of managedclustersets/bind.
16+
// Workloads that you create in the same namespace can only be distributed to ManagedClusters
17+
// in ManagedClusterSets that are bound in this namespace by higher-level controllers.
1918
type ManagedClusterSetBinding struct {
2019
metav1.TypeMeta `json:",inline"`
2120
metav1.ObjectMeta `json:"metadata,omitempty"`

cluster/v1beta2/zz_generated.swagger_doc_generated.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)