Blueprint delete on Namespace object: helm apps (#676)

kanisterio · May 19, 2020 · 730d5e8 · 730d5e8
1 parent 8a32f11
commit 730d5e8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/examples/helm/kanister/kanister-elasticsearch/kanister/elasticsearch-blueprint.yaml b/examples/helm/kanister/kanister-elasticsearch/kanister/elasticsearch-blueprint.yaml
@@ -47,15 +47,15 @@ actions:
           host_name="{{ .Object.metadata.labels.release }}-kanister-elasticsearch-client.{{ .StatefulSet.Namespace }}.svc.cluster.local"
           kando location pull --profile '{{ toJson .Profile }}' --path '{{ .ArtifactsIn.cloudObject.KeyValue.backupLocation }}' - | gunzip | elasticdump --bulk=true --input=$ --output=http://${host_name}:9200
   delete:
-    type: StatefulSet
+    type: Namespace
     inputArtifactNames:
     - cloudObject
     phases:
     - func: KubeTask
       name: deleteFromObjectStore
       args:
-        namespace: "{{ .StatefulSet.Namespace }}"
-        image: "kanisterio/es-sidecar:0.29.0"
+        namespace: "{{ .Namespace.Name }}"
+        image: kanisterio/kanister-tools:0.29.0
         command:
         - bash
         - -o

diff --git a/examples/helm/kanister/kanister-mongodb-replicaset/kanister/mongodb-blueprint.yaml b/examples/helm/kanister/kanister-mongodb-replicaset/kanister/mongodb-blueprint.yaml
@@ -58,16 +58,15 @@ actions:
             fi
             kando location pull --profile '{{ toJson .Profile }}' --path '{{ .ArtifactsIn.cloudObject.KeyValue.path }}' - | ${restore_cmd[@]}
   delete:
-    type: StatefulSet
+    type: Namespace
     inputArtifactNames:
       - cloudObject
     phases:
-    - func: KubeExec
+    - func: KubeTask
       name: deleteFromBlobStore
       args:
-        namespace: "{{ .StatefulSet.Namespace }}"
-        pod: "{{ index .StatefulSet.Pods 0 }}"
-        container: kanister-sidecar
+        namespace: "{{ .Namespace.Name }}"
+        image: kanisterio/kanister-tools:0.29.0
         command:
           - bash
           - -o

diff --git a/examples/helm/kanister/kanister-mysql/kanister/mysql-blueprint.yaml b/examples/helm/kanister/kanister-mysql/kanister/mysql-blueprint.yaml
@@ -44,16 +44,15 @@ actions:
             s3_path="{{ .ArtifactsIn.mysqlCloudDump.KeyValue.path }}"
             kando location pull --profile '{{ toJson .Profile }}' --path ${s3_path} - | gunzip | mysql -h 127.0.0.1 -u root --password="${MYSQL_ROOT_PASSWORD}"
   delete:
-    type: Deployment
+    type: Namespace
     inputArtifactNames:
       - mysqlCloudDump
     phases:
-    - func: KubeExec
+    - func: KubeTask
       name: deleteFromBlobStore
       args:
-        namespace: "{{ .Deployment.Namespace }}"
-        pod: "{{ index .Deployment.Pods 0 }}"
-        container: kanister-sidecar
+        namespace: "{{ .Namespace.Name }}"
+        image: kanisterio/kanister-tools:0.29.0
         command:
           - bash
           - -o

diff --git a/examples/helm/kanister/kanister-postgresql/kanister/postgres-blueprint.yaml b/examples/helm/kanister/kanister-postgresql/kanister/postgres-blueprint.yaml
@@ -251,14 +251,14 @@ actions:
         kind: deployment
         replicas: 1
   delete:
-    type: Deployment
+    type: Namespace
     inputArtifactNames:
       - manifest
     phases:
     - func: KubeTask
       name: deleteArtifact
       args:
-        namespace: "{{ .Deployment.Namespace }}"
+        namespace: "{{ .Namespace.Name }}"
         image: "kanisterio/postgres:v0.3.0"
         command:
           - bash