Merge pull request #121 from sebastienc/work

Some fixes.
mnubo · Jun 5, 2018 · 23135f8 · 23135f8
2 parents 822c356 + 076cc19
commit 23135f8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/kubernetes/K8sCronJob.py b/kubernetes/K8sCronJob.py
@@ -89,6 +89,14 @@ def add_image_pull_secrets(self, secrets=None):
         self.model.spec.job_template.spec.template.spec.add_image_pull_secrets(secrets)
         return self
 
+    def add_pod_label(self, k=None, v=None):
+        labels = self.model.spec.job_template.spec.template.metadata.labels
+        if labels is None:
+            labels = {}
+        labels.update({k: v})
+        self.model.spec.job_template.spec.template.metadata.labels = labels
+        return self
+
     def add_volume(self, volume=None):
         if not isinstance(volume, K8sVolume):
             raise SyntaxError(
@@ -100,6 +108,15 @@ def add_volume(self, volume=None):
         self.model.spec.job_template.spec.template.spec.volumes = volumes
         return self
 
+    # -------------------------------------------------------------------------------------  del
+
+    def del_pod_label(self, k=None):
+        labels = self.model.spec.job_template.spec.template.metadata.labels
+        if k in labels:
+            labels.pop(k)
+            self.model.spec.job_template.spec.template.metadata.labels = labels
+        return self
+
     # -------------------------------------------------------------------------------------  schedule
 
     @property
@@ -277,6 +294,17 @@ def pod(self, p=None):
         raise NotImplementedError(
             'K8sCronjob: pod is read-only.')
 
+    # -------------------------------------------------------------------------------------  pod labels
+
+    @property
+    def pod_labels(self):
+        return self.model.spec.job_template.spec.template.metadata.labels
+
+    @pod_labels.setter
+    def pod_labels(self, labels=None):
+        self.model.spec.job_template.spec.template.metadata.labels = labels
+
+
     # -------------------------------------------------------------------------------------  image pull secrets
 
     @property

diff --git a/kubernetes/K8sReplicationController.py b/kubernetes/K8sReplicationController.py
@@ -132,7 +132,7 @@ def del_pod_label(self, k=None):
         labels = self.model.spec.template.metadata.labels
         if k in labels:
             labels.pop(k)
-            self.model.spec.template.metadata.annotations = labels
+            self.model.spec.template.metadata.labels = labels
         return self
 
     def del_pod_node_name(self):

diff --git a/version.meta b/version.meta
@@ -1 +1 @@
-1.5.6.31
+1.5.6.32