Skip to content

Commit

Permalink
deploy: 7e9362a
Browse files Browse the repository at this point in the history
  • Loading branch information
openshift-merge-bot[bot] committed May 17, 2024
1 parent 286cfae commit c298ad4
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion getting-started/installation/register-a-cluster/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ <h3 id="bootstrap-a-klusterlet-in-singleton-mode">Bootstrap a klusterlet in sing
<h2 id="accept-the-join-request-and-verify">Accept the join request and verify</h2>
<p>After the OCM agent is running on your managed cluster, it will be sending a &ldquo;handshake&rdquo; 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&rsquo;s hub admin.</p>
through accepting the registration requests from the perspective of an OCM&rsquo;s hub admin.</p>
<ol>
<li>
<p>Wait for the creation of the CSR object which will be created by your managed
Expand Down
4 changes: 2 additions & 2 deletions getting-started/integration/cluster-proxy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ <h1>Cluster proxy</h1>
<li><a href="#example-code">Example code</a></li>
</ul>
</li>
<li><a href="#more-insight">More insight</a>
<li><a href="#more-insights">More insights</a>
<ul>
<li><a href="#troubleshooting">Troubleshooting</a></li>
<li><a href="#related-materials">Related materials</a></li>
Expand Down Expand Up @@ -435,7 +435,7 @@ <h3 id="command-line-tools">Command-line tools</h3>
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.</p>
<h2 id="more-insight">More insight</h2>
<h2 id="more-insights">More insights</h2>
<h3 id="troubleshooting">Troubleshooting</h3>
<p>The installation of proxy servers and agents are prescribed by the custom
resource called &ldquo;managedproxyconfiguration&rdquo;. We can check it out by the
Expand Down
2 changes: 1 addition & 1 deletion getting-started/integration/index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Prerequisite You must meet the following prerequisites to install the applicatio

