Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typo #395

Merged
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
4 changes: 2 additions & 2 deletions content/en/scenarios/integration-with-argocd.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ EOF

With reference to this generator, an `ApplicationSet` can target the application to the clusters listed in the status of a set of `PlacementDecision`, which belong to a certian Placement.

**4. Grant Argo CD permissions to access OCM resoruces.**
**4. Grant Argo CD permissions to access OCM resources.**

```bash
cat << EOF | kubectl apply -f -
Expand Down Expand Up @@ -165,4 +165,4 @@ guestbook-ui-6b689986f-cdrk8 1/1 Running 0 112s

### What's next

To build an OCM environment integrated with Argo CD with `KinD` clusters, see [Deploy applications with Argo CD](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/deploy-argocd-apps) for more details.
To build an OCM environment integrated with Argo CD with `KinD` clusters, see [Deploy applications with Argo CD](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/deploy-argocd-apps) for more details.
6 changes: 3 additions & 3 deletions content/en/scenarios/manage-cluster-with-multiple-hubs.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Since there are multiple OCM agents are running on the managed cluster, each of
<img src="/multi-hubs.png" alt="multiple hubs" style="margin: 0 auto; width: 75%">
</div>

With this architecture, the managed cluster needs more resoruces, including CPUs and memory, to run agents for multiple hubs. And it's a challenge to handle the version skew of the OCM hubs.
With this architecture, the managed cluster needs more resources, including CPUs and memory, to run agents for multiple hubs. And it's a challenge to handle the version skew of the OCM hubs.

An example built with [kind](https://kind.sigs.k8s.io) and [clusteradm](https://github.com/open-cluster-management-io/clusteradm/releases) can be found in [Manage a cluster with multiple hubs](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/multiple-hubs).

Expand All @@ -44,6 +44,6 @@ In order to reduce the number of the hosting clusters, agents running in the hos
<img src="/multi-hubs-hosted3.png" alt="multiple hubs in hosted mode" style="margin: 0 auto; width: 60%">
</div>

With this architecture, the managed cluster itself needs less resoruces because at most one agent runs on the managed cluster, while it needs at least one extra cluster as hosting cluster. Since each agent could run on different cluster (managed cluster or hosting cluster), it will not result in any problem if OCM hubs have different versions.
With this architecture, the managed cluster itself needs less resources because at most one agent runs on the managed cluster, while it needs at least one extra cluster as hosting cluster. Since each agent could run on different cluster (managed cluster or hosting cluster), it will not result in any problem if OCM hubs have different versions.

An example built with [kind](https://kind.sigs.k8s.io) and [clusteradm](https://github.com/open-cluster-management-io/clusteradm/releases) can be found in [Manage a cluster with multiple hubs in hosted mode](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/multiple-hubs-hosted).
An example built with [kind](https://kind.sigs.k8s.io) and [clusteradm](https://github.com/open-cluster-management-io/clusteradm/releases) can be found in [Manage a cluster with multiple hubs in hosted mode](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/multiple-hubs-hosted).
4 changes: 2 additions & 2 deletions content/zh/scenarios/integration-with-argocd.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ EOF

With reference to this generator, an `ApplicationSet` can target the application to the clusters listed in the status of a set of `PlacementDecision`, which belong to a certian Placement.

**4. Grant Argo CD permissions to access OCM resoruces.**
**4. Grant Argo CD permissions to access OCM resources.**

```bash
cat << EOF | kubectl apply -f -
Expand Down Expand Up @@ -165,4 +165,4 @@ guestbook-ui-6b689986f-cdrk8 1/1 Running 0 112s

### What's next

To build an OCM environment integrated with Argo CD with `KinD` clusters, see [Deploy applications with Argo CD](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/deploy-argocd-apps) for more details.
To build an OCM environment integrated with Argo CD with `KinD` clusters, see [Deploy applications with Argo CD](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/deploy-argocd-apps) for more details.
6 changes: 3 additions & 3 deletions content/zh/scenarios/manage-cluster-with-multiple-hubs.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Since there are multiple OCM agents are running on the managed cluster, each of
<img src="/multi-hubs.png" alt="multiple hubs" style="margin: 0 auto; width: 75%">
</div>

With this architecture, the managed cluster needs more resoruces, including CPUs and memory, to run agents for multiple hubs. And it's a challenge to handle the version skew of the OCM hubs.
With this architecture, the managed cluster needs more resources, including CPUs and memory, to run agents for multiple hubs. And it's a challenge to handle the version skew of the OCM hubs.

An example built with [kind](https://kind.sigs.k8s.io) and [clusteradm](https://github.com/open-cluster-management-io/clusteradm/releases) can be found in [Manage a cluster with multiple hubs](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/multiple-hubs).

Expand All @@ -44,6 +44,6 @@ In order to reduce the number of the hosting clusters, agents running in the hos
<img src="/multi-hubs-hosted3.png" alt="multiple hubs in hosted mode" style="margin: 0 auto; width: 60%">
</div>

With this architecture, the managed cluster itself needs less resoruces because at most one agent runs on the managed cluster, while it needs at least one extra cluster as hosting cluster. Since each agent could run on different cluster (managed cluster or hosting cluster), it will not result in any problem if OCM hubs have different versions.
With this architecture, the managed cluster itself needs less resources because at most one agent runs on the managed cluster, while it needs at least one extra cluster as hosting cluster. Since each agent could run on different cluster (managed cluster or hosting cluster), it will not result in any problem if OCM hubs have different versions.

An example built with [kind](https://kind.sigs.k8s.io) and [clusteradm](https://github.com/open-cluster-management-io/clusteradm/releases) can be found in [Manage a cluster with multiple hubs in hosted mode](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/multiple-hubs-hosted).
An example built with [kind](https://kind.sigs.k8s.io) and [clusteradm](https://github.com/open-cluster-management-io/clusteradm/releases) can be found in [Manage a cluster with multiple hubs in hosted mode](https://github.com/open-cluster-management-io/OCM/tree/main/solutions/multiple-hubs-hosted).
Loading