Skip to content

Commit 4d91239

Browse files
authored
Update CRD descriptions. (#360)
Signed-off-by: GitHub <noreply@github.com>
1 parent c5e210a commit 4d91239

File tree

30 files changed

+150
-147
lines changed

30 files changed

+150
-147
lines changed

deploy/cluster-manager/olm-catalog/cluster-manager/manifests/cluster-manager.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ metadata:
5959
categories: Integration & Delivery,OpenShift Optional
6060
certified: "false"
6161
containerImage: quay.io/open-cluster-management/registration-operator:latest
62-
createdAt: "2024-01-23T06:30:04Z"
62+
createdAt: "2024-02-18T02:58:21Z"
6363
description: Manages the installation and upgrade of the ClusterManager.
6464
operators.operatorframework.io/builder: operator-sdk-v1.32.0
6565
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
categories: Integration & Delivery,OpenShift Optional
3232
certified: "false"
3333
containerImage: quay.io/open-cluster-management/registration-operator:latest
34-
createdAt: "2024-01-23T06:30:04Z"
34+
createdAt: "2024-02-18T02:58:21Z"
3535
description: Manages the installation and upgrade of the Klusterlet.
3636
operators.operatorframework.io/builder: operator-sdk-v1.32.0
3737
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
k8s.io/kube-aggregator v0.29.0
3535
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
3636
open-cluster-management.io/addon-framework v0.8.1-0.20240205013730-13fbb6259464
37-
open-cluster-management.io/api v0.12.1-0.20240205100623-abaf09c1e5d4
37+
open-cluster-management.io/api v0.12.1-0.20240208054823-480f8ab2c847
3838
open-cluster-management.io/sdk-go v0.0.0-20240130025514-7385f9baadf0
3939
sigs.k8s.io/controller-runtime v0.16.2
4040
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
452452
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
453453
open-cluster-management.io/addon-framework v0.8.1-0.20240205013730-13fbb6259464 h1:FGVcwgN1f5kKuHQF7p4WcWMUkNBYLIpKy9uirEBAFu0=
454454
open-cluster-management.io/addon-framework v0.8.1-0.20240205013730-13fbb6259464/go.mod h1:SBs6wF0Umzr5/miJb9p8uMaTDbcjphHHQLa76nXnbU8=
455-
open-cluster-management.io/api v0.12.1-0.20240205100623-abaf09c1e5d4 h1:vg944w17FVNzlM4zNG6UVqA0Rvscv2iYknMpPLtlg4s=
456-
open-cluster-management.io/api v0.12.1-0.20240205100623-abaf09c1e5d4/go.mod h1:vOz9InrJq1BDFEI51+OwAyq2M3tjYPY+1cnoQhMhIlE=
455+
open-cluster-management.io/api v0.12.1-0.20240208054823-480f8ab2c847 h1:1s1DeRFhKrACHxIuGLse2YCkL18hXT9Lp8u2nrM0Seo=
456+
open-cluster-management.io/api v0.12.1-0.20240208054823-480f8ab2c847/go.mod h1:vOz9InrJq1BDFEI51+OwAyq2M3tjYPY+1cnoQhMhIlE=
457457
open-cluster-management.io/sdk-go v0.0.0-20240130025514-7385f9baadf0 h1:A+l3SkDPWnRwK3+WE5MVMh7NBvDCKkhdA+AB7Tw/lRM=
458458
open-cluster-management.io/sdk-go v0.0.0-20240130025514-7385f9baadf0/go.mod h1:p3oaf+iu9ghMl4cBJXWXlDnUHVn+QxL90YLTve9bn/k=
459459
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=

manifests/cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ spec:
2626
schema:
2727
openAPIV3Schema:
2828
description: ClusterManagementAddOn represents the registration of an add-on
29-
to the cluster manager. This resource allows the user to discover which
30-
add-on is available for the cluster manager and also provides metadata information
31-
about the add-on. This resource also provides a linkage to ManagedClusterAddOn,
32-
the name of the ClusterManagementAddOn resource will be used for the namespace-scoped
29+
to the cluster manager. This resource allows you to discover which add-ons
30+
are available for the cluster manager and provides metadata information
31+
about the add-ons. The ClusterManagementAddOn name is used for the namespace-scoped
3332
ManagedClusterAddOn resource. ClusterManagementAddOn is a cluster-scoped
3433
resource.
3534
properties:

manifests/cluster-manager/hub/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml

+12-10
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,18 @@ spec:
3535
schema:
3636
openAPIV3Schema:
3737
description: "ManagedCluster represents the desired state and current status
38-
of 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. Agent on managed cluster creates CSR on hub with cluster
41-
UID and agent name. 2. Agent on managed cluster creates ManagedCluster on
42-
hub. 3. Cluster admin on hub approves the CSR for UID and agent name of
43-
the ManagedCluster. 4. Cluster admin sets spec.acceptClient of ManagedCluster
44-
to true. 5. Cluster admin on managed cluster creates credential of kubeconfig
45-
to hub. \n Once the hub creates the cluster namespace, the Klusterlet agent
46-
on the ManagedCluster pushes the credential to the hub to use against the
47-
kube-apiserver of the ManagedCluster."
38+
of a managed cluster. ManagedCluster is a cluster-scoped resource. The name
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."
4850
properties:
4951
apiVersion:
5052
description: 'APIVersion defines the versioned schema of this representation

manifests/cluster-manager/hub/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 user's
29-
workload can run on. A workload can be defined to deployed on a ManagedClusterSet,
30-
which mean: 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 certian
34-
ManagedClusterSet, add a label with name `cluster.open-cluster-management.io/clusterset`
35-
on the ManagedCluster to refers to the ManagedClusterSet. User is not allow
36-
to add/remove this label on a ManagedCluster unless they have a RBAC rule
37-
to CREATE on a virtual subresource of managedclustersets/join. In order
38-
to update this label, user must have the permission on both the old and
39-
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

manifests/cluster-manager/hub/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. 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 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

manifests/cluster-manager/hub/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ spec:
1515
- name: v1alpha1
1616
schema:
1717
openAPIV3Schema:
18-
description: AddOnDeploymentConfig represents a deployment configuration for
19-
an add-on.
18+
description: AddOnDeploymentConfig represents a configuration to customize
19+
the deployments of an add-on. For example, you can specify the NodePlacement
20+
to control the scheduling of the add-on agents.
2021
properties:
2122
apiVersion:
2223
description: 'APIVersion defines the versioned schema of this representation

manifests/cluster-manager/hub/0000_02_clusters.open-cluster-management.io_placements.crd.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ spec:
3434
to workload namespaces; 4. Namespace-scoped Placements specify a slice of
3535
ManagedClusterSets which select a working set of potential ManagedClusters;
3636
5. Then Placements subselect from that working set using label/claim selection.
37-
\n No ManagedCluster will be selected if no ManagedClusterSet is bound to
38-
the placement namespace. User is able to bind a ManagedClusterSet to a namespace
39-
by creating a ManagedClusterSetBinding in that namespace if they have a
40-
RBAC rule to CREATE on the virtual subresource of `managedclustersets/bind`.
41-
\n A slice of PlacementDecisions with label cluster.open-cluster-management.io/placement={placement
37+
\n A ManagedCluster will not be selected if no ManagedClusterSet is bound
38+
to the placement namespace. A user is able to bind a ManagedClusterSet to
39+
a namespace by creating a ManagedClusterSetBinding in that namespace if
40+
they have an RBAC rule to CREATE on the virtual subresource of `managedclustersets/bind`.
41+
\n A slice of PlacementDecisions with the label cluster.open-cluster-management.io/placement={placement
4242
name} will be created to represent the ManagedClusters selected by this
4343
placement. \n If a ManagedCluster is selected and added into the PlacementDecisions,
4444
other components may apply workload on it; once it is removed from the PlacementDecisions,

manifests/cluster-manager/hub/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ spec:
1515
- name: v1beta1
1616
schema:
1717
openAPIV3Schema:
18-
description: "PlacementDecision indicates a decision from a placement PlacementDecision
19-
should has a label cluster.open-cluster-management.io/placement={placement
20-
name} to reference a certain placement. \n If a placement has spec.numberOfClusters
21-
specified, the total number of decisions contained in status.decisions of
22-
PlacementDecisions should always be NumberOfClusters; otherwise, the total
23-
number of decisions should be the number of ManagedClusters which match
24-
the placement requirements. \n Some of the decisions might be empty when
25-
there are no enough ManagedClusters meet the placement requirements."
18+
description: "PlacementDecision indicates a decision from a placement. PlacementDecision
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
21+
specified, the total number of decisions contained in the status.decisions
22+
of PlacementDecisions must be the same as NumberOfClusters. Otherwise, the
23+
total number of decisions must equal the number of ManagedClusters that
24+
match the placement requirements. \n Some of the decisions might be empty
25+
when there are not enough ManagedClusters to meet the placement requirements."
2626
properties:
2727
apiVersion:
2828
description: 'APIVersion defines the versioned schema of this representation

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ open-cluster-management.io/addon-framework/pkg/index
15081508
open-cluster-management.io/addon-framework/pkg/manager/controllers/addonconfiguration
15091509
open-cluster-management.io/addon-framework/pkg/manager/controllers/addonowner
15101510
open-cluster-management.io/addon-framework/pkg/utils
1511-
# open-cluster-management.io/api v0.12.1-0.20240205100623-abaf09c1e5d4
1511+
# open-cluster-management.io/api v0.12.1-0.20240208054823-480f8ab2c847
15121512
## explicit; go 1.20
15131513
open-cluster-management.io/api/addon/v1alpha1
15141514
open-cluster-management.io/api/client/addon/clientset/versioned

vendor/open-cluster-management.io/api/addon/v1alpha1/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml

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

vendor/open-cluster-management.io/api/addon/v1alpha1/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml

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

vendor/open-cluster-management.io/api/addon/v1alpha1/types_addondeploymentconfig.go

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

vendor/open-cluster-management.io/api/addon/v1alpha1/types_clustermanagementaddon.go

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

vendor/open-cluster-management.io/api/addon/v1alpha1/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.

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

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

0 commit comments

Comments
 (0)