From 55284ef988b71c3cf2d214cce329f90e7f1b9de6 Mon Sep 17 00:00:00 2001
From: whitfiea <whitfiea@uk.ibm.com>
Date: Fri, 27 Sep 2024 09:12:19 +0100
Subject: [PATCH] move deprov efs to fix pull issue

---
 .../gitops/deprovision-mas-deps.yml.j2        | 78 +++++++++----------
 1 file changed, 36 insertions(+), 42 deletions(-)

diff --git a/tekton/src/pipelines/gitops/deprovision-mas-deps.yml.j2 b/tekton/src/pipelines/gitops/deprovision-mas-deps.yml.j2
index b58a533d5..1df93d80e 100644
--- a/tekton/src/pipelines/gitops/deprovision-mas-deps.yml.j2
+++ b/tekton/src/pipelines/gitops/deprovision-mas-deps.yml.j2
@@ -109,11 +109,40 @@ spec:
         - name: ignore_failure
           value: $(params.ignore_failure)  # fails and exit once the first failure is detected
 {% endif %}
-    - name: gitops-deprovision-mongo
+
+    # Deprovision EFS
+    # -------------------------------------------------------------------------
+    - name: gitops-deprovision-efs
 {% if wait_for_deprovision == true %}
       runAfter:
         - wait-for-deprovision
 {% endif %}
+      params:
+        {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/secrets-params.yml.j2') | indent(8) }}
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: cloud_provider
+          value: $(params.cloud_provider)
+        - name: avp_aws_secret_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+        - name: efs_action
+          value: $(params.efs_action)
+      workspaces:
+        - name: configs
+          workspace: configs
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-efs
+
+    # Deprovision Mongo
+    # -------------------------------------------------------------------------
+    - name: gitops-deprovision-mongo
+      runAfter:
+        - gitops-deprovision-efs
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -139,11 +168,12 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+
+    # Deprovision Kafka
+    # -------------------------------------------------------------------------
     - name: gitops-deprovision-kafka
-{% if wait_for_deprovision == true %}
       runAfter:
-        - wait-for-deprovision
-{% endif %}
+        - gitops-deprovision-efs
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -172,13 +202,11 @@ spec:
         - name: configs
           workspace: configs
 
-    # 11. Deprovision COS
+    # Deprovision COS
     # -------------------------------------------------------------------------
     - name: gitops-deprovision-cos
-{% if wait_for_deprovision == true %}
       runAfter:
-        - wait-for-deprovision
-{% endif %}
+        - gitops-deprovision-efs
       params:
         {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/secrets-params.yml.j2') | indent(8) }}
 
@@ -186,20 +214,16 @@ spec:
 
         - name: github_pat
           value: $(params.github_pat)
-
         - name: cluster_name
           value: $(params.cluster_name)
         - name: account
           value: $(params.account)
-
         - name: avp_aws_secret_key
           value: $(params.avp_aws_secret_key)
         - name: avp_aws_access_key
           value: $(params.avp_aws_access_key)
-
         - name: mas_instance_id
           value: $(params.mas_instance_id)
-
         - name: cos_action
           value: $(params.cos_action)
         - name: cos_type
@@ -210,39 +234,9 @@ spec:
           value: $(params.ibmcloud_apikey)
         - name: cos_use_hmac
           value: $(params.cos_use_hmac)
-
       workspaces:
         - name: configs
           workspace: configs
       taskRef:
         kind: Task
         name: gitops-deprovision-cos
-
-    # Uninstall AWS Elastic File Service (EFS)
-    - name: gitops-deprovision-efs
-{% if wait_for_deprovision == true %}
-      runAfter:
-        - wait-for-deprovision
-{% endif %}
-      params:
-        {{ lookup('template', pipeline_src_dir ~ '/taskdefs/gitops/common/secrets-params.yml.j2') | indent(8) }}
-        - name: cluster_name
-          value: $(params.cluster_name)
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: cloud_provider
-          value: $(params.cloud_provider)
-        - name: avp_aws_secret_key
-          value: $(params.avp_aws_secret_key)
-        - name: avp_aws_access_key
-          value: $(params.avp_aws_access_key)
-        - name: efs_action
-          value: $(params.efs_action)
-
-      workspaces:
-        - name: configs
-          workspace: configs
-
-      taskRef:
-        kind: Task
-        name: gitops-deprovision-efs