Skip to content

Commit

Permalink
Merge branch 'w/2.4/bugfix/GH-2592-fix-list-custom-object-salt' into …
Browse files Browse the repository at this point in the history
…tmp/octopus/w/2.5/bugfix/GH-2592-fix-list-custom-object-salt
  • Loading branch information
bert-e committed Jun 3, 2020
2 parents c21747d + 4aff5ed commit 537792a
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions salt/_utils/kubernetes_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,6 @@ def method(*args, **kwargs):

result = base_method(*args, **kwargs)

if verb == 'list':
return CustomObject({
'kind': '{}List'.format(self.kind),
'apiVersion': '{s.group}/{s.version}'.format(s=self),
'items': [CustomObject(obj) for obj in result],
})

# TODO: do we have a result for `delete` methods?
return CustomObject(result)

Expand Down

0 comments on commit 537792a

Please sign in to comment.