Merge pull request #65 from UKHomeOffice/keto-labels-fix

Reference new keto hash with Labels and Taints fix.
nonlive · Jul 25, 2017 · 9f60577 · 9f60577
2 parents 5c416e8 + 9d3bee3
commit 9f60577
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -14,4 +14,4 @@ import:
 - package: k8s.io/kubernetes
   version: 1.7.0
 - package: github.com/UKHomeOffice/keto
-  version: bf6f3e7be4a84e3ecf3af89b28b134e5c26a09ea
+  version: 6ff4f181d8e9e9234658f907a706ab15ea8d7a93
diff --git a/pkg/kmm/kubelet.go b/pkg/kmm/kubelet.go
@@ -22,7 +22,7 @@ func (k *Kmm) CreateAndStartKubelet(master bool) error {
 	for k, v := range k.NodeLabels {
 		s = append(s, fmt.Sprintf("%s=%s", k, v))
 	}
-	nodeLables := strings.Join(s, ",")
+	nodeLabels := strings.Join(s, ",")
 	s = []string{}
 	for k, v := range k.NodeTaints {
 		s = append(s, fmt.Sprintf("%s=%s", k, v))
@@ -42,7 +42,7 @@ func (k *Kmm) CreateAndStartKubelet(master bool) error {
 		IsMaster:          master,
 		KubeVersion:       k.KubeadmCfg.KubeVersion,
 		KubeletExtraArgs:  k.KubeletExtraArgs,
-		NodeLabels:        nodeLables,
+		NodeLabels:        nodeLabels,
 		NodeTaints:        nodeTaints,
 	}
 	t := template.Must(template.New("kubeletUnit").Parse(kubeletTemplate))