Skip to content
This repository was archived by the owner on Oct 31, 2019. It is now read-only.

Commit 1a48b04

Browse files
authored
Merge pull request #58 from oracle/jlamillan/zero-based-index-issue
Jlamillan/zero based index issue
2 parents c9db547 + eff0ff3 commit 1a48b04

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

k8s-oci.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ module "k8smaster-public-lb" {
361361
is_private = "${var.k8s_master_lb_access == "private" ? "true": "false"}"
362362

363363
# Handle case where var.k8s_master_lb_access=public, but var.control_plane_subnet_access=private
364-
k8smaster_subnet_0_id = "${var.k8s_master_lb_access == "private" ? module.vcn.k8smaster_subnet_ad1_id: coalesce(join(" ", list(module.vcn.public_subnet_ad1_id)), join(" ", list(module.vcn.k8smaster_subnet_ad1_id)))}"
365-
k8smaster_subnet_1_id = "${var.k8s_master_lb_access == "private" ? "": coalesce(join(" ", list(module.vcn.public_subnet_ad2_id)), join(" ", list(module.vcn.k8smaster_subnet_ad2_id)))}"
364+
k8smaster_subnet_0_id = "${var.k8s_master_lb_access == "private" ? module.vcn.k8smaster_subnet_ad1_id: coalesce(join(" ", module.vcn.public_subnet_ad1_id), join(" ", list(module.vcn.k8smaster_subnet_ad1_id)))}"
365+
k8smaster_subnet_1_id = "${var.k8s_master_lb_access == "private" ? "": coalesce(join(" ", module.vcn.public_subnet_ad2_id), join(" ", list(module.vcn.k8smaster_subnet_ad2_id)))}"
366366
k8smaster_ad1_private_ips = "${module.instances-k8smaster-ad1.private_ips}"
367367
k8smaster_ad2_private_ips = "${module.instances-k8smaster-ad2.private_ips}"
368368
k8smaster_ad3_private_ips = "${module.instances-k8smaster-ad3.private_ips}"

network/vcn/outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ output "k8worker_subnet_ad3_id" {
3939
}
4040

4141
output "public_subnet_ad1_id" {
42-
value = "${oci_core_subnet.PublicSubnetAD1.0.id}"
42+
value = "${oci_core_subnet.PublicSubnetAD1.*.id}"
4343
}
4444

4545
output "public_subnet_ad2_id" {
46-
value = "${oci_core_subnet.PublicSubnetAD2.0.id}"
46+
value = "${oci_core_subnet.PublicSubnetAD2.*.id}"
4747
}
4848

4949
output "public_subnet_ad3_id" {
50-
value = "${oci_core_subnet.PublicSubnetAD3.0.id}"
50+
value = "${oci_core_subnet.PublicSubnetAD3.*.id}"
5151
}
5252

5353
output "nat_instance_ad1_private_ips" {

0 commit comments

Comments
 (0)