Skip to content

Commit 4af1e83

Browse files
juniorjunior
authored
Merge pull request #19 from junior/5G-example
support to create extra subnets externally with oke
2 parents 687ab9d + a8c89e5 commit 4af1e83

File tree

4 files changed

+31
-12
lines changed

4 files changed

+31
-12
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.8.6
1+
0.8.7

‎defaults.tf

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ locals {
8181
# node_pool_node_shape_config_memory_in_gbs = 1
8282
# node_pool_boot_volume_size_in_gbs = "100"
8383
# existent_oke_nodepool_id_for_autoscaler = null
84+
# node_pool_alternative_subnet = null # Optional, name of previously created subnet
8485
# image_operating_system = null
8586
# image_operating_system_version = null
8687
# extra_initial_node_labels = [{ key = "app.pixel/gpu", value = "true" }]
@@ -94,14 +95,16 @@ locals {
9495
# {
9596
# subnet_name = "opensearch_subnet"
9697
# cidr_block = cidrsubnet(local.vcn_cidr_blocks[0], 8, 35) # e.g.: "10.20.35.0/24" = 254 usable IPs (10.20.35.0 - 10.20.35.255)
97-
# display_name = "OCI OpenSearch Service subnet (${local.deploy_id})"
98-
# dns_label = "opensearch${local.deploy_id}"
98+
# display_name = "OCI OpenSearch Service subnet (${local.deploy_id})" # If null, is autogenerated
99+
# dns_label = "opensearch${local.deploy_id}" # If null, disable dns label
99100
# prohibit_public_ip_on_vnic = false
100101
# prohibit_internet_ingress = false
101-
# route_table_id = module.route_tables["public"].route_table_id
102-
# dhcp_options_id = module.vcn.default_dhcp_options_id
103-
# security_list_ids = [module.security_lists["opensearch_security_list"].security_list_id]
104-
# ipv6cidr_block = null
102+
# route_table_id = module.route_tables["public"].route_table_id # If null, the VCN's default route table is used
103+
# alternative_route_table = null # Optional, Name of the previously created route table
104+
# dhcp_options_id = module.vcn.default_dhcp_options_id # If null, the VCN's default set of DHCP options is used
105+
# security_list_ids = [module.security_lists["opensearch_security_list"].security_list_id] # If null, the VCN's default security list is used
106+
# alternative_security_list = null # Optional, Name of the previously created security list
107+
# ipv6cidr_block = null # If null, no IPv6 CIDR block is assigned
105108
# },
106109
]
107110
}

