feat(podselector): update parameter format to match other annotation

Author: zinuzoid

charts/builder/values.yaml

@@ -3,4 +3,4 @@ pull_policy: "Always"
 docker_tag: canary
 # limits_cpu: "100m"
 # limits_memory: "50Mi"
-# builder_pod_node_selector: "cloud.google.com/gke-nodepool=builder"
+# builder_pod_node_selector: "disk:ssd"

pkg/gitreceive/build.go

@@ -1,7 +1,6 @@
 package gitreceive
 
 import (
-	"bufio"
 	"bytes"
 	"encoding/json"
 	"fmt"
@@ -330,13 +329,12 @@ func build(
 func buildBuilderPodNodeSelector(config string) (map[string]string, error) {
 	selector := make(map[string]string)
 	if config != "" {
-		line := bufio.NewScanner(strings.NewReader(config))
-		for line.Scan() {
-			splits := strings.Split(line.Text(), "=")
-			if len(splits) != 2 {
+		for _, line := range strings.Split(config, ",") {
+			param := strings.Split(line, ":")
+			if len(param) != 2 {
 				return nil, fmt.Errorf("Invalid BuilderPodNodeSelector value format: %s", config)
 			}
-			selector[splits[0]] = splits[1]
+			selector[strings.TrimSpace(param[0])] = strings.TrimSpace(param[1])
 		}
 	}
 	return selector, nil

pkg/gitreceive/build_test.go

@@ -237,8 +237,9 @@ func TestBuildBuilderPodNodeSelector(t *testing.T) {
 
 	cazes := []podSelectorBuildCase{
 		{"", emptyNodeSelector},
-		{"pool=worker", map[string]string{"pool": "worker"}},
-		{"pool=worker\nnetwork=fast", map[string]string{"pool": "worker", "network": "fast"}},
+		{"pool:worker", map[string]string{"pool": "worker"}},
+		{"pool:worker,network:fast", map[string]string{"pool": "worker", "network": "fast"}},
+		{"pool:worker ,network:fast, disk:ssd", map[string]string{"pool": "worker", "network": "fast", "disk": "ssd"}},
 	}
 
 	for _, caze := range cazes {
@@ -247,6 +248,6 @@ func TestBuildBuilderPodNodeSelector(t *testing.T) {
 		assert.Equal(t, output, caze.Output, "pod selector")
 	}
 
-	_, err := buildBuilderPodNodeSelector("failtest")
-	assert.ExistsErr(t, err, "fail test")
+	_, err := buildBuilderPodNodeSelector("invalidformat")
+	assert.ExistsErr(t, err, "invalid format")
 }