Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move including openshift4.yml to before configuring Cilium #366

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Move including openshift4.yml to before configuring Cilium #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions docs/modules/ROOT/partials/install/prepare-commodore.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ yq eval -i ".parameters.openshift.baseDomain = \"${CLUSTER_DOMAIN}\"" \
git commit -a -m "Configure cluster domain for ${CLUSTER_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;
git commit -a -m "Include openshift4 class for ${CLUSTER_ID}"
fi
----

. Add Cilium to cluster configuration
+
[NOTE]
Expand Down
9 changes: 0 additions & 9 deletions docs/modules/ROOT/partials/install/prepare-syn-config.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down