‎main.tf

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ module "oke_node_pool" {
126126
cni_type = each.value.cni_type
127127

128128
# OKE Network Details
129-
nodes_subnet_id = local.create_subnets ? module.subnets["oke_nodes_subnet"].subnet_id : var.existent_oke_nodes_subnet_ocid
129+
# nodes_subnet_id = local.create_subnets ? module.subnets["oke_nodes_subnet"].subnet_id : var.existent_oke_nodes_subnet_ocid
130+
nodes_subnet_id = (local.create_subnets ? (anytrue([(each.value.node_pool_alternative_subnet == ""), (each.value.node_pool_alternative_subnet == null)])
131+
? module.subnets["oke_nodes_subnet"].subnet_id : module.subnets[each.value.node_pool_alternative_subnet].subnet_id)
132+
: var.existent_oke_nodes_subnet_ocid)
130133
vcn_native_pod_networking_subnet_ocid = each.value.cni_type == "OCI_VCN_IP_NATIVE" ? (local.create_subnets ? module.subnets["oke_pods_network_subnet"].subnet_id : var.existent_oke_vcn_native_pod_networking_subnet_ocid) : ""
131134

132135
# Encryption (OCI Vault/Key Management/KMS)
@@ -145,6 +148,7 @@ locals {
145148
node_pool_node_shape_config_memory_in_gbs = var.node_pool_instance_shape_1.memory
146149
node_pool_boot_volume_size_in_gbs = var.node_pool_boot_volume_size_in_gbs_1
147150
existent_oke_nodepool_id_for_autoscaler = var.existent_oke_nodepool_id_for_autoscaler_1
151+
node_pool_alternative_subnet = null
148152
image_operating_system = var.image_operating_system_1
149153
image_operating_system_version = var.image_operating_system_version_1
150154
extra_initial_node_labels = var.extra_initial_node_labels_1
@@ -201,8 +205,10 @@ locals {
201205
prohibit_public_ip_on_vnic = (var.cluster_endpoint_visibility == "Private") ? true : false
202206
prohibit_internet_ingress = (var.cluster_endpoint_visibility == "Private") ? true : false
203207
route_table_id = (var.cluster_endpoint_visibility == "Private") ? module.route_tables["private"].route_table_id : module.route_tables["public"].route_table_id
208+
alternative_route_table = null
204209
dhcp_options_id = module.vcn.default_dhcp_options_id
205210
security_list_ids = [module.security_lists["oke_endpoint_security_list"].security_list_id]
211+
alternative_security_list = null
206212
ipv6cidr_block = null
207213
},
208214
{
@@ -213,8 +219,10 @@ locals {
213219
prohibit_public_ip_on_vnic = (var.cluster_workers_visibility == "Private") ? true : false
214220
prohibit_internet_ingress = (var.cluster_workers_visibility == "Private") ? true : false
215221
route_table_id = (var.cluster_workers_visibility == "Private") ? module.route_tables["private"].route_table_id : module.route_tables["public"].route_table_id
222+
alternative_route_table = null
216223
dhcp_options_id = module.vcn.default_dhcp_options_id
217224
security_list_ids = [module.security_lists["oke_nodes_security_list"].security_list_id]
225+
alternative_security_list = null
218226
ipv6cidr_block = null
219227
},
220228
{
@@ -225,8 +233,10 @@ locals {
225233
prohibit_public_ip_on_vnic = (var.cluster_load_balancer_visibility == "Private") ? true : false
226234
prohibit_internet_ingress = (var.cluster_load_balancer_visibility == "Private") ? true : false
227235
route_table_id = (var.cluster_load_balancer_visibility == "Private") ? module.route_tables["private"].route_table_id : module.route_tables["public"].route_table_id
236+
alternative_route_table = null
228237
dhcp_options_id = module.vcn.default_dhcp_options_id
229238
security_list_ids = [module.security_lists["oke_lb_security_list"].security_list_id]
239+
alternative_security_list = null
230240
ipv6cidr_block = null
231241
}
232242
]
@@ -239,8 +249,10 @@ locals {
239249
prohibit_public_ip_on_vnic = (var.pods_network_visibility == "Private") ? true : false
240250
prohibit_internet_ingress = (var.pods_network_visibility == "Private") ? true : false
241251
route_table_id = (var.pods_network_visibility == "Private") ? module.route_tables["private"].route_table_id : module.route_tables["public"].route_table_id
252+
alternative_route_table = null
242253
dhcp_options_id = module.vcn.default_dhcp_options_id
243254
security_list_ids = [module.security_lists["oke_pod_network_security_list"].security_list_id]
255+
alternative_security_list = null
244256
ipv6cidr_block = null
245257
}] : []
246258
subnet_bastion = []

‎oci-networking.tf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ module "subnets" {
6464
dns_label = each.value.dns_label # If null, is autogenerated
6565
prohibit_public_ip_on_vnic = each.value.prohibit_public_ip_on_vnic
6666
prohibit_internet_ingress = each.value.prohibit_internet_ingress
67-
route_table_id = each.value.route_table_id # If null, the VCN's default route table is used
68-
dhcp_options_id = each.value.dhcp_options_id # If null, the VCN's default set of DHCP options is used
69-
security_list_ids = each.value.security_list_ids # If null, the VCN's default security list is used
70-
ipv6cidr_block = each.value.ipv6cidr_block # If null, no IPv6 CIDR block is assigned
67+
route_table_id = (anytrue([(each.value.alternative_route_table == ""), (each.value.alternative_route_table == null)])
68+
? each.value.route_table_id
69+
: module.route_tables[each.value.alternative_route_table].route_table_id) # If null, the VCN's default route table is used
70+
dhcp_options_id = each.value.dhcp_options_id # If null, the VCN's default set of DHCP options is used
71+
security_list_ids = (anytrue([(each.value.alternative_security_list == ""), (each.value.alternative_security_list == null)]) # If null, the VCN's default security list is used
72+
? each.value.security_list_ids
73+
: [module.security_lists[each.value.alternative_security_list].security_list_id])
74+
ipv6cidr_block = each.value.ipv6cidr_block # If null, no IPv6 CIDR block is assigned
7175
}
7276

7377
################################################################################

0 commit comments

Comments
 (0)