diff --git a/cmd/helm/installer/install.go b/cmd/helm/installer/install.go index 112dfb68f..d32f74849 100644 --- a/cmd/helm/installer/install.go +++ b/cmd/helm/installer/install.go @@ -144,7 +144,6 @@ func parseNodeSelectorsInto(labels string, m map[string]string) error { func generateDeployment(opts *Options) (*v1beta1.Deployment, error) { labels := generateLabels(map[string]string{"name": "tiller"}) nodeSelectors := map[string]string{} - nodeSelectors["beta.kubernetes.io/os"] = "linux" if len(opts.NodeSelectors) > 0 { err := parseNodeSelectorsInto(opts.NodeSelectors, nodeSelectors) if err != nil { diff --git a/cmd/helm/installer/install_test.go b/cmd/helm/installer/install_test.go index 330de04fe..bb32d3a02 100644 --- a/cmd/helm/installer/install_test.go +++ b/cmd/helm/installer/install_test.go @@ -430,18 +430,18 @@ func TestDeploymentManifest_WithNodeSelectors(t *testing.T) { { Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller"}, "nodeSelector app=tiller", - map[string]interface{}{"app": "tiller", "beta.kubernetes.io/os": "linux"}, + map[string]interface{}{"app": "tiller"}, }, { Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller,helm=rocks"}, "nodeSelector app=tiller, helm=rocks", - map[string]interface{}{"app": "tiller", "helm": "rocks", "beta.kubernetes.io/os": "linux"}, + map[string]interface{}{"app": "tiller", "helm": "rocks"}, }, // note: nodeSelector key and value are strings { Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller,minCoolness=1"}, "nodeSelector app=tiller, helm=rocks", - map[string]interface{}{"app": "tiller", "minCoolness": "1", "beta.kubernetes.io/os": "linux"}, + map[string]interface{}{"app": "tiller", "minCoolness": "1"}, }, } for _, tt := range tests {