Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions content/en/community/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Open Cluster Management has approximately a three to four month release cycle. T

## `v0.7.0`, on 6th, April 2022

The Open Cluster Management team is exicted to announce the release of OCM v0.7.0! We mainly focused on enhancing user experience in this release by introducing a bunch of new commands in `clusteradm`. Notable changes including:
The Open Cluster Management team is excited to announce the release of OCM v0.7.0! We mainly focused on enhancing user experience in this release by introducing a bunch of new commands in `clusteradm`. Notable changes including:

- APIs including `placement`, `placementdecision`, `managedclusterset` and `managedclustersetbinding` are upgraded to `v1beta1`, `v1alpha1` version of these APIs are deprecated and will be removed in the next release.
- User can now use `clusteradm` to:
Expand Down Expand Up @@ -72,7 +72,7 @@ There are 20+ contributors making contributions in this release, they are @champ

## `v0.5.0`, on 8th, November 2021

Open Cluster Management team is proud to annouce the release of OCM v0.5.0! We made several enhancements on APIs
Open Cluster Management team is proud to announce the release of OCM v0.5.0! We made several enhancements on APIs
and addons which include:

- [Support deleteOption in ManifestWork.](https://github.com/open-cluster-management-io/enhancements/tree/main/enhancements/sig-architecture/10-deletepropagationstrategy)
Expand All @@ -90,7 +90,7 @@ To see details of the changelogs in this release:
- placement v0.2.0 [changelog](https://github.com/open-cluster-management-io/placement/blob/v0.2.0/CHANGELOG/CHANGELOG-v0.2.md)
- addon-framework v0.1.0 [changelog](https://github.com/open-cluster-management-io/addon-framework/blob/v0.1.0/CHANGELOG/CHANGELOG-v0.1.md)
- registration-operator v0.5.0 [changelog](https://github.com/open-cluster-management-io/registration-operator/blob/v0.5.0/CHANGELOG/CHANGELOG-v0.5.md)
- multicloud-operators-subscription v0.5.0 [chagelog](https://github.com/open-cluster-management-io/multicloud-operators-subscription/blob/v0.5.0/CHANGELOG/CHANGELOG-v0.5.md)
- multicloud-operators-subscription v0.5.0 [changelog](https://github.com/open-cluster-management-io/multicloud-operators-subscription/blob/v0.5.0/CHANGELOG/CHANGELOG-v0.5.md)

There are 20+ contributors making contributions in this release, they are @elgnay, @haoqing0110, @hchenxa, @huiwq1990, @itdove, @kim-fitness, @mikeshng, @panpan0000, @philipwu08, @porridge, @qiujian16, @rokej, @skeeey, @suigh, @vincent-pli, @wzhanw, @xauthulei, @xiangjingli, @xuezhaojun, @yue9944882, @zhujian7, @zhiweiyin318. Thanks for your contributions!

Expand Down
4 changes: 2 additions & 2 deletions content/en/concepts/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ reach out to our community so that we can converge in the future if possible.

Practically the hub cluster and the managed cluster can be owned/maintained
by different admins, so in OCM we clearly separated the roles and make the
cluster registration require approval from the both sides defencing unwelcome
cluster registration require approval from the both sides defending from unwelcome
requests. In terms of terminating the registration, the hub admin can kick
out a registered cluster by denying the rotation of hub cluster's certificate,
on the other hand from the perspective of a managed cluster's admin, he can
Expand Down Expand Up @@ -201,4 +201,4 @@ the hub and apply policies to the managed clusters.

Automating the installation and upgrading of a few built-in modules in OCM. You
can either deploy the operator standalone or delegate the registration operator
to the operator lifecyle framework.
to the operator lifecycle framework.
4 changes: 2 additions & 2 deletions content/en/concepts/managedcluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ data:
A minimal RBAC permission required for the subject in the bootstrap kubeconfig
will be:

- `CertficateSigningRequest`'s "get", "list", "watch", "create", "update".
- `CertificateSigningRequest`'s "get", "list", "watch", "create", "update".
- `ManagedCluster`'s "get", "list", "create", "update"

Note that ideally the bootstrap kubeconfig is supposed to live shortly
Expand All @@ -55,7 +55,7 @@ command-line tool `clusteradm` to manage the whole registration process.

When we're registering a new cluster into OCM, the registration agent will be
starting by creating an unaccepted `ManagedCluster` into the hub cluster along
with a temporary [CertficateSigningRequest (CSR)](https://kubernetes.io/docs/reference/access-authn-authz/certificate-signing-requests/)
with a temporary [CertificateSigningRequest (CSR)](https://kubernetes.io/docs/reference/access-authn-authz/certificate-signing-requests/)
resource. The cluster will be accepted by the hub control plan, if the
following requirements is meet:

Expand Down
2 changes: 1 addition & 1 deletion content/en/getting-started/integration/app-lifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Deploy the subscription add-on in corresponding managed cluster namespace on the

```Shell
$ kubectl config use-context ${CTX_HUB_CLUSTER}
$ clusteradm addon enable --name application-manager --cluster ${MANAGED_CLUSTER_NAME}
$ clusteradm addon enable --names application-manager --clusters ${MANAGED_CLUSTER_NAME}
Deploying application-manager add-on to managed cluster: <managed_cluster_name>.
$ kubectl -n ${MANAGED_CLUSTER_NAME} get managedclusteraddon # kubectl -n cluster1 get managedclusteraddon
NAME AVAILABLE DEGRADED PROGRESSING
Expand Down
4 changes: 2 additions & 2 deletions content/en/scenarios/deploy-kubernetes-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Connect to your hub cluster and you have 2 options to create a `ManifestWork`:
1) use `clusteradm` command

```shell
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --cluster <cluster name>
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --clusters <cluster name>
```

where kubernetes yaml file should be kubernetes definitions, a sample:
Expand Down Expand Up @@ -126,7 +126,7 @@ clusteradm get works my-first-work --cluster <cluster name>
If you have some change on the manifest files, you can apply the change to the targeted cluster by running:

```shell
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --cluster <cluster name> --overwrite
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --clusters <cluster name> --overwrite
```

To remove the resources deployed on the targeted cluster, run:
Expand Down
6 changes: 3 additions & 3 deletions content/zh/community/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Open Cluster Management has approximately a three to four month release cycle. T

## `v0.7.0`, on 6th, April 2022

The Open Cluster Management team is exicted to announce the release of OCM v0.7.0! We mainly focused on enhancing user experience in this release by introducing a bunch of new commands in `clusteradm`. Notable changes including:
The Open Cluster Management team is excited to announce the release of OCM v0.7.0! We mainly focused on enhancing user experience in this release by introducing a bunch of new commands in `clusteradm`. Notable changes including:

- APIs including `placement`, `placementdecision`, `managedclusterset` and `managedclustersetbinding` are upgraded to `v1beta1`, `v1alpha1` version of these APIs are deprecated and will be removed in the next release.
- User can now use `clusteradm` to:
Expand Down Expand Up @@ -72,7 +72,7 @@ There are 20+ contributors making contributions in this release, they are @champ

## `v0.5.0`, on 8th, November 2021

Open Cluster Management team is proud to annouce the release of OCM v0.5.0! We made several enhancements on APIs
Open Cluster Management team is proud to announce the release of OCM v0.5.0! We made several enhancements on APIs
and addons which include:

- [Support deleteOption in ManifestWork.](https://github.com/open-cluster-management-io/enhancements/tree/main/enhancements/sig-architecture/10-deletepropagationstrategy)
Expand All @@ -90,7 +90,7 @@ To see details of the changelogs in this release:
- placement v0.2.0 [changelog](https://github.com/open-cluster-management-io/placement/blob/v0.2.0/CHANGELOG/CHANGELOG-v0.2.md)
- addon-framework v0.1.0 [changelog](https://github.com/open-cluster-management-io/addon-framework/blob/v0.1.0/CHANGELOG/CHANGELOG-v0.1.md)
- registration-operator v0.5.0 [changelog](https://github.com/open-cluster-management-io/registration-operator/blob/v0.5.0/CHANGELOG/CHANGELOG-v0.5.md)
- multicloud-operators-subscription v0.5.0 [chagelog](https://github.com/open-cluster-management-io/multicloud-operators-subscription/blob/v0.5.0/CHANGELOG/CHANGELOG-v0.5.md)
- multicloud-operators-subscription v0.5.0 [changelog](https://github.com/open-cluster-management-io/multicloud-operators-subscription/blob/v0.5.0/CHANGELOG/CHANGELOG-v0.5.md)

There are about 20+ contributors making contributions in this release, they are @haoqing0110, @hchenxa, @huiwq1990, @itdove, @kim-fitness, @mikeshng, @elgnay, @panpan0000, @philipwu08, @porridge, @qiujian16, @rokej, @skeeey, @suigh, @vincent-pli, @wzhanw, @xauthulei, @xiangjingli, @xuezhaojun, @yue9944882, @zhujian7, @zhiweiyin318. Thanks for your contributions!

Expand Down
4 changes: 2 additions & 2 deletions content/zh/concepts/managedcluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ data:
A minimal RBAC permission required for the subject in the bootstrap kubeconfig
will be:

- `CertficateSigningRequest`'s "get", "list", "watch", "create", "update".
- `CertificateSigningRequest`'s "get", "list", "watch", "create", "update".
- `ManagedCluster`'s "get", "list", "create", "update"

Note that ideally the bootstrap kubeconfig is supposed to live shortly
Expand All @@ -55,7 +55,7 @@ command-line tool `clusteradm` to manage the whole registration process.

When we're registering a new cluster into OCM, the registration agent will be
starting by creating an unaccepted `ManagedCluster` into the hub cluster along
with a temporary [CertficateSigningRequest (CSR)](https://kubernetes.io/docs/reference/access-authn-authz/certificate-signing-requests/)
with a temporary [CertificateSigningRequest (CSR)](https://kubernetes.io/docs/reference/access-authn-authz/certificate-signing-requests/)
resource. The cluster will be accepted by the hub control plan, if the
following requirements is meet:

Expand Down
2 changes: 1 addition & 1 deletion content/zh/getting-started/integration/app-lifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Deploy the subscription add-on in corresponding managed cluster namespace on the

```Shell
$ kubectl config use-context ${CTX_HUB_CLUSTER}
$ clusteradm addon enable --name application-manager --cluster ${MANAGED_CLUSTER_NAME}
$ clusteradm addon enable --names application-manager --clusters ${MANAGED_CLUSTER_NAME}
Deploying application-manager add-on to managed cluster: <managed_cluster_name>.
$ kubectl -n ${MANAGED_CLUSTER_NAME} get managedclusteraddon # kubectl -n cluster1 get managedclusteraddon
NAME AVAILABLE DEGRADED PROGRESSING
Expand Down
4 changes: 2 additions & 2 deletions content/zh/scenarios/deploy-kubernetes-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Now you can deploy a set of kubernetes resources defined in files to any cluster
Connect to your hub cluster and run:

```shell
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --cluster <cluster name>
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --clusters <cluster name>
```

This should create a `ManifestWork` in cluster namespace of your hub cluster. To see the detailed status of this `ManifestWork`, you can run:
Expand All @@ -44,7 +44,7 @@ clusteradm get works my-first-work --cluster <cluster name>
If you have some change on the manifest files, you can apply the change to the targeted cluster by running:

```shell
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --cluster <cluster name> --overwrite
clusteradm create work my-first-work -f <kubernetes yaml file or directory> --clusters <cluster name> --overwrite
```

To remove the resources deployed on the targeted cluster, run:
Expand Down