From db2d6658df96fe149026dd4781c582d50f2ecdf1 Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Tue, 16 Jul 2024 12:57:59 +0200 Subject: [PATCH 1/3] Replace left-over reference to LDAP with Keycloak --- docs/modules/ROOT/partials/install/register.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/partials/install/register.adoc b/docs/modules/ROOT/partials/install/register.adoc index d6023dfc..6676947f 100644 --- a/docs/modules/ROOT/partials/install/register.adoc +++ b/docs/modules/ROOT/partials/install/register.adoc @@ -17,7 +17,7 @@ For customer clusters, set the following cluster facts in Lieutenant: === Set up Keycloak service -. Create an LDAP service +. Create a Keycloak service + Use https://control.vshn.net/vshn/services/_create to create a service. The name and ID must be clusters name. From e8b3d09beecca59fc3f964099f3ae99b1580d73f Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Tue, 16 Jul 2024 12:59:31 +0200 Subject: [PATCH 2/3] Remove explicit step to add cloudscale CCM We've added the cloudscale CCM in the global defaults, so we don't need to explicitly enable it for a new cluster anymore. --- .../partials/install/prepare-commodore.adoc | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/docs/modules/ROOT/partials/install/prepare-commodore.adoc b/docs/modules/ROOT/partials/install/prepare-commodore.adoc index 98de135a..239ed2eb 100644 --- a/docs/modules/ROOT/partials/install/prepare-commodore.adoc +++ b/docs/modules/ROOT/partials/install/prepare-commodore.adoc @@ -79,24 +79,6 @@ git push popd ---- -ifeval::["{provider}" == "cloudscale"] -. Add Cloud Controller Manager to cluster configuration -+ -[source,bash] ----- -pushd "inventory/classes/${TENANT_ID}/" - -yq eval -i '.classes += ["global.distribution.openshift4.cloud.cloudscale.machineconfig-ccm"]' ${CLUSTER_ID}.yml - -yq eval -i '.applications += ["cloudscale-cloud-controller-manager"]' ${CLUSTER_ID}.yml - -git commit -a -m "Add Cloud Controller Manager addon to ${CLUSTER_ID}" - -git push -popd ----- -endif::[] - . Compile catalog + include::partial$install/commodore-dynfacts.adoc[] From 9fe4a3facf3bde66d2acc8ccd3fc3db6abb89129 Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Tue, 16 Jul 2024 14:13:35 +0200 Subject: [PATCH 3/3] Fix typo in cloudscale CCM bootstrap instructions --- docs/modules/ROOT/partials/install/run-installer.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/partials/install/run-installer.adoc b/docs/modules/ROOT/partials/install/run-installer.adoc index e23c326d..02cbe4b7 100644 --- a/docs/modules/ROOT/partials/install/run-installer.adoc +++ b/docs/modules/ROOT/partials/install/run-installer.adoc @@ -43,7 +43,7 @@ for f in catalog/manifests/cloudscale-cloud-controller-manager/*; do $f done yq -i e ".stringData.access-token=\"${CLOUDSCALE_API_TOKEN}\"" \ - ${INSTALLER_DIR}/manifests/cloudscale-cloud-controller-manager_01_secret_0_secret.yaml + ${INSTALLER_DIR}/manifests/cloudscale-cloud-controller-manager_01_secret_0_secret.yml ---- endif::[]