init commit

Author: argeiger

solutions/deploy/cloud-pak-deployer/definitions/job-uninstall-cpd.yaml.tmplt

@@ -70,6 +70,8 @@ resource "kubernetes_secret" "cpd_entitlement_key_secret" {
 }
 
 resource "kubernetes_service_account_v1" "cloud_pak_deployer_service_account" {
+  depends_on = [kubernetes_namespace_v1.cloud_pak_deployer_namespace]
+
   metadata {
     name      = local.cloud_pak_deployer.service_account_name
     namespace = local.cloud_pak_deployer.namespace_name
@@ -112,7 +114,10 @@ resource "kubernetes_cluster_role_binding_v1" "cloud_pak_deployer_cluster_role_b
     namespace = local.cloud_pak_deployer.namespace_name
   }
 
-  depends_on = [kubernetes_namespace_v1.cloud_pak_deployer_namespace]
+  depends_on = [
+    kubernetes_namespace_v1.cloud_pak_deployer_namespace,
+    kubernetes_service_account_v1.cloud_pak_deployer_service_account
+  ]
 }
 
 resource "kubernetes_secret" "docker_cfg_secret" {
@@ -171,17 +176,14 @@ resource "kubernetes_persistent_volume_claim_v1" "cloud_pak_deployer_persistent_
 
 resource "kubernetes_job_v1" "cloud_pak_deployer_job" {
   depends_on = [
+    kubernetes_namespace_v1.cloud_pak_deployer_namespace,
+    kubernetes_secret.cpd_entitlement_key_secret,
+    kubernetes_service_account_v1.cloud_pak_deployer_service_account,
+    null_resource.cloud_pak_deployer_security_context_constraint,
+    kubernetes_cluster_role_binding_v1.cloud_pak_deployer_cluster_role_binding,
+    kubernetes_secret.docker_cfg_secret,
     kubernetes_config_map_v1.cloud_pak_deployer_configmap,
     kubernetes_persistent_volume_claim_v1.cloud_pak_deployer_persistent_volume_claim
-    # kubernetes_manifest.cloud_pak_deployer_cluster_role_binding,
-    # kubernetes_manifest.cloud_pak_deployer_configmap,
-    # kubernetes_namespace_v1.cloud_pak_deployer_namespace,
-    # kubernetes_manifest.cloud_pak_deployer_persistent_volume_claim,
-    ## kubernetes_manifest.cloud_pak_deployer_persistent_volume_claim,
-    #kubernetes_manifest.cloud_pak_deployer_service_account,
-    # kubernetes_manifest.cpd_entitlement_key_secret,
-    # null_resource.cloud_pak_deployer_security_context_constraint,
-    # kubernetes_secret.docker_cfg_secret
   ]
 
   metadata {
@@ -273,6 +275,8 @@ resource "kubernetes_job_v1" "cloud_pak_deployer_job" {
 }
 
 resource "terraform_data" "uninstall_cpd" {
+  depends_on = [kubernetes_job_v1.cloud_pak_deployer_job]
+
   triggers_replace = {
     job_name                   = yamldecode(local_file.deployer_definitions["job_uninstall_cpd"].content).metadata.name
     job_uninstall_cpd_filename = local_file.deployer_definitions["job_uninstall_cpd"].filename
@@ -295,13 +299,13 @@ resource "terraform_data" "uninstall_cpd" {
       ${self.input.oc} create -f ${self.input.job_uninstall_cpd_filename}
       if [ $? -ne 0 ]; then echo "Unable to create job ${self.input.job_name}; exiting..." && exit 1; fi
 
-      timeout_seconds=900 # 15 minutes
+      timeout_seconds=1800 # 30 minutes
       sleep_seconds=5
       number_of_tries=$((timeout_seconds / sleep_seconds))
       complete=false
       failed=false
 
-      for ((i = 1; i <= $number_of_tries; i++)); do
+      while [ $i -lt $number_of_tries ]; do
 
         echo "Waiting for job... ($${i}/$${number_of_tries})"
 
@@ -311,6 +315,8 @@ resource "terraform_data" "uninstall_cpd" {
         ${self.input.oc} wait --for=condition=failed job ${self.input.job_name} -n ${self.input.namespace_name} --timeout=0 2>/dev/null
         if [ $? -eq 0 ]; then failed=true && break; fi
 
+        i=`expr $i + 1`
+
         sleep $sleep_seconds
 
       done