Skip to content

Commit

Permalink
Merge pull request #62148 from jeana-redhat/OSDOCS-4158-ccoctl-cluste…
Browse files Browse the repository at this point in the history
…r-capabilities

[OSDOCS-4158]: New `ccoctl` steps for cluster capabilities
  • Loading branch information
jeana-redhat committed Oct 13, 2023
2 parents 952b16c + 2d400a1 commit 1be8a76
Show file tree
Hide file tree
Showing 17 changed files with 553 additions and 469 deletions.
2 changes: 2 additions & 0 deletions installing/installing_azure/uninstalling-cluster-azure.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ toc::[]
You can remove a cluster that you deployed to Microsoft Azure.

include::modules/installation-uninstall-clouds.adoc[leveloffset=+1]

include::modules/cco-ccoctl-deleting-sts-resources.adoc[leveloffset=+1]
6 changes: 3 additions & 3 deletions modules/about-manually-maintained-credentials-upgrade.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Module included in the following assemblies:
//
// * updating/preparing_for_updates/preparing-manual-creds-update.adoc
// * authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc

:_content-type: CONCEPT

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

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

Expand Down
4 changes: 4 additions & 0 deletions modules/cco-ccoctl-configuring.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ The `ccoctl` utility is a Linux binary that must run in a Linux environment.
//Upgrade prereqs
ifdef::update[]
* Your cluster was configured using the `ccoctl` utility to create and manage cloud credentials from outside of the cluster.

* 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.
endif::update[]
//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).
Expand Down Expand Up @@ -213,12 +215,14 @@ endif::aws-sts[]
.Procedure
ifndef::update[]
. Obtain the {product-title} release image by running the following command:
+
[source,terminal]
----
$ RELEASE_IMAGE=$(./openshift-install version | awk '/release image/ {print $3}')
----
endif::update[]
. Obtain the CCO container image from the {product-title} release image by running the following command:
+
Expand Down

0 comments on commit 1be8a76

Please sign in to comment.