fix kms policy - cluster dependency

oracle-terraform-modules · Oct 23, 2024 · 560b741 · 560b741
1 parent b0b1738
commit 560b741
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 5 deletions.
diff --git a/module-cluster.tf b/module-cluster.tf
@@ -131,6 +131,9 @@ module "cluster" {
     },
     local.service_lb_freeform_tags,
   )
+  depends_on = [
+    module.iam_cluster_prerequisites,
+  ]
 }
 
 output "cluster_id" {

diff --git a/module-iam.tf b/module-iam.tf
@@ -44,10 +44,45 @@ locals {
   create_iam_kms_policy = anytrue([
     var.create_iam_kms_policy == "always",
     var.create_iam_kms_policy == "auto" && anytrue([
-      coalesce(var.worker_volume_kms_key_id, "none") != "none",
+      # coalesce(var.worker_volume_kms_key_id, "none") != "none", ## Validated in group-workers.tf in the IAM module.
       coalesce(var.cluster_kms_key_id, "none") != "none",
     ])
   ])
+  default_policy_name       = format("oke-cluster-%v", local.state_id)
+  prerequisites_policy_name = format("oke-cluster-prerequisites-%v", local.state_id)
+}
+
+# Default IAM sub-module implementation for OKE cluster
+module "iam_cluster_prerequisites" {
+  source                       = "./modules/iam"
+  compartment_id               = local.compartment_id
+  state_id                     = local.state_id
+  tenancy_id                   = local.tenancy_id
+  cluster_id                   = var.cluster_id
+  create_iam_resources         = var.create_iam_resources
+  create_iam_autoscaler_policy = false
+  create_iam_kms_policy        = local.create_iam_kms_policy
+  create_iam_operator_policy   = false
+  create_iam_worker_policy     = false
+  policy_name                  = local.prerequisites_policy_name
+
+  create_iam_tag_namespace = var.create_iam_tag_namespace
+  create_iam_defined_tags  = var.create_iam_defined_tags
+  defined_tags             = local.iam_defined_tags
+  freeform_tags            = local.iam_freeform_tags
+  tag_namespace            = var.tag_namespace
+  use_defined_tags         = var.use_defined_tags
+
+  cluster_kms_key_id         = var.cluster_kms_key_id
+  operator_volume_kms_key_id = var.operator_volume_kms_key_id
+  worker_volume_kms_key_id   = var.worker_volume_kms_key_id
+
+  autoscaler_compartments = local.autoscaler_compartments
+  worker_compartments     = local.worker_compartments
+
+  providers = {
+    oci.home = oci.home
+  }
 }
 
 # Default IAM sub-module implementation for OKE cluster
@@ -59,9 +94,10 @@ module "iam" {
   cluster_id                   = local.cluster_id
   create_iam_resources         = var.create_iam_resources
   create_iam_autoscaler_policy = local.create_iam_autoscaler_policy
-  create_iam_kms_policy        = local.create_iam_kms_policy
+  create_iam_kms_policy        = false
   create_iam_operator_policy   = local.create_iam_operator_policy
   create_iam_worker_policy     = local.create_iam_worker_policy
+  policy_name                  = local.default_policy_name
 
   create_iam_tag_namespace = var.create_iam_tag_namespace
   create_iam_defined_tags  = var.create_iam_defined_tags
@@ -89,10 +125,16 @@ output "availability_domains" {
 
 output "dynamic_group_ids" {
   description = "Cluster IAM dynamic group IDs"
-  value       = module.iam.dynamic_group_ids
+  value       = concat(
+    coalesce(module.iam_cluster_prerequisites.dynamic_group_ids, []),
+    coalesce(module.iam.dynamic_group_ids, [])
+  )
 }
 
 output "policy_statements" {
   description = "Cluster IAM policy statements"
-  value       = module.iam.policy_statements
+  value       = concat(
+    coalesce(module.iam_cluster_prerequisites.policy_statements, []),
+    coalesce(module.iam.policy_statements, [])
+  )
 }
diff --git a/modules/iam/policy.tf b/modules/iam/policy.tf
@@ -22,7 +22,7 @@ resource "oci_identity_policy" "cluster" {
   count          = local.has_policy_statements ? 1 : 0
   compartment_id = var.compartment_id
   description    = format("Policies for OKE Terraform state %v", var.state_id)
-  name           = local.cluster_group_name
+  name           = var.policy_name
   statements     = local.policy_statements
   defined_tags   = local.defined_tags
   freeform_tags  = local.freeform_tags

diff --git a/modules/iam/variables.tf b/modules/iam/variables.tf
@@ -23,6 +23,7 @@ variable "create_iam_autoscaler_policy" { type = bool }
 variable "create_iam_kms_policy" { type = bool }
 variable "create_iam_operator_policy" { type = bool }
 variable "create_iam_worker_policy" { type = bool }
+variable "policy_name" { type = string }
 
 # KMS
 variable "cluster_kms_key_id" { type = string }