Merge "tiller: Remove unused params from delete_resources"
This commit is contained in:
commit
a64d435de8
|
@ -327,12 +327,7 @@ class Tiller(object):
|
||||||
labels = action.get('labels', None)
|
labels = action.get('labels', None)
|
||||||
|
|
||||||
self.delete_resources(
|
self.delete_resources(
|
||||||
release_name,
|
action_type, labels, namespace, timeout=timeout)
|
||||||
name,
|
|
||||||
action_type,
|
|
||||||
labels,
|
|
||||||
namespace,
|
|
||||||
timeout=timeout)
|
|
||||||
except Exception:
|
except Exception:
|
||||||
LOG.excpetion(
|
LOG.excpetion(
|
||||||
"Pre-action failure: could not delete %(res_type)s "
|
"Pre-action failure: could not delete %(res_type)s "
|
||||||
|
@ -620,21 +615,18 @@ class Tiller(object):
|
||||||
raise ex.ReleaseException(release, status, 'Delete')
|
raise ex.ReleaseException(release, status, 'Delete')
|
||||||
|
|
||||||
def delete_resources(self,
|
def delete_resources(self,
|
||||||
release_name,
|
|
||||||
resource_name,
|
|
||||||
resource_type,
|
resource_type,
|
||||||
resource_labels,
|
resource_labels,
|
||||||
namespace,
|
namespace,
|
||||||
wait=False,
|
wait=False,
|
||||||
timeout=const.DEFAULT_TILLER_TIMEOUT):
|
timeout=const.DEFAULT_TILLER_TIMEOUT):
|
||||||
'''
|
'''
|
||||||
:param release_name: release name the specified resource is under
|
Delete resources matching provided resource type, labels, and
|
||||||
:param resource_name: name of specific resource
|
namespace.
|
||||||
:param resource_type: type of resource e.g. job, pod, etc.
|
|
||||||
:param resource_labels: labels by which to identify the resource
|
|
||||||
:param namespace: namespace of the resource
|
|
||||||
|
|
||||||
Apply deletion logic based on type of resource
|
:param resource_type: type of resource e.g. job, pod, etc.
|
||||||
|
:param resource_labels: labels for selecting the resources
|
||||||
|
:param namespace: namespace of resources
|
||||||
'''
|
'''
|
||||||
timeout = self._check_timeout(wait, timeout)
|
timeout = self._check_timeout(wait, timeout)
|
||||||
|
|
||||||
|
@ -709,8 +701,8 @@ class Tiller(object):
|
||||||
handled = True
|
handled = True
|
||||||
|
|
||||||
if not handled:
|
if not handled:
|
||||||
LOG.error("Unable to execute name: %s type: %s ", resource_name,
|
LOG.error('No resources found with labels=%s type=%s namespace=%s',
|
||||||
resource_type)
|
resource_labels, resource_type, namespace)
|
||||||
|
|
||||||
def rolling_upgrade_pod_deployment(self,
|
def rolling_upgrade_pod_deployment(self,
|
||||||
name,
|
name,
|
||||||
|
@ -759,8 +751,6 @@ class Tiller(object):
|
||||||
|
|
||||||
# delete pods
|
# delete pods
|
||||||
self.delete_resources(
|
self.delete_resources(
|
||||||
release_name,
|
|
||||||
name,
|
|
||||||
'pod',
|
'pod',
|
||||||
resource_labels,
|
resource_labels,
|
||||||
namespace,
|
namespace,
|
||||||
|
|
Loading…
Reference in New Issue