Merge pull request #35 from dataiku/bug/dss13-sc-173304-gke-ability-to-add-label-and-taint-on-node

Fix taint support in macro and labels check

Author: vrutz

python-lib/dku_google/clusters.py

@@ -126,10 +126,7 @@ def with_nodepool_taints(self, nodepool_taints=[]):
             self.nodepool_taints.extend(nodepool_taints)
         return self
 
-    def with_nodepool_gcp_labels(self, nodepool_gcp_labels={}, cluster_formatted_labels=[]):
-        if any(not label.get("from", "") for label in nodepool_gcp_labels):
-            raise ValueError("Some of the cluster key-value label pairs have no key and thus are invalid: %s" % nodepool_gcp_labels)
-
+    def with_nodepool_gcp_labels(self, nodepool_gcp_labels={}, cluster_formatted_labels={}):
         if cluster_formatted_labels:
             logging.info("Adding cluster labels {} to node pool {}".format(cluster_formatted_labels, self.name))
             self.nodepool_gcp_labels.update(cluster_formatted_labels)

python-runnables/add-node-pool/runnable.py

@@ -50,7 +50,7 @@ def run(self, progress_callback):
         node_pool_builder.with_service_account(node_pool_config.get('serviceAccountType', None),
                                                node_pool_config.get('serviceAccount', None))
         node_pool_builder.with_nodepool_labels(node_pool_config.get('nodepoolLabels', {}))
-        node_pool_builder.with_nodepool_taints(node_pool.get('nodepoolTaints', []))
+        node_pool_builder.with_nodepool_taints(node_pool_config.get('nodepoolTaints', []))
         node_pool_builder.with_nodepool_gcp_labels(node_pool_config.get('nodepoolGCPLabels', {}), cluster_data.get("cluster", {}).get("resourceLabels", {}))
         node_pool_builder.with_nodepool_tags(node_pool_config.get('networkTags', []))