Skip to content

Commit b8ecf11

Browse files
hyderhyder
committed
feat: variable name changes, docs update
- Removed regions input variable - Updated Terraform options in docs - Updated terraform.tfvars.example file Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com>
1 parent 950777e commit b8ecf11

File tree

6 files changed

+126
-174
lines changed

6 files changed

+126
-174
lines changed

‎admin.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ module "admin" {
2424

2525
# admin is always connected to everybody
2626
remote_peering_connections = {
27-
for k, v in var.clusters : "rpc-to-${k}" => {} if tobool(v)
27+
for k, v in var.managed_clusters : "rpc-to-${k}" => {} if tobool(v)
2828
}
2929

3030

3131
internet_gateway_route_rules = [
32-
for c in keys(var.clusters) :
32+
for c in keys(var.managed_clusters) :
3333
{
3434
destination = lookup(lookup(var.cidrs, c), "vcn")
3535
destination_type = "CIDR_BLOCK"
3636
network_entity_id = "drg"
3737
description = "Routing to allow ssh to ${title(c)}"
38-
} if tobool(lookup(var.clusters, c))
38+
} if tobool(lookup(var.managed_clusters, c))
3939
]
4040

4141
nat_gateway_route_rules = [
42-
for c in keys(var.clusters) :
42+
for c in keys(var.managed_clusters) :
4343
{
4444
destination = lookup(lookup(var.cidrs, c), "vcn")
4545
destination_type = "CIDR_BLOCK"
4646
network_entity_id = "drg"
4747
description = "Routing to allow connectivity to ${title(c)} cluster"
48-
} if tobool(lookup(var.clusters, c))
48+
} if tobool(lookup(var.managed_clusters, c))
4949
]
5050

5151
vcn_cidrs = [lookup(var.admin_region, "vcn_cidr")]

‎docs/src/terraformoptions.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| compartment_id | The compartment id where to create all resources. | string | "" |
1313
| label_prefix | A string that will be prepended to all resources. | string | "" |
1414

15-
### ssh keys
15+
### SSH keys
1616

1717
| Parameter | Description | Type | Default |
1818
| --------- | ----------- | ----------- | ------- |
@@ -27,22 +27,22 @@
2727
| connectivity_mode | Whether to keep set up connectivity in mesh or star mode. Admin is always connected to everybody | string | star |
2828

2929

30-
### clusters
30+
### Clusters
3131

3232
| Parameter | Description | Type | Default |
3333
| --------- | ----------- | ----------- | ------- |
3434
| admin_region | The region parameters of the Admin cluster. In case a single cluster is created, the Admin region is used for the single cluster. | map(any)| |
35+
| configure_clusters | Whether to set up access to the clusters. Set to false on cluster creation. | bool | false |
3536
| kubernetes_version | The version of Kubernetes to use. | string | v1.24.1 |
3637
| oke_control_plane | Whether to keep all OKE control planes public or private | public/private | public |
37-
| clusters | A map of OCI regions where managed clusters will be created | map(bool) | |
38+
| managed_clusters | A map of OCI regions where managed clusters will be created | map(bool) | |
3839
| nodepools | Node pool specification for all clusters | map(bool) | |
3940
| cloudinit_nodepool_common | Path to custom cloud init file for OKE workner nodes | string | |
4041

4142
### Verrazzano
4243

4344
| Parameter | Description | Type | Default |
4445
| --------- | ----------- | ----------- | ------- |
45-
| configure_clusters | Whether to set up access to the clusters. Set to false on cluster creation. | bool | false |
4646
| install_verrazzano | Whether ready to install Verrazzano. Set to false on cluster creation | string | false |
4747
| verrazzano_version | Verrazzano version to install | 1.5.3 | 1.5.3 |
4848
| verrazzano_profile | Verrazzano profile to install | dev/prod | dev |
@@ -55,7 +55,8 @@
5555
| Parameter | Description | Type | Default |
5656
| --------- | ----------- | ----------- | ------- |
5757
| configure_dns | Whether to configure DNS. If not configured, nip.io will be used | bool | false |
58-
| secret_id | OCID of OCI secret to be used for OCI DNS authentication. | string | |
59-
| dns_zone_id | DNS Zone OCID in OCI DNS | string | |
6058
| dns_compartment_id | DNS Zone's Compartment id | string | |
59+
| dns_zone_id | DNS Zone OCID in OCI DNS | string | |
6160
| dns_zone_name | DNS Zone Name | string | |
61+
| secret_id | OCID of OCI secret to be used for OCI DNS authentication. | string | |
62+