<guid>https://open-cluster-management.io/getting-started/integration/cluster-proxy/</guid>
<description>Cluster proxy is an OCM addon providing L4 network connectivity from hub cluster to the managed clusters without any additional requirement to the managed cluster&amp;rsquo;s network infrastructure by leveraging the Kubernetes official SIG sub-project apiserver-network-proxy.
Background About apiserver-network-proxy Architecture Prerequisite Installation Usage Command-line tools Example code More insight Troubleshooting Related materials Background The original architecture of OCM allows a cluster from anywhere to be registered and managed by OCM&amp;rsquo;s control plane (i.</description>
Background About apiserver-network-proxy Architecture Prerequisite Installation Usage Command-line tools Example code More insights Troubleshooting Related materials Background The original architecture of OCM allows a cluster from anywhere to be registered and managed by OCM&amp;rsquo;s control plane (i.</description>
</item>

<item>
Expand Down
2 changes: 1 addition & 1 deletion index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Prerequisite You must meet the following prerequisites to install the applicatio

<guid>https://open-cluster-management.io/getting-started/integration/cluster-proxy/</guid>
<description>Cluster proxy is an OCM addon providing L4 network connectivity from hub cluster to the managed clusters without any additional requirement to the managed cluster&amp;rsquo;s network infrastructure by leveraging the Kubernetes official SIG sub-project apiserver-network-proxy.
Background About apiserver-network-proxy Architecture Prerequisite Installation Usage Command-line tools Example code More insight Troubleshooting Related materials Background The original architecture of OCM allows a cluster from anywhere to be registered and managed by OCM&amp;rsquo;s control plane (i.</description>
Background About apiserver-network-proxy Architecture Prerequisite Installation Usage Command-line tools Example code More insights Troubleshooting Related materials Background The original architecture of OCM allows a cluster from anywhere to be registered and managed by OCM&amp;rsquo;s control plane (i.</description>
</item>

<item>
Expand Down
2 changes: 1 addition & 1 deletion scenarios/deploy-kubernetes-resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ <h2 id="prerequisites">Prerequisites</h2>
<code>cluster namespace</code>, see details in this <a href="https://open-cluster-management.io/concepts/manifestwork/">page</a>.</p>
</li>
</ul>
<h2 id="deploy-the-resource-to-a-targetd-cluster">Deploy the resource to a targetd cluster</h2>
<h2 id="deploy-the-resource-to-a-target-cluster">Deploy the resource to a target cluster</h2>
<p>Now you can deploy a set of kubernetes resources defined in files to any clusters managed by the hub cluster.</p>
<p>Connect to your hub cluster and you have 2 options to create a <code>ManifestWork</code>:</p>
<ol>
Expand Down
5 changes: 3 additions & 2 deletions scenarios/distribute-workload-with-placement/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ <h1>Distribute workload with placement selected managed clusters</h1>
with the <code>PlacementDecision</code> to leverage its scheduling capabilities.</p>
<p>For example, with OCM addon <a href="https://open-cluster-management.io/getting-started/integration/policy-controllers/">policy</a>
installed, a <code>Policy</code> that includes a <code>Placement</code> mapping can distribute the
<code>Policy</code> to the managed clusters, details see this <a href="https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api">example</a>.</p>
<code>Policy</code> to the managed clusters.
For details see this <a href="https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api">example</a>.</p>
<p>Some popular open source projects also integrate with the <code>Placement</code> API. For
example <a href="https://github.com/argoproj/argo-cd">Argo CD</a>, it can leverage the
generated <code>PlacementDecision</code> to drive the assignment of Argo CD Applications to a
Expand Down Expand Up @@ -449,7 +450,7 @@ <h2 id="what-happens-behind-the-scene">What happens behind the scene</h2>
selfLink: <span style="color:#e6db74">&#34;&#34;</span>
</code></pre></div></li>
<li>
<p><code>clusteradm</code> get the <code>PlacementDecision</code> generated by <code>Placment</code>
<p><code>clusteradm</code> get the <code>PlacementDecision</code> generated by <code>Placement</code>
placement1 with label <code>cluster.open-cluster-management.io/placement: placement1</code>,
reference <a href="https://github.com/open-cluster-management-io/clusteradm/pull/247/files#diff-0f96f91e259a6a6ce0f2231444a4991174b43bc206d34897be3be897279124eaR157">code</a>.
Then parse the clusterName cluster1 and cluster2, fill in that as <code>ManifestWork</code>
Expand Down
2 changes: 1 addition & 1 deletion scenarios/extending-managed-clusters/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ <h2 id="labeling-managed-cluster">Labeling managed cluster</h2>
<span style="color:#66d9ef">&lt;domain name&gt;/&lt;label name&gt;</span>: &lt;label string value&gt;
...
</code></pre></div><p>However, there&rsquo;re some restrictions to the label value such as the content
length, and legal charset etc, so it&rsquo;s not convenient to put some structurelized
length, and legal charset etc, so it&rsquo;s not convenient to put some structuralized
or comprehensive data in the label value.</p>
<p>Additionally, due to the fact that the finest granularity of authorization
mechanism in Kubernetes is &ldquo;resource&rdquo;, so it&rsquo;s also not convenient for us
Expand Down
2 changes: 1 addition & 1 deletion scenarios/integration-with-argocd/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ <h3 id="how-it-works">How it works</h3>
</span><span style="color:#e6db74"> statusListKey: decisions
</span><span style="color:#e6db74"> matchKey: clusterName
</span><span style="color:#e6db74">EOF</span>
</code></pre></div><p>With reference to this generator, an <code>ApplicationSet</code> can target the application to the clusters listed in the status of a set of <code>PlacementDecision</code>, which belong to a certian Placement.</p>
</code></pre></div><p>With reference to this generator, an <code>ApplicationSet</code> can target the application to the clusters listed in the status of a set of <code>PlacementDecision</code>, which belong to a certain Placement.</p>
<p><strong>4. Grant Argo CD permissions to access OCM resources.</strong></p>
<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">cat <span style="color:#e6db74">&lt;&lt; EOF | kubectl apply -f -
</span><span style="color:#e6db74">apiVersion: rbac.authorization.k8s.io/v1
Expand Down
4 changes: 2 additions & 2 deletions scenarios/manage-cluster-with-multiple-hubs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,14 @@ <h1>Manage a cluster with multiple hubs</h1>
<li>Run the agents in the hosted mode on the hosting clusters;</li>
</ul>
<h3 id="run-all-the-agents-on-the-managed-cluster">Run all the agents on the managed cluster</h3>
<p>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 <code>open-cluster-management-agent</code>.</p>
<p>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 <code>open-cluster-management-agent</code>.</p>
<div style="text-align: center; padding: 20px;">
<img src="/multi-hubs.png" alt="multiple hubs" style="margin: 0 auto; width: 75%">
</div>
<p>With this architecture, the managed cluster needs more resources, including CPUs and memory, to run agents for multiple hubs. And it&rsquo;s a challenge to handle the version skew of the OCM hubs.</p>
<p>An example built with <a href="https://kind.sigs.k8s.io">kind</a> and <a href="https://github.com/open-cluster-management-io/clusteradm/releases">clusteradm</a> can be found in <a href="https://github.com/open-cluster-management-io/OCM/tree/main/solutions/multiple-hubs">Manage a cluster with multiple hubs</a>.</p>
<h3 id="run-the-agents-in-the-hosted-mode-on-the-hosting-clusters">Run the agents in the hosted mode on the hosting clusters</h3>
<p>By leveraging the hosted deployment mode, it&rsquo;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.</p>
<p>By leveraging the hosted deployment mode, it&rsquo;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.</p>
<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%">
</div>
Expand Down
3 changes: 2 additions & 1 deletion scenarios/migrate-workload-with-placement/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ <h1>Migrate workload with placement</h1>
with the <code>PlacementDecision</code> to leverage its scheduling capabilities.</p>
<p>For example, with OCM addon <a href="https://open-cluster-management.io/getting-started/integration/policy-controllers/">policy</a>
installed, a <code>Policy</code> that includes a <code>Placement</code> mapping can distribute the
<code>Policy</code> to the managed clusters, details see this <a href="https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api">example</a>.</p>
<code>Policy</code> to the managed clusters.
For details see this <a href="https://open-cluster-management.io/getting-started/integration/policy-controllers/configuration-policy/#placement-api">example</a>.</p>
<p>Some popular open source projects also integrate with the <code>Placement</code> API. For
example <a href="https://github.com/argoproj/argo-cd">Argo CD</a>, it can leverage the
generated <code>PlacementDecision</code> to drive the assignment of Argo CD Applications to a
Expand Down

0 comments on commit c298ad4

Please sign in to comment.