fix: update the addon depends_on (#211)

Author: ocofaigh

examples/standard/main.tf

@@ -63,7 +63,7 @@ locals {
   worker_pools = [
     {
       subnet_prefix     = "default"
-      pool_name         = "default" # ibm_container_vpc_cluster automatically names standard pool "standard" (See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/2849)
+      pool_name         = "default" # ibm_container_vpc_cluster automatically names standard pool "default" (See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/2849)
       machine_type      = "bx2.4x16"
       workers_per_zone  = 2
       labels            = {}

main.tf

@@ -345,7 +345,10 @@ resource "null_resource" "confirm_network_healthy" {
 
   count = var.verify_worker_network_readiness ? 1 : 0
 
-  depends_on = [ibm_container_vpc_worker_pool.pool, ibm_container_vpc_worker_pool.autoscaling_pool]
+  # Worker pool creation can start before the 'ibm_container_vpc_cluster' completes since there is no explicit
+  # depends_on in 'ibm_container_vpc_worker_pool', just an implicit depends_on on the cluster ID. Cluster ID can exist before
+  # 'ibm_container_vpc_cluster' completes, so hence need to add explicit depends on against 'ibm_container_vpc_cluster' here.
+  depends_on = [ibm_container_vpc_cluster.cluster, ibm_container_vpc_worker_pool.pool, ibm_container_vpc_worker_pool.autoscaling_pool]
 
   provisioner "local-exec" {
     command     = "${path.module}/scripts/confirm_network_healthy.sh"
@@ -358,7 +361,11 @@ resource "null_resource" "confirm_network_healthy" {
 
 
 resource "ibm_container_addons" "addons" {
-  depends_on = [ibm_container_vpc_worker_pool.pool, ibm_container_vpc_worker_pool.autoscaling_pool, null_resource.confirm_network_healthy]
+
+  # Worker pool creation can start before the 'ibm_container_vpc_cluster' completes since there is no explicit
+  # depends_on in 'ibm_container_vpc_worker_pool', just an implicit depends_on on the cluster ID. Cluster ID can exist before
+  # 'ibm_container_vpc_cluster' completes, so hence need to add explicit depends on against 'ibm_container_vpc_cluster' here.
+  depends_on = [ibm_container_vpc_cluster.cluster, ibm_container_vpc_worker_pool.pool, ibm_container_vpc_worker_pool.autoscaling_pool, null_resource.confirm_network_healthy]
 
   cluster           = local.cluster_id
   resource_group_id = var.resource_group_id

module-metadata.json

@@ -13,7 +13,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 178
+        "line": 176
       },
       "min_length": 1,
       "max_length": 128,
@@ -29,7 +29,7 @@
       "description": "List of all addons supported by the ocp cluster.",
       "pos": {
         "filename": "variables.tf",
-        "line": 203
+        "line": 201
       }
     },
     "cluster_name": {
@@ -67,7 +67,7 @@
       "description": "Name of the COS instance to provision. New instance only provisioned if `use_existing_cos = false`. Default: `\u003ccluster_name\u003e_cos`",
       "pos": {
         "filename": "variables.tf",
-        "line": 150
+        "line": 148
       }
     },
     "disable_public_endpoint": {
@@ -82,7 +82,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 132
+        "line": 130
       }
     },
     "existing_cos_id": {
@@ -91,7 +91,7 @@
       "description": "The COS id of an already existing COS instance. Only required if 'use_existing_cos = true'",
       "pos": {
         "filename": "variables.tf",
-        "line": 162
+        "line": 160
       }
     },
     "force_delete_storage": {
@@ -105,7 +105,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 144
+        "line": 142
       }
     },
     "ibmcloud_api_key": {
@@ -144,7 +144,7 @@
       "description": "Use to attach a Key Protect instance to the cluster",
       "pos": {
         "filename": "variables.tf",
-        "line": 168
+        "line": 166
       }
     },
     "ocp_entitlement": {
@@ -158,7 +158,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 138
+        "line": 136
       }
     },
     "ocp_version": {
@@ -238,7 +238,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 156
+        "line": 154
       }
     },
     "verify_worker_network_readiness": {
@@ -252,7 +252,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 197
+        "line": 195
       }
     },
     "vpc_id": {
@@ -268,7 +268,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 192
+        "line": 190
       },
       "immutable": true
     },
@@ -444,7 +444,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 360
+        "line": 363
       }
     },
     "ibm_container_vpc_cluster.autoscaling_cluster": {
@@ -570,7 +570,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 397
+        "line": 404
       }
     },
     "null_resource.confirm_network_healthy": {
@@ -609,7 +609,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 379
+        "line": 386
       }
     }
   },

variables.tf

@@ -121,8 +121,6 @@ variable "cluster_ready_when" {
   type        = string
   description = "The cluster is ready when one of the following: MasterNodeReady (not recommended), OneWorkerNodeReady, Normal, IngressReady"
   default     = "IngressReady"
-  # Set to "Normal" once provider fixes https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4214
-  #   default     = "Normal"
 
   validation {
     condition     = contains(["MasterNodeReady", "OneWorkerNodeReady", "Normal", "IngressReady"], var.cluster_ready_when)