Skip to content

Commit

Permalink
fix some typos (#414)
Browse files Browse the repository at this point in the history
Signed-off-by: Francesco Ilario <[email protected]>
  • Loading branch information
filariow authored May 17, 2024
1 parent 91c941c commit 7e9362a
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ cluster.

After the OCM agent is running on your managed cluster, it will be sending a "handshake" to your
hub cluster and waiting for an approval from the hub cluster admin. In this section, we will walk
through accepting the registration requests from the prespective of an OCM's hub admin.
through accepting the registration requests from the perspective of an OCM's hub admin.

1. Wait for the creation of the CSR object which will be created by your managed
clusters' OCM agents on the hub cluster:
Expand Down
2 changes: 1 addition & 1 deletion content/en/getting-started/integration/cluster-proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ is running. With that being said, to mount the secret to the systems in the
other namespaces, the users are expected to copy the secret on their own
manually.

## More insight
## More insights

### Troubleshooting

Expand Down
2 changes: 1 addition & 1 deletion content/en/scenarios/deploy-kubernetes-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ we're going to use in the context.
managed cluster if the `ManifestWork` is created in a valid
`cluster namespace`, see details in this [page]({{< ref "/concepts/manifestwork" >}}).

## Deploy the resource to a targetd cluster
## Deploy the resource to a target cluster

Now you can deploy a set of kubernetes resources defined in files to any clusters managed by the hub cluster.

Expand Down
5 changes: 3 additions & 2 deletions content/en/scenarios/distribute-workload-with-placement.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ with the `PlacementDecision` to leverage its scheduling capabilities.

For example, with OCM addon [policy]({{< ref "/getting-started/integration/policy-controllers" >}})
installed, a `Policy` that includes a `Placement` mapping can distribute the
`Policy` to the managed clusters, details see this [example](https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api).
`Policy` to the managed clusters.
For details see this [example](https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api).

Some popular open source projects also integrate with the `Placement` API. For
example [Argo CD](https://github.com/argoproj/argo-cd), it can leverage the
Expand Down Expand Up @@ -218,7 +219,7 @@ Let's see more details.
selfLink: ""
```
2) `clusteradm` get the `PlacementDecision` generated by `Placment`
2) `clusteradm` get the `PlacementDecision` generated by `Placement`
placement1 with label `cluster.open-cluster-management.io/placement: placement1`,
reference [code](https://github.com/open-cluster-management-io/clusteradm/pull/247/files#diff-0f96f91e259a6a6ce0f2231444a4991174b43bc206d34897be3be897279124eaR157).
Then parse the clusterName cluster1 and cluster2, fill in that as `ManifestWork`
Expand Down
4 changes: 2 additions & 2 deletions content/en/scenarios/extending-managed-clusters.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ metadata:
```

However, there're some restrictions to the label value such as the content
length, and legal charset etc, so it's not convenient to put some structurelized
length, and legal charset etc, so it's not convenient to put some structuralized
or comprehensive data in the label value.

Additionally, due to the fact that the finest granularity of authorization
Expand Down Expand Up @@ -114,4 +114,4 @@ cluster frequently. e.g.:
After extending your "Managed Cluster" with customized attributes, now we can
try the advanced cluster selection using the [placement]({{< ref "/concepts/placement" >}})
policies, which is provided ny another module of OCM helpful for building your
own advanced multi-cluster systems.
own advanced multi-cluster systems.
2 changes: 1 addition & 1 deletion content/en/scenarios/integration-with-argocd.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ data:
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.
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 certain Placement.

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

Expand Down
4 changes: 2 additions & 2 deletions content/en/scenarios/manage-cluster-with-multiple-hubs.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Since the OCM agent is hub specific, that means an agent can connect to only one
- Run the agents in the hosted mode on the hosting clusters;

### Run all the agents on the managed cluster
Since there are multiple OCM agents are running on the managed cluster, each of them must have an uniqe agent namespace. So only one agent can be deployed in the default agent namespace `open-cluster-management-agent`.
Since there are multiple OCM agents are running on the managed cluster, each of them must have an unique agent namespace. So only one agent can be deployed in the default agent namespace `open-cluster-management-agent`.

<div style="text-align: center; padding: 20px;">
<img src="/multi-hubs.png" alt="multiple hubs" style="margin: 0 auto; width: 75%">
Expand All @@ -26,7 +26,7 @@ With this architecture, the managed cluster needs more resources, including CPUs
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).

### Run the agents in the hosted mode on the hosting clusters
By leveraging the hosted deployment mode, it's possiable to run OCM agent outside of the managed cluster on a hosing cluster. The hosting cluster could be a managed cluster of the same hub.
By leveraging the hosted deployment mode, it's possible to run OCM agent outside of the managed cluster on a hosing cluster. The hosting cluster could be a managed cluster of the same hub.

<div style="text-align: center; padding: 20px;">
<img src="/multi-hubs-hosted1.png" alt="multiple hubs in hosted mode" style="margin: 0 auto; width: 60%">
Expand Down
5 changes: 3 additions & 2 deletions content/en/scenarios/migrate-workload-with-placement.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ with the `PlacementDecision` to leverage its scheduling capabilities.

For example, with OCM addon [policy]({{< ref "/getting-started/integration/policy-controllers" >}})
installed, a `Policy` that includes a `Placement` mapping can distribute the
`Policy` to the managed clusters, details see this [example](https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api).
`Policy` to the managed clusters.
For details see this [example](https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api).

Some popular open source projects also integrate with the `Placement` API. For
example [Argo CD](https://github.com/argoproj/argo-cd), it can leverage the
Expand Down Expand Up @@ -235,4 +236,4 @@ In the following example, suppose you are going to maintain cluster2, and want t

In this article, we use the ArgoCD pull model in OCM as an example, showing you how to migrate the ArgoCD applications automatically or manually when the cluster is down or during the cluster maintenance time.

The concept of [Taints](https://open-cluster-management.io/concepts/managedcluster/#taints-of-managedclusters) and [Tolerations](https://open-cluster-management.io/concepts/placement/#taintstolerations) can be used for any components that consume OCM `Placement`, such as [add-ons](https://open-cluster-management.io/concepts/addon/) and [ManifestworkReplicaSet](https://open-cluster-management.io/concepts/manifestworkreplicaset/). If you have any questions, feel free to raise them in our [slack channel](https://kubernetes.slack.com/channels/open-cluster-mgmt).
The concept of [Taints](https://open-cluster-management.io/concepts/managedcluster/#taints-of-managedclusters) and [Tolerations](https://open-cluster-management.io/concepts/placement/#taintstolerations) can be used for any components that consume OCM `Placement`, such as [add-ons](https://open-cluster-management.io/concepts/addon/) and [ManifestworkReplicaSet](https://open-cluster-management.io/concepts/manifestworkreplicaset/). If you have any questions, feel free to raise them in our [slack channel](https://kubernetes.slack.com/channels/open-cluster-mgmt).

0 comments on commit 7e9362a

Please sign in to comment.