Merge pull request #97 from utilitywarehouse/storage-node-labels

Storage node labels
utilitywarehouse · Sep 30, 2019 · 15be91e · 15be91e
2 parents 80a30a3 + d1b05ed
commit 15be91e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/resources/node-kubelet.service b/resources/node-kubelet.service
@@ -27,7 +27,7 @@ ExecStart=${kubelet_binary_path} \
   --exit-on-lock-contention \
   --kubeconfig=/var/lib/kubelet/kubeconfig \
   --network-plugin=cni \
-  --node-labels=role=${role} \
+  --node-labels=${labels} \
 %{ if taints != "" }  --register-with-taints=${taints} \
 %{ endif ~}
   --lock-file=/var/run/lock/kubelet.lock \

diff --git a/storage-node.tf b/storage-node.tf
@@ -9,8 +9,8 @@ data "template_file" "storage-node-kubelet" {
   vars = {
     kubelet_binary_path = "/opt/bin/kubelet"
     cloud_provider      = var.cloud_provider
-    role                = "storage-node"
-    taints              = "key=value:NoSchedule"
+    labels              = "role=storage-node,node.longhorn.io/create-default-disk=true"
+    taints              = "storage=longhorn:NoSchedule"
   }
 }
 

diff --git a/worker.tf b/worker.tf
@@ -9,7 +9,7 @@ data "template_file" "worker-kubelet" {
   vars = {
     kubelet_binary_path = "/opt/bin/kubelet"
     cloud_provider      = var.cloud_provider
-    role                = "worker"
+    labels              = "role=worker"
     taints              = ""
   }
 }