‎main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module "clusters" {
2323

2424
admin_region = var.admin_region
2525

26-
clusters = var.clusters
26+
clusters = var.managed_clusters
2727

2828
oke_control_plane = var.oke_control_plane
2929

‎providers.tf‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ provider "oci" {
1414
provider "oci" {
1515
fingerprint = var.api_fingerprint
1616
private_key_path = var.api_private_key_path
17-
region = var.regions["johannesburg"]
17+
region = local.regions["johannesburg"]
1818
tenancy_ocid = var.tenancy_id
1919
user_ocid = var.user_id
2020
alias = "johannesburg"
@@ -24,7 +24,7 @@ provider "oci" {
2424
provider "oci" {
2525
fingerprint = var.api_fingerprint
2626
private_key_path = var.api_private_key_path
27-
region = var.regions["sydney"]
27+
region = local.regions["sydney"]
2828
tenancy_ocid = var.tenancy_id
2929
user_ocid = var.user_id
3030
alias = "sydney"
@@ -34,7 +34,7 @@ provider "oci" {
3434
provider "oci" {
3535
fingerprint = var.api_fingerprint
3636
private_key_path = var.api_private_key_path
37-
region = var.regions["melbourne"]
37+
region = local.regions["melbourne"]
3838
tenancy_ocid = var.tenancy_id
3939
user_ocid = var.user_id
4040
alias = "melbourne"
@@ -44,7 +44,7 @@ provider "oci" {
4444
provider "oci" {
4545
fingerprint = var.api_fingerprint
4646
private_key_path = var.api_private_key_path
47-
region = var.regions["tokyo"]
47+
region = local.regions["tokyo"]
4848
tenancy_ocid = var.tenancy_id
4949
user_ocid = var.user_id
5050
alias = "tokyo"
@@ -54,7 +54,7 @@ provider "oci" {
5454
provider "oci" {
5555
fingerprint = var.api_fingerprint
5656
private_key_path = var.api_private_key_path
57-
region = var.regions["osaka"]
57+
region = local.regions["osaka"]
5858
tenancy_ocid = var.tenancy_id
5959
user_ocid = var.user_id
6060
alias = "osaka"
@@ -64,7 +64,7 @@ provider "oci" {
6464
provider "oci" {
6565
fingerprint = var.api_fingerprint
6666
private_key_path = var.api_private_key_path
67-
region = var.regions["mumbai"]
67+
region = local.regions["mumbai"]
6868
tenancy_ocid = var.tenancy_id
6969
user_ocid = var.user_id
7070
alias = "mumbai"
@@ -74,7 +74,7 @@ provider "oci" {
7474
provider "oci" {
7575
fingerprint = var.api_fingerprint
7676
private_key_path = var.api_private_key_path
77-
region = var.regions["hyderabad"]
77+
region = local.regions["hyderabad"]
7878
tenancy_ocid = var.tenancy_id
7979
user_ocid = var.user_id
8080
alias = "hyderabad"
@@ -84,7 +84,7 @@ provider "oci" {
8484
provider "oci" {
8585
fingerprint = var.api_fingerprint
8686
private_key_path = var.api_private_key_path
87-
region = var.regions["seoul"]
87+
region = local.regions["seoul"]
8888
tenancy_ocid = var.tenancy_id
8989
user_ocid = var.user_id
9090
alias = "seoul"
@@ -94,7 +94,7 @@ provider "oci" {
9494
provider "oci" {
9595
fingerprint = var.api_fingerprint
9696
private_key_path = var.api_private_key_path
97-
region = var.regions["chuncheon"]
97+
region = local.regions["chuncheon"]
9898
tenancy_ocid = var.tenancy_id
9999
user_ocid = var.user_id
100100
alias = "chuncheon"
@@ -104,7 +104,7 @@ provider "oci" {
104104
provider "oci" {
105105
fingerprint = var.api_fingerprint
106106
private_key_path = var.api_private_key_path
107-
region = var.regions["singapore"]
107+
region = local.regions["singapore"]
108108
tenancy_ocid = var.tenancy_id
109109
user_ocid = var.user_id
110110
alias = "singapore"
@@ -114,7 +114,7 @@ provider "oci" {
114114
provider "oci" {
115115
fingerprint = var.api_fingerprint
116116
private_key_path = var.api_private_key_path
117-
region = var.regions["paris"]
117+
region = local.regions["paris"]
118118
tenancy_ocid = var.tenancy_id
119119
user_ocid = var.user_id
120120
alias = "paris"
@@ -124,7 +124,7 @@ provider "oci" {
124124
provider "oci" {
125125
fingerprint = var.api_fingerprint
126126
private_key_path = var.api_private_key_path
127-
region = var.regions["marseille"]
127+
region = local.regions["marseille"]
128128
tenancy_ocid = var.tenancy_id
129129
user_ocid = var.user_id
130130
alias = "marseille"
@@ -134,7 +134,7 @@ provider "oci" {
134134
provider "oci" {
135135
fingerprint = var.api_fingerprint
136136
private_key_path = var.api_private_key_path
137-
region = var.regions["frankfurt"]
137+
region = local.regions["frankfurt"]
138138
tenancy_ocid = var.tenancy_id
139139
user_ocid = var.user_id
140140
alias = "frankfurt"
@@ -144,7 +144,7 @@ provider "oci" {
144144
provider "oci" {
145145
fingerprint = var.api_fingerprint
146146
private_key_path = var.api_private_key_path
147-
region = var.regions["milan"]
147+
region = local.regions["milan"]
148148
tenancy_ocid = var.tenancy_id
149149
user_ocid = var.user_id
150150
alias = "milan"
@@ -154,7 +154,7 @@ provider "oci" {
154154
provider "oci" {
155155
fingerprint = var.api_fingerprint
156156
private_key_path = var.api_private_key_path
157-
region = var.regions["amsterdam"]
157+
region = local.regions["amsterdam"]
158158
tenancy_ocid = var.tenancy_id
159159
user_ocid = var.user_id
160160
alias = "amsterdam"
@@ -164,7 +164,7 @@ provider "oci" {
164164
provider "oci" {
165165
fingerprint = var.api_fingerprint
166166
private_key_path = var.api_private_key_path
167-
region = var.regions["madrid"]
167+
region = local.regions["madrid"]
168168
tenancy_ocid = var.tenancy_id
169169
user_ocid = var.user_id
170170
alias = "madrid"
@@ -174,7 +174,7 @@ provider "oci" {
174174
provider "oci" {
175175
fingerprint = var.api_fingerprint
176176
private_key_path = var.api_private_key_path
177-
region = var.regions["stockholm"]
177+
region = local.regions["stockholm"]
178178
tenancy_ocid = var.tenancy_id
179179
user_ocid = var.user_id
180180
alias = "stockholm"
@@ -184,7 +184,7 @@ provider "oci" {
184184
provider "oci" {
185185
fingerprint = var.api_fingerprint
186186
private_key_path = var.api_private_key_path
187-
region = var.regions["zurich"]
187+
region = local.regions["zurich"]
188188
tenancy_ocid = var.tenancy_id
189189
user_ocid = var.user_id
190190
alias = "zurich"
@@ -194,7 +194,7 @@ provider "oci" {
194194
provider "oci" {
195195
fingerprint = var.api_fingerprint
196196
private_key_path = var.api_private_key_path
197-
region = var.regions["london"]
197+
region = local.regions["london"]
198198
tenancy_ocid = var.tenancy_id
199199
user_ocid = var.user_id
200200
alias = "london"
@@ -204,7 +204,7 @@ provider "oci" {
204204
provider "oci" {
205205
fingerprint = var.api_fingerprint
206206
private_key_path = var.api_private_key_path
207-
region = var.regions["newport"]
207+
region = local.regions["newport"]
208208
tenancy_ocid = var.tenancy_id
209209
user_ocid = var.user_id
210210
alias = "newport"
@@ -214,7 +214,7 @@ provider "oci" {
214214
provider "oci" {
215215
fingerprint = var.api_fingerprint
216216
private_key_path = var.api_private_key_path
217-
region = var.regions["jerusalem"]
217+
region = local.regions["jerusalem"]
218218
tenancy_ocid = var.tenancy_id
219219
user_ocid = var.user_id
220220
alias = "jerusalem"
@@ -224,7 +224,7 @@ provider "oci" {
224224
provider "oci" {
225225
fingerprint = var.api_fingerprint
226226
private_key_path = var.api_private_key_path
227-
region = var.regions["jeddah"]
227+
region = local.regions["jeddah"]
228228
tenancy_ocid = var.tenancy_id
229229
user_ocid = var.user_id
230230
alias = "jeddah"
@@ -234,7 +234,7 @@ provider "oci" {
234234
provider "oci" {
235235
fingerprint = var.api_fingerprint
236236
private_key_path = var.api_private_key_path
237-
region = var.regions["abudhabi"]
237+
region = local.regions["abudhabi"]
238238
tenancy_ocid = var.tenancy_id
239239
user_ocid = var.user_id
240240
alias = "abudhabi"
@@ -244,7 +244,7 @@ provider "oci" {
244244
provider "oci" {
245245
fingerprint = var.api_fingerprint
246246
private_key_path = var.api_private_key_path
247-
region = var.regions["dubai"]
247+
region = local.regions["dubai"]
248248
tenancy_ocid = var.tenancy_id
249249
user_ocid = var.user_id
250250
alias = "dubai"
@@ -254,7 +254,7 @@ provider "oci" {
254254
provider "oci" {
255255
fingerprint = var.api_fingerprint
256256
private_key_path = var.api_private_key_path
257-
region = var.regions["queretaro"]
257+
region = local.regions["queretaro"]
258258
tenancy_ocid = var.tenancy_id
259259
user_ocid = var.user_id
260260
alias = "queretaro"
@@ -264,7 +264,7 @@ provider "oci" {
264264
provider "oci" {
265265
fingerprint = var.api_fingerprint
266266
private_key_path = var.api_private_key_path
267-
region = var.regions["saupaulo"]
267+
region = local.regions["saupaulo"]
268268
tenancy_ocid = var.tenancy_id
269269
user_ocid = var.user_id
270270
alias = "saupaulo"
@@ -274,7 +274,7 @@ provider "oci" {
274274
provider "oci" {
275275
fingerprint = var.api_fingerprint
276276
private_key_path = var.api_private_key_path
277-
region = var.regions["vinhedo"]
277+
region = local.regions["vinhedo"]
278278
tenancy_ocid = var.tenancy_id
279279
user_ocid = var.user_id
280280
alias = "vinhedo"
@@ -284,7 +284,7 @@ provider "oci" {
284284
provider "oci" {
285285
fingerprint = var.api_fingerprint
286286
private_key_path = var.api_private_key_path
287-
region = var.regions["santiago"]
287+
region = local.regions["santiago"]
288288
tenancy_ocid = var.tenancy_id
289289
user_ocid = var.user_id
290290
alias = "santiago"
@@ -294,7 +294,7 @@ provider "oci" {
294294
provider "oci" {
295295
fingerprint = var.api_fingerprint
296296
private_key_path = var.api_private_key_path
297-
region = var.regions["montreal"]
297+
region = local.regions["montreal"]
298298
tenancy_ocid = var.tenancy_id
299299
user_ocid = var.user_id
300300
alias = "montreal"
@@ -304,7 +304,7 @@ provider "oci" {
304304
provider "oci" {
305305
fingerprint = var.api_fingerprint
306306
private_key_path = var.api_private_key_path
307-
region = var.regions["toronto"]
307+
region = local.regions["toronto"]
308308
tenancy_ocid = var.tenancy_id
309309
user_ocid = var.user_id
310310
alias = "toronto"
@@ -314,7 +314,7 @@ provider "oci" {
314314
provider "oci" {
315315
fingerprint = var.api_fingerprint
316316
private_key_path = var.api_private_key_path
317-
region = var.regions["ashburn"]
317+
region = local.regions["ashburn"]
318318
tenancy_ocid = var.tenancy_id
319319
user_ocid = var.user_id
320320
alias = "ashburn"
@@ -324,7 +324,7 @@ provider "oci" {
324324
provider "oci" {
325325
fingerprint = var.api_fingerprint
326326
private_key_path = var.api_private_key_path
327-
region = var.regions["chicago"]
327+
region = local.regions["chicago"]
328328
tenancy_ocid = var.tenancy_id
329329
user_ocid = var.user_id
330330
alias = "chicago"
@@ -334,7 +334,7 @@ provider "oci" {
334334
provider "oci" {
335335
fingerprint = var.api_fingerprint
336336
private_key_path = var.api_private_key_path
337-
region = var.regions["phoenix"]
337+
region = local.regions["phoenix"]
338338
tenancy_ocid = var.tenancy_id
339339
user_ocid = var.user_id
340340
alias = "phoenix"
@@ -344,7 +344,7 @@ provider "oci" {
344344
provider "oci" {
345345
fingerprint = var.api_fingerprint
346346
private_key_path = var.api_private_key_path
347-
region = var.regions["sanjose"]
347+
region = local.regions["sanjose"]
348348
tenancy_ocid = var.tenancy_id
349349
user_ocid = var.user_id
350350
alias = "sanjose"

0 commit comments

Comments
 (0)