Skip to content

Commit

Permalink
Avoid overwriting label when initialising Deployment object twice
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Ryan authored and edaniszewski committed Oct 8, 2019
1 parent 43e144a commit 84d5a82
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion kubetest/objects/daemonset.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ def _add_kubetest_labels(self):
The kubetest label key is "kubetest/<obj kind>" where the obj kind is
the lower-cased kind of the obj.
"""
self.klabel_uid = str(uuid.uuid4())
self.klabel_key = 'kubetest/daemonset'
self.klabel_uid = self.obj.metadata.labels.get(self.klabel_key, None)
if not self.klabel_uid:
self.klabel_uid = str(uuid.uuid4())

# fixme: it would be nice to clean up this label setting logic a bit
# and possibly abstract it out to something more generalized, but
Expand Down
4 changes: 3 additions & 1 deletion kubetest/objects/deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ def _add_kubetest_labels(self):
The kubetest label key is "kubetest/<obj kind>" where the obj kind is
the lower-cased kind of the obj.
"""
self.klabel_uid = str(uuid.uuid4())
self.klabel_key = 'kubetest/deployment'
self.klabel_uid = self.obj.metadata.labels.get(self.klabel_key, None)
if not self.klabel_uid:
self.klabel_uid = str(uuid.uuid4())

# fixme: it would be nice to clean up this label setting logic a bit
# and possibly abstract it out to something more generalized, but
Expand Down
4 changes: 3 additions & 1 deletion kubetest/objects/statefulset.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ def _add_kubetest_labels(self):
The kubetest label key is "kubetest/<obj kind>" where the obj kind is
the lower-cased kind of the obj.
"""
self.klabel_uid = str(uuid.uuid4())
self.klabel_key = 'kubetest/statefulset'
self.klabel_uid = self.obj.metadata.labels.get(self.klabel_key, None)
if not self.klabel_uid:
self.klabel_uid = str(uuid.uuid4())

# fixme: it would be nice to clean up this label setting logic a bit
# and possibly abstract it out to something more generalized, but
Expand Down

0 comments on commit 84d5a82

Please sign in to comment.