Skip to content

Commit 9f0679b

Browse files
committed
BZ2024348: Add bare metal to the requirements for installing on a single node
BZ2024348: Edits based on feedback BZ2025588: Fix the procedure for obtaining hub cluster deployment CRs BZ2025588: Edits based on feedback BZ2025588: PR edits based on feedback
1 parent 6d270eb commit 9f0679b

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

modules/install-sno-requirements-for-installing-on-a-single-node.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Installing {product-title} on a single node alleviates some of the requirements
99

1010
* *Administration host:* You must have a computer to prepare the ISO, to create the USB boot drive, and to monitor the installation.
1111

12+
* *Bare metal installation:* Installing {product-title} on a single node on bare metal requires that you specify the `platform.none: {}` parameter in the `install-config.yaml` configuration file.
13+
1214
* *Production-grade server:* Installing {product-title} on a single node requires a server with sufficient resources to run {product-title} services and a production workload.
1315
+
1416
.Minimum resource requirements
@@ -20,7 +22,7 @@ Installing {product-title} on a single node alleviates some of the requirements
2022
+
2123
[NOTE]
2224
====
23-
One vCPU is equivalent to one physical core when simultaneous multithreading (SMT), or hyperthreading, is not enabled. When enabled, use the following formula to calculate the corresponding ratio:
25+
One vCPU is equivalent to one physical core when simultaneous multithreading (SMT), or hyperthreading, is not enabled. When enabled, use the following formula to calculate the corresponding ratio:
2426
2527
(threads per core × cores) × sockets = vCPUs
2628
====

modules/ztp-preparing-the-hub-cluster-for-ztp.adoc

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@ $ oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data
1919
----
2020

2121
. Prepare the ArgoCD pipeline configuration:
22-
.. Clone the Git repository.
22+
.. Extract the ArgoCD deployment CRs from the ZTP site generator container using the latest container image version:
23+
+
24+
[source,terminal]
25+
----
26+
$ mkdir ztp
27+
$ podman run --rm -v `pwd`/ztp:/mnt/ztp:Z registry.redhat.io/openshift4/ztp-site-generate-rhel8:v4.9.0-1 /bin/bash -c "cp -ar /usr/src/hook/ztp/* /mnt/ztp/"
28+
----
29+
+
30+
The remaining steps in this section relate to the `ztp/gitops-subscriptions/argocd/` directory.
2331

2432
.. Modify the source values of the two ArgoCD applications, `deployment/clusters-app.yaml` and `deployment/policies-app.yaml` with appropriate URL, `targetRevision` branch, and path values. The path values must match those used in your Git repository.
2533
+
@@ -53,7 +61,7 @@ spec:
5361
syncOptions:
5462
- CreateNamespace=true
5563
----
56-
<1> `path` is the branch that contains the `siteconfig` CRs for the clusters.
64+
<1> `path` is the `ztp/gitops-subscriptions/argocd/` file path that contains the `siteconfig` CRs for the clusters.
5765
<2> `repoURL` is the URL of the Git repository that contains the `siteconfig` custom resources that define site configuration for installing clusters.
5866
<3> `targetRevision` is the branch on the Git repository that contains the relevant site configuration data.
5967

@@ -89,13 +97,13 @@ spec:
8997
syncOptions:
9098
- CreateNamespace=true
9199
----
92-
<1> `path` is the branch that contains the `policygentemplates` CRs for the clusters.
100+
<1> `path` is the `ztp/gitops-subscriptions/argocd/` file path that contains the `policygentemplates` CRs for the clusters.
93101
<2> `repoURL` is the URL of the Git repository that contains the `policygentemplates` custom resources that specify configuration data for the site.
94102
<3> `targetRevision` is the branch on the Git repository that contains the relevant configuration data.
95103

96104
. To apply the pipeline configuration to your hub cluster, enter this command:
97105
+
98106
[source,terminal]
99107
----
100-
oc apply -k ./deployment
108+
$ oc apply -k ./deployment
101109
----

0 commit comments

Comments
 (0)