Skip to content

Commit 94f10d4

Browse files
authored
Merge pull request #95654 from openshift-cherrypick-robot/cherry-pick-95218-to-enterprise-4.19
[enterprise-4.19] OCPBUGS-52463# Add note on viewing additional ccoctl options + optional param for specifying VNET RG
2 parents 3d95bd7 + 4cd2aa1 commit 94f10d4

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

modules/cco-ccoctl-creating-at-once.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ $ ccoctl azure create-all \
224224
--subscription-id=<azure_subscription_id> \// <4>
225225
--credentials-requests-dir=<path_to_credentials_requests_directory> \// <5>
226226
--dnszone-resource-group-name=<azure_dns_zone_resource_group_name> \// <6>
227-
--tenant-id=<azure_tenant_id> <7>
227+
--tenant-id=<azure_tenant_id> \// <7>
228+
--network-resource-group-name <azure_resource_group> <8>
228229
----
229230
<1> Specify the user-defined name for all created Azure resources used for tracking.
230231
<2> Optional: Specify the directory in which you want the `ccoctl` utility to create objects. By default, the utility creates objects in the directory in which the commands are run.
@@ -233,6 +234,7 @@ $ ccoctl azure create-all \
233234
<5> Specify the directory containing the files for the component `CredentialsRequest` objects.
234235
<6> Specify the name of the resource group containing the cluster's base domain Azure DNS zone.
235236
<7> Specify the Azure tenant ID to use.
237+
<8> Optional: Specify the virtual network resource group if it is different from the cluster resource group.
236238
+
237239
[NOTE]
238240
====

modules/enabling-entra-workload-id-existing-cluster.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ $ AZURE_INSTALL_RG=`oc get infrastructure cluster -o jsonpath --template '{ .sta
171171

172172
. Use the `ccoctl` utility to create managed identities for all `CredentialsRequest` objects by running the following command:
173173
+
174+
[NOTE]
175+
====
176+
The following command does not show all available options. For a complete list of options, including those that might be necessary for your specific use case, run `$ ccoctl azure create-managed-identities --help`.
177+
====
178+
+
174179
[source,terminal]
175180
----
176181
$ ccoctl azure create-managed-identities \
@@ -181,9 +186,11 @@ $ ccoctl azure create-managed-identities \
181186
--credentials-requests-dir <path_to_directory_for_credentials_requests> \
182187
--issuer-url "${OIDC_ISSUER_URL}" \
183188
--dnszone-resource-group-name <azure_dns_zone_resourcegroup_name> \// <1>
184-
--installation-resource-group-name "${AZURE_INSTALL_RG}"
189+
--installation-resource-group-name "${AZURE_INSTALL_RG}" \
190+
--network-resource-group-name <azure_resource_group> <2>
185191
----
186192
<1> Specify the name of the resource group that contains the DNS zone.
193+
<2> Optional: Specify the virtual network resource group if it is different from the cluster resource group.
187194

188195
. Apply the {azure-short} pod identity webhook configuration for {entra-short} by running the following command:
189196
+

0 commit comments

Comments
 (0)