Skip to content

Commit a5fbbe7

Browse files
authored
Merge pull request #59188 from aireilly/TELCODOCS-1307-CRUN-ZTP
TELCODOCS-1307 - Adding crun CR to GitOps ZTP docs
2 parents db796c6 + 896b0be commit a5fbbe7

7 files changed

+67
-0
lines changed

_attributes/common-attributes.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,5 @@ endif::[]
173173
:osdk_ver_n1: 1.25.4
174174
:ztp-first: GitOps Zero Touch Provisioning (ZTP)
175175
:ztp: GitOps ZTP
176+
:3no: three-node OpenShift
177+
:3no-caps: Three-node OpenShift

modules/ztp-deploying-a-site.adoc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,17 @@ For more information about BMC addressing, see the "Additional resources" sectio
7676
.. You can inspect the default set of extra-manifest `MachineConfig` CRs in `out/argocd/extra-manifest`. It is automatically applied to the cluster when it is installed.
7777
7878
.. Optional: To provision additional install-time manifests on the provisioned cluster, create a directory in your Git repository, for example, `sno-extra-manifest/`, and add your custom manifest CRs to this directory. If your `SiteConfig.yaml` refers to this directory in the `extraManifestPath` field, any CRs in this referenced directory are appended to the default set of extra manifests.
79+
+
80+
.Enabling the crun OCI container runtime
81+
[IMPORTANT]
82+
====
83+
For optimal cluster performance, enable crun for master and worker nodes in {sno}, {sno} with additional worker nodes, {3no}, and standard clusters.
84+
85+
Enable crun in a `ContainerRuntimeConfig` CR as an additional day-0 install-time manifest to avoid the cluster having to reboot.
86+
87+
The `enable-crun-master.yaml` and `enable-crun-worker.yaml` CR files are in the `out/source-crs/optional-extra-manifest/` folder that you can extract from the `ztp-site-generate` container.
88+
For more information, see "Customizing extra installation manifests in the {ztp} pipeline".
89+
====
7990
8091
. Add the `SiteConfig` CR to the `kustomization.yaml` file in the `generators` section, similar to the example shown in `out/argocd/example/siteconfig/kustomization.yaml`.
8192
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.adoc
4+
5+
:_content-type: CONCEPT
6+
[id="ztp-sno-du-configuring-crun-container-runtime_{context}"]
7+
= Configuring crun as the default container runtime
8+
9+
The following `ContainerRuntimeConfig` custom resources (CRs) configure crun as the default OCI container runtime for control plane and worker nodes.
10+
The crun container runtime is fast and lightweight and has a low memory footprint.
11+
12+
[IMPORTANT]
13+
====
14+
For optimal performance, enable crun for master and worker nodes in {sno}, {3no}, and standard clusters.
15+
To avoid the cluster rebooting when the CR is applied, apply the change as a {ztp} additional day-0 install-time manifest.
16+
====
17+
18+
include::snippets/ztp-07-ztp-sno-du-configuring-crun-container-runtime-master.adoc[]
19+
20+
include::snippets/ztp-08-ztp-sno-du-configuring-crun-container-runtime-worker.adoc[]

scalability_and_performance/ztp_far_edge/ztp-deploying-far-edge-sites.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ include::modules/ztp-deploying-a-site.adoc[leveloffset=+1]
2626
[role="_additional-resources"]
2727
.Additional resources
2828

29+
* xref:../../scalability_and_performance/ztp_far_edge/ztp-advanced-install-ztp.adoc#ztp-customizing-the-install-extra-manifests_ztp-advanced-install-ztp[Customizing extra installation manifests in the {ztp} pipeline]
30+
2931
* xref:../../scalability_and_performance/ztp_far_edge/ztp-preparing-the-hub-cluster.adoc#ztp-preparing-the-ztp-git-repository_ztp-preparing-the-hub-cluster[Preparing the {ztp} site configuration repository]
3032
3133
* xref:../../scalability_and_performance/ztp_far_edge/ztp-preparing-the-hub-cluster.adoc#ztp-configuring-hub-cluster-with-argocd_ztp-preparing-the-hub-cluster[Configuring the hub cluster with ArgoCD]

scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ include::modules/ztp-sno-du-accelerating-container-startup.adoc[leveloffset=+2]
5252

5353
include::modules/ztp-sno-du-enabling-kdump.adoc[leveloffset=+2]
5454

55+
include::modules/ztp-sno-du-configuring-crun-container-runtime.adoc[leveloffset=+2]
56+
5557
[id="ztp-sno-post-install-time-cluster-config"]
5658
== Recommended post-installation cluster configurations
5759

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
:_content-type: SNIPPET
2+
.Recommended `ContainerRuntimeConfig` CR for control plane nodes
3+
[source,yaml]
4+
----
5+
apiVersion: machineconfiguration.openshift.io/v1
6+
kind: ContainerRuntimeConfig
7+
metadata:
8+
name: enable-crun-master
9+
spec:
10+
machineConfigPoolSelector:
11+
matchLabels:
12+
pools.operator.machineconfiguration.openshift.io/master: ""
13+
containerRuntimeConfig:
14+
defaultRuntime: crun
15+
----
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
:_content-type: SNIPPET
2+
.Recommended `ContainerRuntimeConfig` CR for worker nodes
3+
[source,yaml]
4+
----
5+
apiVersion: machineconfiguration.openshift.io/v1
6+
kind: ContainerRuntimeConfig
7+
metadata:
8+
name: enable-crun-worker
9+
spec:
10+
machineConfigPoolSelector:
11+
matchLabels:
12+
pools.operator.machineconfiguration.openshift.io/worker: ""
13+
containerRuntimeConfig:
14+
defaultRuntime: crun
15+
----

0 commit comments

Comments
 (0)