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

Update cloudscale install instructions #343

Merged
merged 3 commits into from
Jul 19, 2024
Merged

Update cloudscale install instructions #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db2d665
Replace left-over reference to LDAP with Keycloak
simu Jul 16, 2024
e8b3d09
Remove explicit step to add cloudscale CCM
simu Jul 16, 2024
9fe4a3f
Fix typo in cloudscale CCM bootstrap instructions
simu Jul 16, 2024
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
18 changes: 0 additions & 18 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 @@ -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[]
2 changes: 1 addition & 1 deletion docs/modules/ROOT/partials/install/register.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/partials/install/run-installer.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::[]

Expand Down