add new provider features

robo-cap · hyder · commit ddd772394e69 · 2026-01-20T22:12:19.000+11:00
diff --git a/module-cluster.tf b/module-cluster.tf
@@ -70,7 +70,11 @@ module "cluster" {
     ? try(module.network.pub_lb_subnet_id, "") # safe destroy; validated in submodule
     : try(module.network.int_lb_subnet_id, "")
   )
-
+  backend_nsg_ids                   = compact(flatten([
+    var.backend_nsg_ids,
+    try(module.network.worker_nsg_id, null),
+    var.cni_type == "npn" ? try(module.network.pod_nsg_id, null) : null
+  ]))
 
   # Cluster
   cluster_kms_key_id = var.cluster_kms_key_id
diff --git a/modules/bastion/versions.tf b/modules/bastion/versions.tf
@@ -17,7 +17,7 @@ terraform {
 
     oci = {
       source  = "oracle/oci"
-      version = ">= 7.6.0"
+      version = ">= 7.30.0"
     }
   }
 }
diff --git a/modules/cluster-addons/versions.tf b/modules/cluster-addons/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     oci = {
       source  = "oracle/oci"
-      version = ">= 7.6.0"
+      version = ">= 7.30.0"
     }
   }
 }
diff --git a/modules/cluster/cluster.tf b/modules/cluster/cluster.tf
@@ -89,8 +89,9 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
     }
 
     service_lb_config {
-      defined_tags  = var.service_lb_defined_tags
-      freeform_tags = var.service_lb_freeform_tags
+      backend_nsg_ids = var.backend_nsg_ids
+      defined_tags    = var.service_lb_defined_tags
+      freeform_tags   = var.service_lb_freeform_tags
     }
 
     service_lb_subnet_ids = compact([var.service_lb_subnet_id])
@@ -102,12 +103,7 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
   }
 
   lifecycle {
-    ignore_changes = [defined_tags, freeform_tags, cluster_pod_network_options, options[0].kubernetes_network_config]
-
-    precondition {
-      condition     = var.service_lb_subnet_id != null
-      error_message = "Missing service load balancer subnet."
-    }
+    ignore_changes = [defined_tags]
 
     precondition {
       condition     = !var.use_signed_images || length(var.image_signing_keys) > 0
diff --git a/modules/cluster/variables.tf b/modules/cluster/variables.tf
@@ -24,6 +24,7 @@ variable "tag_namespace" { type = string }
 variable "use_defined_tags" { type = string }
 variable "use_signed_images" { type = bool }
 variable "vcn_id" { type = string }
+variable "backend_nsg_ids" { type = set(string) }
 
 # Tagging
 variable "cluster_defined_tags" { type = map(string) }
diff --git a/modules/cluster/versions.tf b/modules/cluster/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     oci = {
       source  = "oracle/oci"
-      version = ">= 7.6.0"
+      version = ">= 7.30.0"
     }
   }
 }
diff --git a/modules/iam/versions.tf b/modules/iam/versions.tf
@@ -10,7 +10,7 @@ terraform {
     oci = {
       configuration_aliases = [oci.home]
       source                = "oracle/oci"
-      version               = ">= 7.6.0"
+      version               = ">= 7.30.0"
     }
   }
 }
diff --git a/modules/network/versions.tf b/modules/network/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     oci = {
       source  = "oracle/oci"
-      version = ">= 7.6.0"
+      version = ">= 7.30.0"
     }
   }
 }
diff --git a/modules/operator/versions.tf b/modules/operator/versions.tf
@@ -17,7 +17,7 @@ terraform {
 
     oci = {
       source  = "oracle/oci"
-      version = ">= 7.6.0"
+      version = ">= 7.30.0"
     }
   }
 }
diff --git a/modules/utilities/versions.tf b/modules/utilities/versions.tf
@@ -12,7 +12,7 @@ terraform {
 
     oci = {
       source  = "oracle/oci"
-      version = ">= 7.6.0"
+      version = ">= 7.30.0"
     }
   }
 }
diff --git a/modules/workers/locals.tf b/modules/workers/locals.tf
@@ -36,6 +36,7 @@ locals {
     disable_default_cloud_init     = var.disable_default_cloud_init
     drain                          = false
     eviction_grace_duration        = 300
+    force_node_action              = true
     force_node_delete              = true
     extended_metadata              = {} # empty pool-specific default
     ignore_initial_pool_size       = false
diff --git a/modules/workers/nodepools.tf b/modules/workers/nodepools.tf
@@ -91,6 +91,7 @@ resource "oci_containerengine_node_pool" "tfscaled_workers" {
       format("PT%dS", each.value.eviction_grace_duration)
     )
     is_force_delete_after_grace_duration = tobool(each.value.force_node_delete)
+    is_force_action_after_grace_duration = tobool(each.value.force_node_action)
   }
 
   dynamic "node_shape_config" {
diff --git a/modules/workers/versions.tf b/modules/workers/versions.tf
@@ -12,7 +12,7 @@ terraform {
 
     oci = {
       source  = "oracle/oci"
-      version = ">= 7.6.0"
+      version = ">= 7.30.0"
     }
   }
 }
diff --git a/variables-cluster.tf b/variables-cluster.tf
@@ -41,6 +41,12 @@ variable "control_plane_nsg_ids" {
   type        = set(string)
 }
 
+variable "backend_nsg_ids" {
+  default     = []
+  description = "An additional list of network security groups (NSG) ids for the LB backends. Used when the service rule management mode is set to NSG via annotations."
+  type        = set(string)
+}
+
 variable "cni_type" {
   default     = "flannel"
   description = "The CNI for the cluster: 'flannel' or 'npn'. See <a href=https://docs.oracle.com/en-us/iaas/Content/ContEng/Concepts/contengpodnetworking.htm>Pod Networking</a>."
diff --git a/versions.tf b/versions.tf
@@ -23,7 +23,7 @@ terraform {
     oci = {
       configuration_aliases = [oci.home]
       source                = "oracle/oci"
-      version               = ">= 7.6.0"
+      version               = ">= 7.30.0"
     }
 
     random = {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ terraform {`
`17`	`17`
`18`	`18`	`oci = {`
`19`	`19`	`source = "oracle/oci"`
`20`		`- version = ">= 7.6.0"`
	`20`	`+ version = ">= 7.30.0"`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ terraform {`
`7`	`7`	`required_providers {`
`8`	`8`	`oci = {`
`9`	`9`	`source = "oracle/oci"`
`10`		`- version = ">= 7.6.0"`
	`10`	`+ version = ">= 7.30.0"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ terraform {`
`10`	`10`	`oci = {`
`11`	`11`	`configuration_aliases = [oci.home]`
`12`	`12`	`source = "oracle/oci"`
`13`		`- version = ">= 7.6.0"`
	`13`	`+ version = ">= 7.30.0"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ terraform {`
`12`	`12`
`13`	`13`	`oci = {`
`14`	`14`	`source = "oracle/oci"`
`15`		`- version = ">= 7.6.0"`
	`15`	`+ version = ">= 7.30.0"`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`