Remove hard-coded nodeSelector label.

reviewable/pr2557/r12
Justin Scott 8 years ago
parent da5a523a60
commit 4a1bd1ba59

@ -144,7 +144,6 @@ func parseNodeSelectorsInto(labels string, m map[string]string) error {
func generateDeployment(opts *Options) (*v1beta1.Deployment, error) { func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
labels := generateLabels(map[string]string{"name": "tiller"}) labels := generateLabels(map[string]string{"name": "tiller"})
nodeSelectors := map[string]string{} nodeSelectors := map[string]string{}
nodeSelectors["beta.kubernetes.io/os"] = "linux"
if len(opts.NodeSelectors) > 0 { if len(opts.NodeSelectors) > 0 {
err := parseNodeSelectorsInto(opts.NodeSelectors, nodeSelectors) err := parseNodeSelectorsInto(opts.NodeSelectors, nodeSelectors)
if err != nil { if err != nil {

@ -430,18 +430,18 @@ func TestDeploymentManifest_WithNodeSelectors(t *testing.T) {
{ {
Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller"}, Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller"},
"nodeSelector 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"}, Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller,helm=rocks"},
"nodeSelector 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 // note: nodeSelector key and value are strings
{ {
Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller,minCoolness=1"}, Options{Namespace: v1.NamespaceDefault, NodeSelectors: "app=tiller,minCoolness=1"},
"nodeSelector app=tiller, helm=rocks", "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 { for _, tt := range tests {

Loading…
Cancel
Save