Skip to content

Commit 1be8a76

Browse files
authored
Merge pull request #62148 from jeana-redhat/OSDOCS-4158-ccoctl-cluster-capabilities
[OSDOCS-4158]: New `ccoctl` steps for cluster capabilities
2 parents 952b16c + 2d400a1 commit 1be8a76

17 files changed

+553
-469
lines changed

installing/installing_azure/uninstalling-cluster-azure.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ toc::[]
99
You can remove a cluster that you deployed to Microsoft Azure.
1010

1111
include::modules/installation-uninstall-clouds.adoc[leveloffset=+1]
12+
13+
include::modules/cco-ccoctl-deleting-sts-resources.adoc[leveloffset=+1]

modules/about-manually-maintained-credentials-upgrade.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Module included in the following assemblies:
22
//
33
// * updating/preparing_for_updates/preparing-manual-creds-update.adoc
4-
// * authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc
54

65
:_content-type: CONCEPT
76

@@ -39,15 +38,16 @@ Clusters installed on these platforms are configured using the `ccoctl` utility.
3938
+
4039
Administrators of clusters on these platforms must take the following actions:
4140
+
42-
. Configure the `ccoctl` utility for the new release.
43-
. Use the `ccoctl` utility to update the cloud provider resources.
41+
. Extract and prepare the `CredentialsRequest` custom resources (CRs) for the new release.
42+
. Configure the `ccoctl` utility for the new release and use it to update the cloud provider resources.
4443
. Indicate that the cluster is ready to update with the `upgradeable-to` annotation.
4544

4645
Microsoft Azure Stack Hub::
4746
These clusters use manual mode with long-term credentials and do not use the `ccoctl` utility.
4847
+
4948
Administrators of clusters on these platforms must take the following actions:
5049
+
50+
. Extract and prepare the `CredentialsRequest` custom resources (CRs) for the new release.
5151
. Manually update the cloud provider resources for the new release.
5252
. Indicate that the cluster is ready to update with the `upgradeable-to` annotation.
5353

modules/cco-ccoctl-configuring.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ The `ccoctl` utility is a Linux binary that must run in a Linux environment.
137137
//Upgrade prereqs
138138
ifdef::update[]
139139
* Your cluster was configured using the `ccoctl` utility to create and manage cloud credentials from outside of the cluster.
140+
141+
* You have extracted the `CredentialsRequest` custom resources (CRs) from the {product-title} release image and ensured that a namespace that matches the text in the `spec.secretRef.namespace` field exists in the cluster.
140142
endif::update[]
141143
142144
//AWS permissions needed when running ccoctl during install (I think we can omit from upgrade, since they already have an appropriate AWS account if they are upgrading).
@@ -213,12 +215,14 @@ endif::aws-sts[]
213215
214216
.Procedure
215217
218+
ifndef::update[]
216219
. Obtain the {product-title} release image by running the following command:
217220
+
218221
[source,terminal]
219222
----
220223
$ RELEASE_IMAGE=$(./openshift-install version | awk '/release image/ {print $3}')
221224
----
225+
endif::update[]
222226
223227
. Obtain the CCO container image from the {product-title} release image by running the following command:
224228
+

0 commit comments

Comments
 (0)