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 Exoscale install instructions #376

Merged
merged 4 commits into from
Feb 6, 2025
Merged

Update Exoscale install instructions #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbf99f6
Bump base RHCOS image for cloudscale and Exoscale to 4.16.21
simu Feb 6, 2025
36ab9cb
Fix restricted IAM keys section for Exoscale
simu Feb 6, 2025
5d10e32
Don't use `s3_` prefix for the CSI driver Vault secret
simu Feb 6, 2025
805d1db
Only mention machinesets for cloudscale
simu Feb 6, 2025
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
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/how-tos/cloudscale/install.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Install OpenShift 4 on cloudscale.ch
:ocp-minor-version: 4.16
:k8s-minor-version: 1.29
:ocp-patch-version: {ocp-minor-version}.3
:ocp-patch-version: {ocp-minor-version}.21
:provider: cloudscale

[abstract]
Expand Down
14 changes: 7 additions & 7 deletions docs/modules/ROOT/pages/how-tos/exoscale/install.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Installation on Exoscale
:ocp-minor-version: 4.16
:k8s-minor-version: 1.29
:ocp-patch-version: {ocp-minor-version}.3
:ocp-patch-version: {ocp-minor-version}.21
:provider: exoscale
:kubectl_extra_args:

Expand Down Expand Up @@ -55,7 +55,7 @@ include::partial$exoscale/environment-vars.adoc[]
include::partial$install/vshn-input.adoc[]

[#_create_iam_keys]
=== Create restricted Exoscale IAM keys for the LBs and object storage
=== Create restricted Exoscale IAM keys for object storage, AppCat and CSI driver

[NOTE]
====
Expand Down Expand Up @@ -110,7 +110,7 @@ exo iam role create appcat-provider-exoscale \
fi
# Create access key
appcat_credentials=$(exo iam api-key create -O json \
appcat-provider-exoscale appcat-provider-exoscale)
"${CLUSTER_ID}_appcat-provider-exoscale" appcat-provider-exoscale)
export APPCAT_ACCESSKEY=$(echo "${appcat_credentials}" | jq -r '.key')
export APPCAT_SECRETKEY=$(echo "${appcat_credentials}" | jq -r '.secret')
----
Expand All @@ -119,7 +119,7 @@ export APPCAT_SECRETKEY=$(echo "${appcat_credentials}" | jq -r '.secret')
+
[source,bash]
----
# Create Exoscale CSi driver Exoscale IAM role, if it doesn't exist yet in the organization
# Create Exoscale CSI driver Exoscale IAM role, if it doesn't exist yet in the organization
csidriver_role_id=$(exo iam role list -O json | \
jq -r '.[] | select(.name=="csi-driver-exoscale") | .key')
if [ -z "${csidriver_role_id}" ]; then
Expand All @@ -143,7 +143,7 @@ exo iam role create csi-driver-exoscale \
fi
# Create access key
csi_credentials=$(exo iam api-key create -O json \
csi-driver-exoscale csi-driver-exoscale)
"${CLUSTER_ID}_csi-driver-exoscale" csi-driver-exoscale)
export CSI_ACCESSKEY=$(echo "${csi_credentials}" | jq -r '.key')
export CSI_SECRETKEY=$(echo "${csi_credentials}" | jq -r '.secret')
----
Expand Down Expand Up @@ -223,8 +223,8 @@ vault kv put clusters/kv/${TENANT_ID}/${CLUSTER_ID}/appcat/provider-exoscale \

# Set the CSI Driver Exoscale Credentials
vault kv put clusters/kv/${TENANT_ID}/${CLUSTER_ID}/exoscale/csi_driver \
s3_access_key=${CSI_ACCESSKEY} \
s3_secret_key=${CSI_SECRETKEY}
access_key=${CSI_ACCESSKEY} \
secret_key=${CSI_SECRETKEY}
----

include::partial$get-hieradata-token-from-vault.adoc[]
Expand Down
1 change: 1 addition & 0 deletions docs/modules/ROOT/partials/install/bootstrap-nodes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ for fqdn in "${LB_FQDNS[@]}"; do
done
----

ifeval::["{provider}" == "cloudscale"]
. Scale up the infra and worker machinesets
+
[source,bash]
Expand Down