Skip to content

Commit e538318

Browse files
author
Christopher Tauchen
authored
Merge pull request #38485 from chinmayi-chandrasekar/BZ1964380_remove_etcd_DNS_records
BZ1964380: remove etcd DNS records from Azure ARM templates
2 parents 757214d + 4f959b4 commit e538318

File tree

3 files changed

+18
-32
lines changed

3 files changed

+18
-32
lines changed

‎modules/installation-creating-azure-bootstrap.adoc‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,23 @@ ifdef::azure[]
6666
$ az deployment group create -g ${RESOURCE_GROUP} \
6767
--template-file "<installation_directory>/04_bootstrap.json" \
6868
--parameters bootstrapIgnition="${BOOTSTRAP_IGNITION}" \ <1>
69-
--parameters sshKeyData="${SSH_KEY}" \ <2>
70-
--parameters baseName="${INFRA_ID}" <3>
69+
--parameters baseName="${INFRA_ID}" <2>
7170
----
7271
<1> The bootstrap Ignition content for the bootstrap cluster.
73-
<2> The SSH RSA public key file as a string.
74-
<3> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
72+
<2> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
7573
endif::azure[]
7674
ifdef::ash[]
7775
[source,terminal]
7876
----
7977
$ az deployment group create --verbose -g ${RESOURCE_GROUP} \
8078
--template-file "<installation_directory>/04_bootstrap.json" \
8179
--parameters bootstrapIgnition="${BOOTSTRAP_IGNITION}" \ <1>
82-
--parameters sshKeyData="${SSH_KEY}" \ <2>
83-
--parameters baseName="${INFRA_ID}" \ <3>
84-
--parameters diagnosticsStorageAccountName="${CLUSTER_NAME}sa" <4>
80+
--parameters baseName="${INFRA_ID}" \ <2>
81+
--parameters diagnosticsStorageAccountName="${CLUSTER_NAME}sa" <3>
8582
----
8683
<1> The bootstrap Ignition content for the bootstrap cluster.
87-
<2> The SSH RSA public key file as a string.
88-
<3> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
89-
<4> The name of the storage account for your cluster.
84+
<2> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
85+
<3> The name of the storage account for your cluster.
9086
endif::ash[]
9187

9288
ifeval::["{context}" == "installing-azure-user-infra"]

‎modules/installation-creating-azure-control-plane.adoc‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,23 @@ ifdef::azure[]
5757
$ az deployment group create -g ${RESOURCE_GROUP} \
5858
--template-file "<installation_directory>/05_masters.json" \
5959
--parameters masterIgnition="${MASTER_IGNITION}" \ <1>
60-
--parameters sshKeyData="${SSH_KEY}" \ <2>
61-
--parameters privateDNSZoneName="${CLUSTER_NAME}.${BASE_DOMAIN}" \ <3>
62-
--parameters baseName="${INFRA_ID}"<4>
60+
--parameters baseName="${INFRA_ID}" <2>
6361
----
6462
<1> The Ignition content for the control plane nodes.
65-
<2> The SSH RSA public key file as a string.
66-
<3> The name of the private DNS zone to which the control plane nodes are attached.
67-
<4> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
63+
<2> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
6864
endif::azure[]
6965
ifdef::ash[]
7066
[source,terminal]
7167
----
7268
$ az deployment group create -g ${RESOURCE_GROUP} \
7369
--template-file "<installation_directory>/05_masters.json" \
7470
--parameters masterIgnition="${MASTER_IGNITION}" \ <1>
75-
--parameters sshKeyData="${SSH_KEY}" \ <2>
76-
--parameters baseName="${INFRA_ID}" \ <3>
77-
--parameters diagnosticsStorageAccountName="${CLUSTER_NAME}sa" <4>
71+
--parameters baseName="${INFRA_ID}" \ <2>
72+
--parameters diagnosticsStorageAccountName="${CLUSTER_NAME}sa" <3>
7873
----
7974
<1> The Ignition content for the control plane nodes (also known as the master nodes).
80-
<2> The SSH RSA public key file as a string.
81-
<3> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
82-
<4> The name of the storage account for your cluster.
75+
<2> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
76+
<3> The name of the storage account for your cluster.
8377
endif::ash[]
8478

8579
ifeval::["{context}" == "installing-azure-user-infra"]

‎modules/installation-creating-azure-worker.adoc‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,23 @@ ifdef::azure[]
6363
$ az deployment group create -g ${RESOURCE_GROUP} \
6464
--template-file "<installation_directory>/06_workers.json" \
6565
--parameters workerIgnition="${WORKER_IGNITION}" \ <1>
66-
--parameters sshKeyData="${SSH_KEY}" \ <2>
67-
--parameters baseName="${INFRA_ID}" <3>
66+
--parameters baseName="${INFRA_ID}" <2>
6867
----
6968
<1> The Ignition content for the worker nodes.
70-
<2> The SSH RSA public key file as a string.
71-
<3> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
69+
<2> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
7270
endif::azure[]
7371
ifdef::ash[]
7472
[source,terminal]
7573
----
7674
$ az deployment group create -g ${RESOURCE_GROUP} \
7775
--template-file "<installation_directory>/06_workers.json" \
7876
--parameters workerIgnition="${WORKER_IGNITION}" \ <1>
79-
--parameters sshKeyData="${SSH_KEY}" \ <2>
80-
--parameters baseName="${INFRA_ID}" <3>
81-
--parameters diagnosticsStorageAccountName="${CLUSTER_NAME}sa" <4>
77+
--parameters baseName="${INFRA_ID}" <2>
78+
--parameters diagnosticsStorageAccountName="${CLUSTER_NAME}sa" <3>
8279
----
8380
<1> The Ignition content for the worker nodes.
84-
<2> The SSH RSA public key file as a string.
85-
<3> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
86-
<4> The name of the storage account for your cluster.
81+
<2> The base name to be used in resource names; this is usually the cluster's infrastructure ID.
82+
<3> The name of the storage account for your cluster.
8783
endif::ash[]
8884

8985
ifeval::["{context}" == "installing-azure-user-infra"]

0 commit comments

Comments
 (0)