Skip to content

Commit ead675e

Browse files
authored
Merge pull request #44564 from mburke5678/fix-alibaba-install
Remove Alibaba step in ASH install docs
2 parents 0df6f40 + 14d3b2d commit ead675e

File tree

1 file changed

+0
-78
lines changed

1 file changed

+0
-78
lines changed

modules/manually-create-identity-access-management.adoc

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
// Module included in the following assemblies:
22
//
3-
// * installing/installing_alibaba/installing-alibaba-default.adoc
4-
// * installing/installing_alibaba/installing-alibaba-customizations.adoc
53
// * installing/installing_aws/manually-creating-iam.adoc
64
// * installing/installing_azure/manually-creating-iam-azure.adoc
75
// * installing/installing_gcp/manually-creating-iam-gcp.adoc
86
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc
97

10-
ifeval::["{context}" == "installing-alibaba-default"]
11-
:alibaba-default:
12-
endif::[]
13-
ifeval::["{context}" == "installing-alibaba-customizations"]
14-
:alibaba-custom:
15-
endif::[]
168
ifeval::["{context}" == "manually-creating-iam-aws"]
179
:aws:
1810
:cco-multi-mode:
@@ -45,16 +37,9 @@ endif::cco-multi-mode[]
4537

4638
//For providers who only support manual mode
4739
ifdef::cco-manual-mode[]
48-
[id="manually-create-iam_{context}"]
4940
= Manually manage cloud credentials
5041
endif::cco-manual-mode[]
5142

52-
//For providers that support multiple modes of operation
53-
ifdef::alibaba-default,alibaba-custom[]
54-
[id="manually-create-manifests_{context}"]
55-
= Generating the required installation manifests
56-
endif::alibaba-default,alibaba-custom[]
57-
5843
//For providers that support multiple modes of operation
5944
ifdef::cco-multi-mode[]
6045
The Cloud Credential Operator (CCO) can be put into manual mode prior to
@@ -68,10 +53,6 @@ ifdef::cco-manual-mode[]
6853
The Cloud Credential Operator (CCO) only supports your cloud provider in manual mode. As a result, you must specify the identity and access management (IAM) secrets for your cloud provider.
6954
endif::cco-manual-mode[]
7055

71-
ifdef::alibaba-default,alibaba-custom[]
72-
You must generate the Kubernetes manifest and Ignition config files that the cluster needs to configure the machines.
73-
endif::alibaba-default,alibaba-custom[]
74-
7556
.Procedure
7657

7758
ifdef::cco-multi-mode[]
@@ -111,19 +92,6 @@ where:
11192

11293
`<installation_directory>`:: Specifies the directory in which the installation program creates files.
11394

114-
. Copy the generated credential files to the target manifests directory:
115-
+
116-
[source,terminal]
117-
----
118-
$ cp ./<path_to_ccoctl_output_dir>/manifests/*credentials.yaml ./<path_to_installation>dir>/manifests/
119-
----
120-
+
121-
where:
122-
123-
`<path_to_ccoctl_output_dir>`:: Specifies the directory created by the `ccoctl alibabacloud create-ram-users` command.
124-
`<path_to_installation>dir>`:: Specifies the directory in which the installation program creates files.
125-
126-
ifndef::alibaba-default,alibaba-custom[]
12795
. From the directory that contains the installation program, obtain details of the {product-title} release image that your `openshift-install` binary is built to use:
12896
+
12997
[source,terminal]
@@ -140,11 +108,6 @@ release image quay.io/openshift-release-dev/ocp-release:4.y.z-x86_64
140108
. Locate all `CredentialsRequest` objects in this release image that target the cloud you are deploying on:
141109
+
142110
[source,terminal]
143-
ifdef::custom[]
144-
----
145-
$ oc adm release extract quay.io/openshift-release-dev/ocp-release:4.y.z-x86_64 --credentials-requests --cloud=alibaba
146-
----
147-
endif::custom[]
148111
ifdef::aws[]
149112
----
150113
$ oc adm release extract quay.io/openshift-release-dev/ocp-release:4.y.z-x86_64 --credentials-requests --cloud=aws
@@ -163,39 +126,6 @@ endif::google-cloud-platform[]
163126
+
164127
This command creates a YAML file for each `CredentialsRequest` object.
165128
+
166-
ifdef::custom[]
167-
.Sample `CredentialsRequest` object
168-
[source,yaml]
169-
----
170-
apiVersion: cloudcredential.openshift.io/v1
171-
kind: CredentialsRequest
172-
metadata:
173-
labels:
174-
controller-tools.k8s.io: "1.0"
175-
name: openshift-image-registry-alibaba
176-
namespace: openshift-cloud-credential-operator
177-
annotations:
178-
include.release.openshift.io/ibm-cloud-managed: "true"
179-
include.release.openshift.io/self-managed-high-availability: "true"
180-
include.release.openshift.io/single-node-developer: "true"
181-
spec:
182-
secretRef:
183-
name: installer-cloud-credentials
184-
namespace: openshift-image-registry
185-
providerSpec:
186-
apiVersion: cloudcredential.openshift.io/v1
187-
kind: AlibabaCloudProviderSpec
188-
statementEntries:
189-
- effect: Allow
190-
action:
191-
- oss:PutBucket
192-
...
193-
resource: "*"
194-
serviceAccountNames:
195-
- cluster-image-registry-operator
196-
- registry
197-
----
198-
endif::custom[]
199129
ifdef::aws[]
200130
.Sample `CredentialsRequest` object
201131
[source,yaml]
@@ -307,14 +237,6 @@ endif::cco-multi-mode[]
307237
Before upgrading a cluster that uses manually maintained credentials, you must ensure that the CCO is in an upgradeable state.
308238
====
309239
310-
endif::alibaba-default,alibaba-custom[]
311-
312-
ifeval::["{context}" == "manually-creating-alibaba-default"]
313-
:!alibaba-default:
314-
endif::[]
315-
ifeval::["{context}" == "installing-alibaba-customizations"]
316-
:!alibaba-custom:
317-
endif::[]
318240
ifeval::["{context}" == "manually-creating-iam-aws"]
319241
:!aws:
320242
:!cco-multi-mode:

0 commit comments

Comments
 (0)