Skip to content

Commit aa802e0

Browse files
authored
Add option to set npn specific parameter at nodepool level (#1052)
1 parent a6fffe0 commit aa802e0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

modules/workers/computecluster.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ resource "oci_core_instance" "compute_cluster_workers" {
139139
# Add labels required for NPN CNI.
140140
var.cni_type == "npn" ? {
141141
oke-native-pod-networking = true
142-
oke-max-pods = var.max_pods_per_node
143-
pod-subnets = coalesce(var.pod_subnet_id, var.worker_subnet_id, "none")
142+
oke-max-pods = each.value.max_pods_per_node
143+
pod-subnets = each.value.pod_subnet_id
144144
pod-nsgids = join(",", each.value.pod_nsg_ids)
145145
} : {},
146146

modules/workers/instance.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ resource "oci_core_instance" "workers" {
9090
var.cni_type == "npn" ? merge(
9191
{
9292
oke-native-pod-networking = true
93-
oke-max-pods = var.max_pods_per_node
94-
pod-subnets = coalesce(var.pod_subnet_id, var.worker_subnet_id, "none")
93+
oke-max-pods = each.value.max_pods_per_node
94+
pod-subnets = each.value.pod_subnet_id
9595
pod-nsgids = join(",", each.value.pod_nsg_ids)
9696
},
9797
var.enable_ipv6 ?

modules/workers/instanceconfig.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ resource "oci_core_instance_configuration" "workers" {
6868
var.cni_type == "npn" ? merge(
6969
{
7070
oke-native-pod-networking = true
71-
oke-max-pods = var.max_pods_per_node
72-
pod-subnets = coalesce(var.pod_subnet_id, var.worker_subnet_id, "none")
71+
oke-max-pods = each.value.max_pods_per_node
72+
pod-subnets = each.value.pod_subnet_id
7373
pod-nsgids = join(",", each.value.pod_nsg_ids)
7474
},
7575
var.enable_ipv6 ?

0 commit comments

Comments
 (0)