Node selector fix (#135)

* fixed nodeSelector

* fixed nodeSelector

* fixed nodeSelector

* fixed nodeSelector

* node-selector-fix version bump

Author: kosta709

README.md

@@ -123,7 +123,7 @@ rules:
 ```
 codefresh install runtime [options] \
                     --set-value=Storage.LocalVolumeParentDir=/mnt/disks/ssd0/codefresh-volumes 
-                    --kube-selector=cloud.google.com/gke-local-ssd=true
+                    --kube-node-selector=cloud.google.com/gke-local-ssd=true
 ```
 
 ##### **GCE Disks** 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "venona",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "description": "Codefresh agent to run on Codefresh's runtime environment and execute pipeline",
   "main": "index.js",
   "scripts": {

venonactl/VERSION

@@ -1 +1 @@
-1.2.15
+1.2.16

venonactl/cmd/cmdutils.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -171,19 +170,6 @@ func createSpinner(prefix, suffix string) *spinner.Spinner {
 	return s
 }
 
-type nodeSelector map[string]string
-
-func parseNodeSelector(s string) (nodeSelector, error) {
-	if s == "" {
-		return nodeSelector{}, nil
-	}
-	v := strings.Split(s, "=")
-	if len(v) != 2 {
-		return nil, errors.New("node selector must be in form \"key=value\"")
-	}
-	return nodeSelector{v[0]: v[1]}, nil
-}
-
 func loadTolerationsFromFile(filename string) string {
 	data, err := ioutil.ReadFile(filename)
 	if err != nil {
@@ -237,15 +223,6 @@ func extendStoreWithAgentAPI(logger logger.Logger, token string, agentID string)
 	}
 }
 
-// String returns a k8s compliant string representation of the nodeSelector. Only a single value is supported.
-func (ns nodeSelector) String() string {
-	var s string
-	for k, v := range ns {
-		s = fmt.Sprintf("%s: %s", k, v)
-	}
-	return s
-}
-
 // Parsing helpers --set-value , --set-file
 // by https://github.com/helm/helm/blob/ec1d1a3d3eb672232f896f9d3b3d0797e4f519e3/pkg/cli/values/options.go#L41
 

venonactl/cmd/install-agent.go

@@ -94,13 +94,10 @@ var installAgentCmd = &cobra.Command{
 			version := installAgentCmdOptions.venona.version
 			lgr.Info("Version set manually", "version", version)
 			s.Image.Tag = version
+			s.Version.Current.Version = version
 		}
 
-		kns, err := parseNodeSelector(installAgentCmdOptions.kube.nodeSelector)
-		if err != nil {
-			dieOnError(err)
-		}
-		s.KubernetesAPI.NodeSelector = kns.String()
+		s.KubernetesAPI.NodeSelector = installAgentCmdOptions.kube.nodeSelector
 
 		builderInstallOpt.ClusterName = s.KubernetesAPI.ContextName
 		builderInstallOpt.KubeBuilder = getKubeClientBuilder(builderInstallOpt.ClusterName, s.KubernetesAPI.Namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster)
@@ -109,6 +106,7 @@ var installAgentCmd = &cobra.Command{
 		builder.Add(plugins.VenonaPluginType)
 
 		values := s.BuildValues()
+		var err error
 		for _, p := range builder.Get() {
 			values, err = p.Install(builderInstallOpt, values)
 			if err != nil {

venonactl/cmd/install-runtime.go

@@ -82,11 +82,7 @@ var installRuntimeCmd = &cobra.Command{
 			s.KubernetesAPI.Tolerations = tolerations
 		}
 
-		kns, err := parseNodeSelector(installRuntimeCmdOptions.kube.nodeSelector)
-		if err != nil {
-			dieOnError(err)
-		}
-		s.KubernetesAPI.NodeSelector = kns.String()
+		s.KubernetesAPI.NodeSelector = installRuntimeCmdOptions.kube.nodeSelector
 
 		builder := plugins.NewBuilder(lgr)
 		isDefault := isUsingDefaultStorageClass(installRuntimeCmdOptions.storageClass)
@@ -131,6 +127,7 @@ var installRuntimeCmd = &cobra.Command{
 		builderInstallOpt.KubeBuilder = getKubeClientBuilder(s.KubernetesAPI.ContextName, s.KubernetesAPI.Namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster)
 		values := s.BuildValues()
 
+		var err error
 		if len(installRuntimeCmdOptions.templateValues) > 0 {
 			setValues, err := parseSetValues(installRuntimeCmdOptions.templateValues)
 			if err != nil {

venonactl/pkg/templates/kubernetes/deployment.venona.yaml

@@ -30,7 +30,7 @@ spec:
             secretName: venonaconf
       {{ if ne .NodeSelector "" }}
       nodeSelector:
-        {{ .NodeSelector }}
+{{ .NodeSelector | nodeSelectorParamToYaml | indent 8 | unescape }}
       {{ end }}
       {{ if ne .Tolerations "" }}
       tolerations: