Skip to content

Commit 46476f3

Browse files
committed
support for extra seclist for vcn native pod net
Signed-off-by: junior <junior@users.noreply.github.com>
1 parent df951c8 commit 46476f3

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

VERSION

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

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ locals {
252252
alternative_route_table_name = null
253253
dhcp_options_id = module.vcn.default_dhcp_options_id
254254
security_list_ids = [module.security_lists["oke_pod_network_security_list"].security_list_id]
255-
extra_security_list_names = []
255+
extra_security_list_names = anytrue([(var.extra_security_list_name_for_vcn_native_pod_networking == ""), (var.extra_security_list_name_for_vcn_native_pod_networking == null)]) ? [] : [var.extra_security_list_name_for_vcn_native_pod_networking]
256256
ipv6cidr_block = null
257257
}] : []
258-
subnet_bastion = []
258+
subnet_bastion = [] # 10.20.2.0/28 (12,32) = 15 usable IPs (10.20.2.0 - 10.20.2.15)
259259
subnet_fss_mount_targets = [] # 10.20.20.64/26 (10,81) = 62 usable IPs (10.20.20.64 - 10.20.20.255)
260260
}
261261

modules/cluster-tools/cluster-tools.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ locals {
1515
# Helm repos
1616
helm_repository = {
1717
ingress_nginx = "https://kubernetes.github.io/ingress-nginx"
18-
ingress_nginx_version = "4.2.5"
18+
ingress_nginx_version = "4.4.0"
1919
jetstack = "https://charts.jetstack.io" # cert-manager
20-
jetstack_version = "1.9.1" # cert-manager
20+
jetstack_version = "1.10.1" # cert-manager
2121
grafana = "https://grafana.github.io/helm-charts"
22-
grafana_version = "6.38.0"
22+
grafana_version = "6.45.0"
2323
prometheus = "https://prometheus-community.github.io/helm-charts"
24-
prometheus_version = "15.12.0"
24+
prometheus_version = "18.4.0"
2525
metrics_server = "https://kubernetes-sigs.github.io/metrics-server"
2626
metrics_server_version = "3.8.2"
2727
}

variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ variable "extra_security_list_name_for_nodes" {
115115
default = null
116116
description = "Extra security list name previosly created to be used by the Nodes Subnet."
117117
}
118+
variable "extra_security_list_name_for_vcn_native_pod_networking" {
119+
default = null
120+
description = "Extra security list name previosly created to be used by the VCN Native Pod Networking Subnet."
121+
}
118122

119123
################################################################################
120124
# Variables: OKE Network

0 commit comments

Comments
 (0)