Revert "Modify upgrade deletion to delete by labels"

This reverts commit 1663cc02c9.

armada/handlers/k8s.py

@@ -57,38 +57,21 @@ class K8s(object):
         '''
         LOG.debug(" %s in namespace: %s", name, namespace)
 
-    def get_namespace_pod(self, namespace="default",
-                          label_selector=''):
+    def get_namespace_pod(self, namespace="default"):
         '''
-        :params namespace - namespace of the Pod
-        :params label_selector - filters Pods by label
+        :params - namespace - pod namespace
 
         This will return a list of objects req namespace
         '''
 
-        return self.client \
-            .list_namespaced_pod(namespace, label_selector=label_selector)
+        return self.client.list_namespaced_pod(namespace)
 
     def get_all_pods(self, label_selector=''):
         '''
-        :params label_selector - filters Pods by label
+        :params - label_selector - filters pods by label
 
         Returns a list of pods from all namespaces
         '''
 
         return self.client \
             .list_pod_for_all_namespaces(label_selector=label_selector)
-
-    def delete_namespace_pod(self, name, namespace="default", body=None):
-        '''
-        :params name - name of the Pod
-        :params namespace - namespace of the Pod
-        :params body - V1DeleteOptions
-
-        Deletes pod by name and returns V1Status object
-        '''
-        if body is None:
-            body = client.V1DeleteOptions()
-
-        return self.client \
-            .delete_namespaced_pod(name, namespace, body)

armada/handlers/tiller.py

@@ -148,24 +148,20 @@ class Tiller(object):
                 continue
         return charts
 
-    def _pre_update_actions(self, release_name, actions, namespace):
+    def _pre_update_actions(self, actions, namespace):
         '''
         :params actions - array of items actions
         :params namespace - name of pod for actions
         '''
         try:
             for action in actions.get('delete', []):
-                name = action.get('name')
-                action_type = action.get('type')
-                labels = action.get('labels', None)
-
-                self.delete_resource(release_name, name, action_type,
-                                     labels, namespace)
-
-                # Ensure pods get deleted when job is deleted
-                if 'job' in action_type:
-                    self.delete_resource(release_name, name, 'pod',
-                                         labels, namespace)
+                name = action.get("name")
+                action_type = action.get("type")
+                if "job" in action_type:
+                    LOG.info("Deleting %s in namespace: %s", name, namespace)
+                    self.k8s.delete_job_action(name, namespace)
+                    continue
+                LOG.error("Unable to execute name: %s type: %s ", name, type)
         except Exception:
             LOG.debug("PRE: Could not delete anything, please check yaml")
 
@@ -180,37 +176,6 @@ class Tiller(object):
         except Exception:
             LOG.debug("PRE: Could not create anything, please check yaml")
 
-    def delete_resource(self, release_name, resource_name, resource_type,
-                        resource_labels, namespace):
-        '''
-        :params release_name - release name the specified resource is under
-        :params resource_name - name of specific resource
-        :params resource_type - type of resource e.g. job, pod, etc.
-        :params resource_labels - labels by which to identify the resource
-        :params namespace - namespace of the resource
-
-        Apply deletion logic based on type of resource
-        '''
-        label_selector = 'release_name={}'.format(release_name)
-        for label in resource_labels:
-            label_selector += ', {}={}'.format(label.keys()[0],
-                                               label.values()[0])
-
-        if 'job' in resource_type:
-            LOG.info("Deleting %s in namespace: %s", resource_name, namespace)
-            self.k8s.delete_job_action(resource_name, namespace)
-        elif 'pod' in resource_type:
-            release_pods = self.k8s.get_namespace_pod(namespace,
-                                                      label_selector)
-            for pod in release_pods.items:
-                pod_name = pod.metadata.name
-                LOG.info("Deleting %s in namespace: %s",
-                         pod_name, namespace)
-                self.k8s.delete_namespace_pod(pod_name, namespace)
-        else:
-            LOG.error("Unable to execute name: %s type: %s ",
-                      resource_name, resource_type)
-
     def _post_update_actions(self, actions, namespace):
         try:
             for action in actions.get('create', []):
@@ -238,8 +203,7 @@ class Tiller(object):
         else:
             values = Config(raw=values)
 
-        release_name = "{}-{}".format(prefix, name)
-        self._pre_update_actions(release_name, pre_actions, namespace)
+        self._pre_update_actions(pre_actions, namespace)
 
         # build release install request
         stub = ReleaseServiceStub(self.channel)
@@ -248,7 +212,7 @@ class Tiller(object):
             dry_run=dry_run,
             disable_hooks=disable_hooks,
             values=values,
-            name=release_name,
+            name="{}-{}".format(prefix, name),
             wait=wait,
             timeout=timeout)