Skip to content

Commit 14949a8

Browse files
committed
feat: add port ranges for inter-cluster communication
Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com>
1 parent 9743f84 commit 14949a8

File tree

22 files changed

+155
-138
lines changed

22 files changed

+155
-138
lines changed

admin.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module "admin" {
8282
load_balancers = "both"
8383
preferred_load_balancer = "public"
8484
internal_lb_allowed_cidrs = ["0.0.0.0/0"]
85-
internal_lb_allowed_ports = [80, 443]
85+
internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
8686
public_lb_allowed_cidrs = ["0.0.0.0/0"]
8787
public_lb_allowed_ports = [80, 443, 15021]
8888

docs/src/multi/pub-ep.md

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,23 @@ for cluster in admin phoenix; do
286286
done
287287
```
288288

289-
3. Install the Verrazzano Admin cluster:
289+
3. Obtain the manifest for DNS:
290+
291+
```bash
292+
cd /home/opc/vz/oci
293+
bash get_oci_secret.sh
294+
echo >> oci.yaml
295+
```
296+
297+
4. Create the secret in each cluster:
298+
299+
```bash, editable
300+
for cluster in admin phoenix ; do
301+
bash create_oci_secret_$cluster.sh
302+
done
303+
```
304+
305+
5. Install the Verrazzano Admin cluster:
290306

291307
```
292308
cd /home/opc/vz/clusters
@@ -296,15 +312,16 @@ bash install_vz_cluster_admin.sh
296312
The Admin cluster has more components to install and takes longer, so we install it separately. This allows us to install the managed clusters in parallel.
297313
```
298314

299-
4. While the Admin cluster is being installed in the background, you can install the managed clusters in parallel:
315+
6. While the Admin cluster is being installed in the background, you can install the managed clusters in parallel:
300316

301317
```bash, editable
318+
cd /home/opc/vz/clusters
302319
for cluster in phoenix ; do
303320
bash install_vz_cluster_$cluster.sh
304321
done
305322
```
306323

307-
5. Wait for Verrazzano to be installed in all clusters:
324+
7. Wait for Verrazzano to be installed in all clusters:
308325

309326
```
310327
# check managed clusters' status
@@ -315,7 +332,7 @@ kubectx admin
315332
kubectl wait --timeout=20m --for=condition=InstallComplete verrazzano/admin
316333
```
317334

318-
6. Create the certificates secrets for each managed cluster:
335+
8. Create the certificates secrets for each managed cluster:
319336

320337
```bash, editable
321338
cd /home/opc/vz/certs
@@ -324,14 +341,14 @@ for cluster in phoenix; do
324341
done
325342
```
326343

327-
7. Create the ConfigMap for the API Server:
344+
9. Create the ConfigMap for the API Server:
328345

329346
```
330347
cd /home/opc/vz/cm
331348
bash create_api_cm.sh
332349
```
333350

334-
8. Create the Verrazzano managed cluster objects for each managed cluster:
351+
10. Create the Verrazzano managed cluster objects for each managed cluster:
335352

336353
```bash, editable
337354
cd /home/opc/vz/clusters
@@ -340,7 +357,7 @@ for cluster in phoenix; do
340357
done
341358
```
342359

343-
9. Register all the managed clusters:
360+
11. Register all the managed clusters:
344361

345362
```bash, editable
346363
for cluster in phoenix; do

modules/clusters/africa.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# load_balancers = "both"
7373
# preferred_load_balancer = "public"
7474
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
# internal_lb_allowed_ports = [80, 443]
75+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
# public_lb_allowed_ports = [80, 443]
7878

modules/clusters/australia.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ module "melbourne" {
7272
load_balancers = "both"
7373
preferred_load_balancer = "public"
7474
internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
internal_lb_allowed_ports = [80, 443]
75+
internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
public_lb_allowed_ports = [80, 443]
7878

@@ -158,7 +158,7 @@ module "sydney" {
158158
load_balancers = "both"
159159
preferred_load_balancer = "public"
160160
internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
161-
internal_lb_allowed_ports = [80, 443]
161+
internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
162162
public_lb_allowed_cidrs = ["0.0.0.0/0"]
163163
public_lb_allowed_ports = [80, 443]
164164

modules/clusters/brazil.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# load_balancers = "both"
7373
# preferred_load_balancer = "public"
7474
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
# internal_lb_allowed_ports = [80, 443]
75+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
# public_lb_allowed_ports = [80, 443]
7878

@@ -156,7 +156,7 @@
156156
# load_balancers = "both"
157157
# preferred_load_balancer = "public"
158158
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
159-
# internal_lb_allowed_ports = [80, 443]
159+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
160160
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
161161
# public_lb_allowed_ports = [80, 443]
162162

modules/clusters/canada.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# load_balancers = "both"
7373
# preferred_load_balancer = "public"
7474
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
# internal_lb_allowed_ports = [80, 443]
75+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
# public_lb_allowed_ports = [80, 443]
7878

@@ -156,7 +156,7 @@
156156
# load_balancers = "both"
157157
# preferred_load_balancer = "public"
158158
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
159-
# internal_lb_allowed_ports = [80, 443]
159+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
160160
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
161161
# public_lb_allowed_ports = [80, 443]
162162

modules/clusters/europe.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# load_balancers = "both"
7373
# preferred_load_balancer = "public"
7474
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
# internal_lb_allowed_ports = [80, 443]
75+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
# public_lb_allowed_ports = [80, 443]
7878

@@ -157,7 +157,7 @@
157157
# load_balancers = "both"
158158
# preferred_load_balancer = "public"
159159
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
160-
# internal_lb_allowed_ports = [80, 443]
160+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
161161
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
162162
# public_lb_allowed_ports = [80, 443]
163163

@@ -242,7 +242,7 @@
242242
# load_balancers = "both"
243243
# preferred_load_balancer = "public"
244244
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
245-
# internal_lb_allowed_ports = [80, 443]
245+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
246246
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
247247
# public_lb_allowed_ports = [80, 443]
248248

@@ -326,7 +326,7 @@
326326
# load_balancers = "both"
327327
# preferred_load_balancer = "public"
328328
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
329-
# internal_lb_allowed_ports = [80, 443]
329+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
330330
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
331331
# public_lb_allowed_ports = [80, 443]
332332

@@ -410,7 +410,7 @@
410410
# load_balancers = "both"
411411
# preferred_load_balancer = "public"
412412
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
413-
# internal_lb_allowed_ports = [80, 443]
413+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
414414
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
415415
# public_lb_allowed_ports = [80, 443]
416416

@@ -494,7 +494,7 @@
494494
# load_balancers = "both"
495495
# preferred_load_balancer = "public"
496496
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
497-
# internal_lb_allowed_ports = [80, 443]
497+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
498498
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
499499
# public_lb_allowed_ports = [80, 443]
500500

modules/clusters/france.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# load_balancers = "both"
7373
# preferred_load_balancer = "public"
7474
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
# internal_lb_allowed_ports = [80, 443]
75+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
# public_lb_allowed_ports = [80, 443]
7878

@@ -156,7 +156,7 @@
156156
# load_balancers = "both"
157157
# preferred_load_balancer = "public"
158158
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
159-
# internal_lb_allowed_ports = [80, 443]
159+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
160160
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
161161
# public_lb_allowed_ports = [80, 443]
162162

modules/clusters/india.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# load_balancers = "both"
7373
# preferred_load_balancer = "public"
7474
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
# internal_lb_allowed_ports = [80, 443]
75+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
# public_lb_allowed_ports = [80, 443]
7878

@@ -156,7 +156,7 @@
156156
# load_balancers = "both"
157157
# preferred_load_balancer = "public"
158158
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
159-
# internal_lb_allowed_ports = [80, 443]
159+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
160160
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
161161
# public_lb_allowed_ports = [80, 443]
162162

modules/clusters/japan.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# load_balancers = "both"
7373
# preferred_load_balancer = "public"
7474
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
75-
# internal_lb_allowed_ports = [80, 443]
75+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
7676
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
7777
# public_lb_allowed_ports = [80, 443]
7878

@@ -156,7 +156,7 @@
156156
# load_balancers = "both"
157157
# preferred_load_balancer = "public"
158158
# internal_lb_allowed_cidrs = [lookup(var.admin_region, "vcn_cidr")]
159-
# internal_lb_allowed_ports = [80, 443]
159+
# internal_lb_allowed_ports = var.connectivity_mode == "mesh" ? [80, 443, 15012, 15017, 15021, 15443] : [80, 443]
160160
# public_lb_allowed_cidrs = ["0.0.0.0/0"]
161161
# public_lb_allowed_ports = [80, 443]
162162

0 commit comments

Comments
 (0)