read tolerations from values file (#207)

* read tolerations from values file

Author: oren-codefresh

venona/VERSION

@@ -1 +1 @@
-1.5.8
+1.5.9

venonactl/VERSION

@@ -1 +1 @@
-1.5.8
+1.5.9

venonactl/cmd/cmdutils.go

@@ -20,7 +20,6 @@ import (
 	"github.com/codefresh-io/venona/venonactl/pkg/plugins"
 	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/olekukonko/tablewriter"
-	"gopkg.in/yaml.v2"
 	k8sApi "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/clientcmd"
 
@@ -202,21 +201,16 @@ func loadTolerationsFromFile(filename string) string {
 	return string(data)
 }
 
-func parseTolerations(s string) (string, error) {
+func parseTolerations(s string) ([]k8sApi.Toleration, error) {
 	if s == "" {
-		return "", nil
+		return nil, nil
 	}
 	var data []k8sApi.Toleration
 	err := json.Unmarshal([]byte(s), &data)
 	if err != nil {
-		return "", fmt.Errorf("can not parse tolerations: %s", err)
+		return nil, fmt.Errorf("can not parse tolerations: %s", err)
 	}
-	y, err := yaml.Marshal(&data)
-	if err != nil {
-		return "", fmt.Errorf("can not marshel tolerations to yaml: %s", err)
-	}
-	d := fmt.Sprintf("\n%s", string(y))
-	return d, nil
+	return data, err
 }
 
 func fillKubernetesAPI(lgr logger.Logger, context string, namespace string, inCluster bool) {
@@ -323,4 +317,4 @@ func mergeValueMSI(valuesMap map[string]interface{}, key string, param *map[stri
 	}
 	val := mapX.Get(key).MSI(defaultValue...)
 	*param = val
-}
+}

venonactl/cmd/install-agent.go

@@ -25,6 +25,7 @@ import (
 	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	k8sApi "k8s.io/api/core/v1"
 	// cliValues "helm.sh/helm/v3/pkg/cli/values"
 	// "helm.sh/helm/v3/pkg/getter"
 )
@@ -72,7 +73,9 @@ var installAgentCmd = &cobra.Command{
 		mergeValueStr(templateValuesMap, "Context", &installAgentCmdOptions.kube.context)
 		mergeValueStr(templateValuesMap, "NodeSelector", &installAgentCmdOptions.kube.nodeSelector)
 		tolerations := getTolerations()
-		mergeValueStr(templateValuesMap, "Tolerations", &tolerations)
+		if tolerations != nil {
+			templateValuesMap["Tolerations"] = tolerations
+		}
 		mergeValueStr(templateValuesMap, "DockerRegistry", &installAgentCmdOptions.dockerRegistry)
 
 		mergeValueStr(templateValuesMap, "AgentToken", &installAgentCmdOptions.agentToken)
@@ -152,7 +155,7 @@ var installAgentCmd = &cobra.Command{
 	},
 }
 
-func getTolerations() string {
+func getTolerations() []k8sApi.Toleration {
 
 	if installAgentCmdOptions.tolerations != "" {
 		var tolerationsString string
@@ -170,7 +173,7 @@ func getTolerations() string {
 		return tolerations
 
 	}
-	return ""
+	return nil
 }
 
 func init() {

venonactl/cmd/install-runtime.go

@@ -69,7 +69,10 @@ var installRuntimeCmd = &cobra.Command{
 		mergeValueStr(templateValuesMap, "Context", &installRuntimeCmdOptions.kube.context)
 		mergeValueStr(templateValuesMap, "RuntimeEnvironmentName", &installRuntimeCmdOptions.runtimeEnvironmentName)
 		mergeValueStr(templateValuesMap, "NodeSelector", &installRuntimeCmdOptions.kube.nodeSelector)
-		mergeValueStr(templateValuesMap, "Tolerations", &installRuntimeCmdOptions.tolerations)
+		tolerations := getTolerations()
+		if tolerations != nil {
+			templateValuesMap["Tolerations"] = tolerations
+		}
 		//mergeValueStrArray(&installAgentCmdOptions.envVars, "envVars", nil, "More env vars to be declared \"key=value\"")
 		mergeValueStr(templateValuesMap, "DockerRegistry", &installRuntimeCmdOptions.dockerRegistry)
 		mergeValueStr(templateValuesMap, "StorageClass", &installRuntimeCmdOptions.storageClass)
@@ -107,22 +110,7 @@ var installRuntimeCmd = &cobra.Command{
 			Host: cfAPIHost,
 		}
 
-		if installRuntimeCmdOptions.tolerations != "" {
-			var tolerationsString string
-
-			if installRuntimeCmdOptions.tolerations[0] == '@' {
-				tolerationsString = loadTolerationsFromFile(installRuntimeCmdOptions.tolerations[1:])
-			} else {
-				tolerationsString = installRuntimeCmdOptions.tolerations
-			}
-
-			tolerations, err := parseTolerations(tolerationsString)
-			if err != nil {
-				dieOnError(err)
-			}
-
-			s.KubernetesAPI.Tolerations = tolerations
-		}
+		s.KubernetesAPI.Tolerations = tolerations
 
 		s.KubernetesAPI.NodeSelector = installRuntimeCmdOptions.kube.nodeSelector
 		s.DockerRegistry = installRuntimeCmdOptions.dockerRegistry

venonactl/example/values-example.yaml

@@ -259,6 +259,16 @@
 #     requests:
 #       cpu: 200m
 #       memory: 500Mi
+#   userVolumeMounts: # will be set for dind pod and will be injcted for each container - https://codefresh.io/docs/docs/administration/codefresh-runner/#custom-volume-mounts
+#     my-test:
+#       name: test
+#       mountPath: /etc/ssl/cert
+#       readOnly: true
+#   userVolumes: # will be set for dind pod and will be injcted for each container - https://codefresh.io/docs/docs/administration/codefresh-runner/#custom-volume-mounts
+#     test:
+#       name: test
+#       secret: 
+#         secretName: test-secret
 
 
 ########################################################

venonactl/pkg/plugins/helper.go

@@ -89,17 +89,15 @@ func nodeSelectorParamToYaml(ns string) string {
 }
 
 func toYAML(v interface{}) string {
-	data, err := yaml.Marshal(v)
-	if err != nil {
-		// Swallow errors inside of a template.
-		return ""
-	}
-	return strings.TrimSuffix(string(data), "\n")
-}
-
-func toYAMLMSI(v map[string]interface{}) string {
-	if len(v) == 0 {
-		return ""
+	switch v.(type) {
+	case map[string]interface{}:
+		if len(v.(map[string]interface{})) == 0 {
+			return ""
+		}
+	case []v1.Toleration:
+		if len(v.([]v1.Toleration)) == 0 {
+			return ""
+		}
 	}
 	data, err := yaml.Marshal(v)
 	if err != nil {
@@ -140,7 +138,6 @@ func ExecuteTemplate(tplStr string, data interface{}) (string, error) {
 		"unescape":                unescape,
 		"nodeSelectorParamToYaml": nodeSelectorParamToYaml,
 		"toYaml":                  toYAML,
-		"toYamlMsi":               toYAMLMSI,
 		"isString":                isString,
 	}
 	template, err := template.New("base").Funcs(sprig.FuncMap()).Funcs(funcMap).Parse(tplStr)

venonactl/pkg/store/store.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/codefresh-io/go-sdk/pkg/codefresh"
 	"github.com/codefresh-io/venona/venonactl/pkg/certs"
+	k8sApi "k8s.io/api/core/v1"
 )
 
 const (
@@ -75,7 +76,7 @@ type (
 		ContextName  string
 		InCluster    bool
 		NodeSelector string
-		Tolerations  string
+		Tolerations  []k8sApi.Toleration
 	}
 
 	CodefreshAPI struct {
@@ -175,7 +176,6 @@ func (s *Values) BuildValues() map[string]interface{} {
 			"VolumeProvisioner": map[string]interface{}{
 				"Image":          "codefresh/dind-volume-provisioner:v24",
 				"NodeSelector":   s.KubernetesAPI.NodeSelector,
-				"Tolerations":    s.KubernetesAPI.Tolerations,
 				"Resources":      s.VolumeProvisioner.Resources,
 				"MountAzureJson": false,
 			},

venonactl/pkg/templates/kubernetes/daemonset.dind-lv-monitor.vp.yaml

@@ -28,14 +28,15 @@ spec:
         - key: 'codefresh/dind'
           operator: 'Exists'
           effect: 'NoSchedule'
-      {{ if ne .Tolerations "" }}
-        {{ .Tolerations | indent 8 }}
-      {{ end }}
+
+{{ toYaml .Tolerations | indent 8}}
+
+
       containers:
         - image: {{ if ne .DockerRegistry ""}} {{- .DockerRegistry }}/codefresh/dind-volume-utils:v5 {{- else }}codefresh/dind-volume-utils:v5{{- end}}
           name: lv-cleaner
           resources:
-{{ toYamlMsi .Storage.LocalVolumeMonitor | indent 10 }}
+{{ toYaml .Storage.LocalVolumeMonitor | indent 10 }}
           imagePullPolicy: Always
           command:
           - /bin/local-volumes-agent

venonactl/pkg/templates/kubernetes/deployment.app-proxy.yaml

@@ -32,7 +32,7 @@ spec:
         image: {{ if ne .DockerRegistry ""}} {{- .DockerRegistry }}/{{ .AppProxy.Image.Name }}:{{ .AppProxy.Image.Tag }} {{- else }} {{- .AppProxy.Image.Name }}:{{ .AppProxy.Image.Tag }} {{- end}}
         imagePullPolicy: Always
         resources:
-{{ toYamlMsi .AppProxy.resources | indent 10 }}
+{{ toYaml .AppProxy.resources | indent 10 }}
         env:
           {{- if $.EnvVars }}
           {{- range $key, $value := $.EnvVars }}