Skip to content

Commit 2d4bc91

Browse files
juniorjunior
authored
Merge pull request #20 from junior/5G-example
version 0.8.8
2 parents 4af1e83 + 1a12708 commit 2d4bc91

File tree

5 files changed

+68
-58
lines changed

5 files changed

+68
-58
lines changed

‎VERSION

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

‎defaults.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ locals {
100100
# prohibit_public_ip_on_vnic = false
101101
# prohibit_internet_ingress = false
102102
# 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
103+
# alternative_route_table_name = null # Optional, Name of the previously created route table
104104
# dhcp_options_id = module.vcn.default_dhcp_options_id # If null, the VCN's default set of DHCP options is used
105105
# 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
106+
# extra_security_list_names = [] # Optional, Names of the previously created security lists
107107
# ipv6cidr_block = null # If null, no IPv6 CIDR block is assigned
108108
# },
109109
]

‎main.tf

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -198,62 +198,62 @@ locals {
198198
subnets_oke = concat(local.subnets_oke_standard, local.subnet_vcn_native_pod_networking, local.subnet_bastion, local.subnet_fss_mount_targets)
199199
subnets_oke_standard = [
200200
{
201-
subnet_name = "oke_k8s_endpoint_subnet"
202-
cidr_block = lookup(local.network_cidrs, "ENDPOINT-REGIONAL-SUBNET-CIDR")
203-
display_name = "OKE K8s Endpoint subnet (${local.deploy_id})"
204-
dns_label = "okek8s${local.deploy_id}"
205-
prohibit_public_ip_on_vnic = (var.cluster_endpoint_visibility == "Private") ? true : false
206-
prohibit_internet_ingress = (var.cluster_endpoint_visibility == "Private") ? true : false
207-
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
209-
dhcp_options_id = module.vcn.default_dhcp_options_id
210-
security_list_ids = [module.security_lists["oke_endpoint_security_list"].security_list_id]
211-
alternative_security_list = null
212-
ipv6cidr_block = null
201+
subnet_name = "oke_k8s_endpoint_subnet"
202+
cidr_block = lookup(local.network_cidrs, "ENDPOINT-REGIONAL-SUBNET-CIDR")
203+
display_name = "OKE K8s Endpoint subnet (${local.deploy_id})"
204+
dns_label = "okek8s${local.deploy_id}"
205+
prohibit_public_ip_on_vnic = (var.cluster_endpoint_visibility == "Private") ? true : false
206+
prohibit_internet_ingress = (var.cluster_endpoint_visibility == "Private") ? true : false
207+
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_name = null
209+
dhcp_options_id = module.vcn.default_dhcp_options_id
210+
security_list_ids = [module.security_lists["oke_endpoint_security_list"].security_list_id]
211+
extra_security_list_names = anytrue([(var.extra_security_list_name_for_api_endpoint == ""), (var.extra_security_list_name_for_api_endpoint == null)]) ? [] : [var.extra_security_list_name_for_api_endpoint]
212+
ipv6cidr_block = null
213213
},
214214
{
215-
subnet_name = "oke_nodes_subnet"
216-
cidr_block = lookup(local.network_cidrs, "NODES-REGIONAL-SUBNET-CIDR")
217-
display_name = "OKE Nodes subnet (${local.deploy_id})"
218-
dns_label = "okenodes${local.deploy_id}"
219-
prohibit_public_ip_on_vnic = (var.cluster_workers_visibility == "Private") ? true : false
220-
prohibit_internet_ingress = (var.cluster_workers_visibility == "Private") ? true : false
221-
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
223-
dhcp_options_id = module.vcn.default_dhcp_options_id
224-
security_list_ids = [module.security_lists["oke_nodes_security_list"].security_list_id]
225-
alternative_security_list = null
226-
ipv6cidr_block = null
215+
subnet_name = "oke_nodes_subnet"
216+
cidr_block = lookup(local.network_cidrs, "NODES-REGIONAL-SUBNET-CIDR")
217+
display_name = "OKE Nodes subnet (${local.deploy_id})"
218+
dns_label = "okenodes${local.deploy_id}"
219+
prohibit_public_ip_on_vnic = (var.cluster_workers_visibility == "Private") ? true : false
220+
prohibit_internet_ingress = (var.cluster_workers_visibility == "Private") ? true : false
221+
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_name = null
223+
dhcp_options_id = module.vcn.default_dhcp_options_id
224+
security_list_ids = [module.security_lists["oke_nodes_security_list"].security_list_id]
225+
extra_security_list_names = anytrue([(var.extra_security_list_name_for_nodes == ""), (var.extra_security_list_name_for_nodes == null)]) ? [] : [var.extra_security_list_name_for_nodes]
226+
ipv6cidr_block = null
227227
},
228228
{
229-
subnet_name = "oke_lb_subnet"
230-
cidr_block = lookup(local.network_cidrs, "LB-REGIONAL-SUBNET-CIDR")
231-
display_name = "OKE LoadBalancers subnet (${local.deploy_id})"
232-
dns_label = "okelb${local.deploy_id}"
233-
prohibit_public_ip_on_vnic = (var.cluster_load_balancer_visibility == "Private") ? true : false
234-
prohibit_internet_ingress = (var.cluster_load_balancer_visibility == "Private") ? true : false
235-
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
237-
dhcp_options_id = module.vcn.default_dhcp_options_id
238-
security_list_ids = [module.security_lists["oke_lb_security_list"].security_list_id]
239-
alternative_security_list = null
240-
ipv6cidr_block = null
229+
subnet_name = "oke_lb_subnet"
230+
cidr_block = lookup(local.network_cidrs, "LB-REGIONAL-SUBNET-CIDR")
231+
display_name = "OKE LoadBalancers subnet (${local.deploy_id})"
232+
dns_label = "okelb${local.deploy_id}"
233+
prohibit_public_ip_on_vnic = (var.cluster_load_balancer_visibility == "Private") ? true : false
234+
prohibit_internet_ingress = (var.cluster_load_balancer_visibility == "Private") ? true : false
235+
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_name = null
237+
dhcp_options_id = module.vcn.default_dhcp_options_id
238+
security_list_ids = [module.security_lists["oke_lb_security_list"].security_list_id]
239+
extra_security_list_names = []
240+
ipv6cidr_block = null
241241
}
242242
]
243243
subnet_vcn_native_pod_networking = (var.create_pod_network_subnet || var.cluster_cni_type == "OCI_VCN_IP_NATIVE" || var.node_pool_cni_type_1 == "OCI_VCN_IP_NATIVE") ? [
244244
{
245-
subnet_name = "oke_pods_network_subnet"
246-
cidr_block = lookup(local.network_cidrs, "VCN-NATIVE-POD-NETWORKING-REGIONAL-SUBNET-CIDR") # e.g.: 10.20.128.0/17 (1,1) = 32766 usable IPs (10.20.128.0 - 10.20.255.255)
247-
display_name = "OKE PODs Network subnet (${local.deploy_id})"
248-
dns_label = "okenpn${local.deploy_id}"
249-
prohibit_public_ip_on_vnic = (var.pods_network_visibility == "Private") ? true : false
250-
prohibit_internet_ingress = (var.pods_network_visibility == "Private") ? true : false
251-
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
253-
dhcp_options_id = module.vcn.default_dhcp_options_id
254-
security_list_ids = [module.security_lists["oke_pod_network_security_list"].security_list_id]
255-
alternative_security_list = null
256-
ipv6cidr_block = null
245+
subnet_name = "oke_pods_network_subnet"
246+
cidr_block = lookup(local.network_cidrs, "VCN-NATIVE-POD-NETWORKING-REGIONAL-SUBNET-CIDR") # e.g.: 10.20.128.0/17 (1,1) = 32766 usable IPs (10.20.128.0 - 10.20.255.255)
247+
display_name = "OKE PODs Network subnet (${local.deploy_id})"
248+
dns_label = "okenpn${local.deploy_id}"
249+
prohibit_public_ip_on_vnic = (var.pods_network_visibility == "Private") ? true : false
250+
prohibit_internet_ingress = (var.pods_network_visibility == "Private") ? true : false
251+
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_name = null
253+
dhcp_options_id = module.vcn.default_dhcp_options_id
254+
security_list_ids = [module.security_lists["oke_pod_network_security_list"].security_list_id]
255+
extra_security_list_names = []
256+
ipv6cidr_block = null
257257
}] : []
258258
subnet_bastion = []
259259
subnet_fss_mount_targets = [] # 10.20.20.64/26 (10,81) = 62 usable IPs (10.20.20.64 - 10.20.20.255)

‎oci-networking.tf

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,16 @@ 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 = (anytrue([(each.value.alternative_route_table == ""), (each.value.alternative_route_table == null)])
67+
route_table_id = (anytrue([(each.value.alternative_route_table_name == ""), (each.value.alternative_route_table_name == null)])
6868
? 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
69+
: module.route_tables[each.value.alternative_route_table_name].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 = concat(each.value.security_list_ids, [for v in each.value.extra_security_list_names : module.security_lists[v].security_list_id]) # If null, the VCN's default security list is used
72+
ipv6cidr_block = each.value.ipv6cidr_block # If null, no IPv6 CIDR block is assigned
73+
74+
# 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
75+
# ? each.value.security_list_ids
76+
# : [module.security_lists[each.value.alternative_security_list].security_list_id])
7577
}
7678

7779
################################################################################

‎variables.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ variable "extra_security_lists" {
107107
default = []
108108
description = "Extra security lists to be created."
109109
}
110+
variable "extra_security_list_name_for_api_endpoint" {
111+
default = null
112+
description = "Extra security list name previosly created to be used by the K8s API Endpoint Subnet."
113+
}
114+
variable "extra_security_list_name_for_nodes" {
115+
default = null
116+
description = "Extra security list name previosly created to be used by the Nodes Subnet."
117+
}
110118

111119
################################################################################
112120
# Variables: OKE Network

0 commit comments

Comments
 (0)