Skip to content

Commit b303dbb

Browse files
authored
Merge pull request #427 from appuio/openshift-4.19
Update install instructions to default to OpenShift 4.19
2 parents 1eebd8b + ed4adac commit b303dbb

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

docs/modules/ROOT/pages/how-tos/cloudscale/install.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Install OpenShift 4 on cloudscale.ch
2-
:ocp-minor-version: 4.18
3-
:k8s-minor-version: 1.31
4-
:ocp-patch-version: {ocp-minor-version}.1
2+
:ocp-minor-version: 4.19
3+
:k8s-minor-version: 1.32
4+
:ocp-patch-version: {ocp-minor-version}.10
55
:provider: cloudscale
66

77
[abstract]
@@ -37,7 +37,7 @@ IMPORTANT: Don't use your personal account to login to the cluster manager for i
3737
== Prerequisites
3838

3939
include::partial$install/prerequisites.adoc[]
40-
* `mc` >= `RELEASE.2021-07-27T06-46-19Z` https://docs.min.io/docs/minio-client-quickstart-guide.html[Minio client] (aliased to `mc` if necessary)
40+
* `mc` >= `RELEASE.2024-01-18T07-03-39Z` https://docs.min.io/docs/minio-client-quickstart-guide.html[Minio client] (aliased to `mc` if necessary)
4141
* `aws` CLI https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html[Official install instructions].
4242
You can also install the Python package with your favorite package manager (we recommend https://docs.astral.sh/uv/[`uv`]: `uv tool install awscli`).
4343

@@ -99,7 +99,7 @@ response=$(curl -sH "Authorization: Bearer ${CLOUDSCALE_API_TOKEN}" \
9999
+
100100
[source,bash]
101101
----
102-
mc config host add \
102+
mc alias set \
103103
"${CLUSTER_ID}" "https://objects.${REGION}.cloudscale.ch" \
104104
$(echo $response | jq -r '.keys[0].access_key') \
105105
$(echo $response | jq -r '.keys[0].secret_key')
@@ -124,8 +124,8 @@ mc mb --ignore-existing \
124124
+
125125
[source,bash]
126126
----
127-
export AWS_ACCESS_KEY_ID=$(mc config host ls ${CLUSTER_ID} -json | jq -r .accessKey)
128-
export AWS_SECRET_ACCESS_KEY=$(mc config host ls ${CLUSTER_ID} -json | jq -r .secretKey)
127+
export AWS_ACCESS_KEY_ID=$(mc alias list ${CLUSTER_ID} -json | jq -r .accessKey)
128+
export AWS_SECRET_ACCESS_KEY=$(mc alias list ${CLUSTER_ID} -json | jq -r .secretKey)
129129
130130
aws s3api put-public-access-block \
131131
--endpoint-url "https://objects.${REGION}.cloudscale.ch" \
@@ -254,8 +254,8 @@ include::partial$connect-to-vault.adoc[]
254254
# Set the cloudscale.ch access secrets
255255
vault kv put clusters/kv/${TENANT_ID}/${CLUSTER_ID}/cloudscale \
256256
token=${CLOUDSCALE_API_TOKEN} \
257-
s3_access_key=$(mc config host ls ${CLUSTER_ID} -json | jq -r .accessKey) \
258-
s3_secret_key=$(mc config host ls ${CLUSTER_ID} -json | jq -r .secretKey)
257+
s3_access_key=$(mc alias list ${CLUSTER_ID} -json | jq -r .accessKey) \
258+
s3_secret_key=$(mc alias list ${CLUSTER_ID} -json | jq -r .secretKey)
259259
260260
# Put LB API key in Vault
261261
vault kv put clusters/kv/${TENANT_ID}/${CLUSTER_ID}/floaty \

docs/modules/ROOT/pages/how-tos/exoscale/install.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Installation on Exoscale
2-
:ocp-minor-version: 4.18
3-
:k8s-minor-version: 1.31
4-
:ocp-patch-version: {ocp-minor-version}.1
2+
:ocp-minor-version: 4.19
3+
:k8s-minor-version: 1.32
4+
:ocp-patch-version: {ocp-minor-version}.10
55
:provider: exoscale
66
:kubectl_extra_args:
77

docs/modules/ROOT/pages/how-tos/openstack/install.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Install OpenShift 4 on OpenStack
2-
:ocp-minor-version: 4.18
3-
:k8s-minor-version: 1.31
4-
:ocp-patch-version: {ocp-minor-version}.1
2+
:ocp-minor-version: 4.19
3+
:k8s-minor-version: 1.32
4+
:ocp-patch-version: {ocp-minor-version}.10
55
:provider: openstack
66

77
[abstract]

docs/modules/ROOT/pages/how-tos/stackit/install.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Install OpenShift 4 on STACKIT
2-
:ocp-minor-version: 4.18
3-
:k8s-minor-version: 1.31
4-
:ocp-patch-version: {ocp-minor-version}.1
2+
:ocp-minor-version: 4.19
3+
:k8s-minor-version: 1.32
4+
:ocp-patch-version: {ocp-minor-version}.10
55
:provider: stackit
66

77
[abstract]
@@ -42,7 +42,7 @@ IMPORTANT: Don't use your personal account to login to the cluster manager for i
4242
== Prerequisites
4343

4444
include::partial$install/prerequisites.adoc[]
45-
* `mc` >= `RELEASE.2021-07-27T06-46-19Z` https://docs.min.io/docs/minio-client-quickstart-guide.html[Minio client] (aliased to `mc` if necessary)
45+
* `mc` >= `RELEASE.2024-01-18T07-03-39Z` https://docs.min.io/docs/minio-client-quickstart-guide.html[Minio client] (aliased to `mc` if necessary)
4646
* `stackit` >= `v0.30.0` https://github.com/stackitcloud/stackit-cli[STACKIT cli]
4747

4848
[WARNING]
@@ -102,7 +102,7 @@ export SECRET_KEY="`echo "$credential" | jq -r .secretAccessKey`"
102102
----
103103
export REGION=$(curl -sH "Authorization: Bearer $(commodore fetch-token)" ${COMMODORE_API_URL}/clusters/${CLUSTER_ID} | jq -r .facts.region)
104104
105-
mc config host add "${CLUSTER_ID}" "https://object.storage.${REGION}.onstackit.cloud" "$ACCESS_KEY" "$SECRET_KEY"
105+
mc alias set "${CLUSTER_ID}" "https://object.storage.${REGION}.onstackit.cloud" "$ACCESS_KEY" "$SECRET_KEY"
106106
107107
mc mb --ignore-existing \
108108
"${CLUSTER_ID}/${CLUSTER_ID}-bootstrap-ignition"
@@ -228,8 +228,8 @@ include::partial$install/bootstrap-nodes.adoc[]
228228
----
229229
oc create secret generic image-registry-private-configuration-user \
230230
--namespace openshift-image-registry \
231-
--from-literal=REGISTRY_STORAGE_S3_ACCESSKEY=$(mc config host ls ${CLUSTER_ID} -json | jq -r .accessKey) \
232-
--from-literal=REGISTRY_STORAGE_S3_SECRETKEY=$(mc config host ls ${CLUSTER_ID} -json | jq -r .secretKey)
231+
--from-literal=REGISTRY_STORAGE_S3_ACCESSKEY=$(mc alias list ${CLUSTER_ID} -json | jq -r .accessKey) \
232+
--from-literal=REGISTRY_STORAGE_S3_SECRETKEY=$(mc alias list ${CLUSTER_ID} -json | jq -r .secretKey)
233233
----
234234
+
235235
include::partial$install/registry-samples-operator.adoc[]

docs/modules/ROOT/pages/how-tos/vsphere/install.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Install OpenShift 4 on vSphere
2-
:ocp-minor-version: 4.18
3-
:k8s-minor-version: 1.31
4-
:ocp-patch-version: {ocp-minor-version}.1
2+
:ocp-minor-version: 4.19
3+
:k8s-minor-version: 1.32
4+
:ocp-patch-version: {ocp-minor-version}.10
55
:provider: vsphere
66

77
[abstract]

0 commit comments

Comments
 (0)