Move including openshift4.yml to before configuring Cilium

appuio · Nov 19, 2024 · e3cf353 · e3cf353
1 parent 2018604
commit e3cf353
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/docs/modules/ROOT/partials/install/prepare-commodore.adoc b/docs/modules/ROOT/partials/install/prepare-commodore.adoc
@@ -18,6 +18,17 @@ mkdir -p inventory/classes/
 git clone $(curl -sH"Authorization: Bearer $(commodore fetch-token)" "${COMMODORE_API_URL}/tenants/${TENANT_ID}" | jq -r '.gitRepo.url') inventory/classes/${TENANT_ID}
 ----
 
+. Include `openshift4.yml` in the cluster's config if it exists
++
+NOTE: For some tenants, this may already configure some of the settings shown in this how-to.
++
+[source,bash]
+----
+if ls openshift4.y*ml 1>/dev/null 2>&1; then
+    yq eval -i '.classes += ".openshift4"' ${CLUSTER_ID}.yml;
+fi
+----
+
 . Configure the cluster's domain in Project Syn
 +
 [source,bash]

diff --git a/docs/modules/ROOT/partials/install/prepare-syn-config.adoc b/docs/modules/ROOT/partials/install/prepare-syn-config.adoc
@@ -5,15 +5,6 @@
 pushd "inventory/classes/${TENANT_ID}/"
 ----
 
-. Include openshift4.yml if it exists
-+
-[source,bash]
-----
-if ls openshift4.y*ml 1>/dev/null 2>&1; then
-    yq eval -i '.classes += ".openshift4"' ${CLUSTER_ID}.yml;
-fi
-----
-
 . Include no-opsgenie class to prevent monitoring noise during cluster setup
 +
 [source,bash]