change venona's image name on upgrade (#168)

* change venona's image name on upgrade

* support upgrade and migration of env vars

* add quote

Author: oren-codefresh

venona/VERSION

@@ -1 +1 @@
-1.4.10
+1.4.11

venonactl/VERSION

@@ -1 +1 @@
-1.4.10
+1.4.11

venonactl/cmd/install-agent.go

@@ -18,6 +18,7 @@ limitations under the License.
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/codefresh-io/venona/venonactl/pkg/logger"
 	"github.com/codefresh-io/venona/venonactl/pkg/plugins"
@@ -41,6 +42,7 @@ var installAgentCmdOptions struct {
 	agentID              string
 	kubernetesRunnerType bool
 	tolerations          string
+	envVars              string
 }
 
 var installAgentCmd = &cobra.Command{
@@ -94,6 +96,14 @@ var installAgentCmd = &cobra.Command{
 			s.Image.Tag = version
 			s.Version.Current.Version = version
 		}
+		if installAgentCmdOptions.envVars != "" {
+			s.AdditionalEnvVars = make(map[string]string)
+			parts := strings.Split(installAgentCmdOptions.envVars, ",")
+			for _, part := range parts {
+				splited := strings.Split(part, "=")
+				s.AdditionalEnvVars[splited[0]] = splited[1]
+			}
+		}
 
 		s.KubernetesAPI.NodeSelector = installAgentCmdOptions.kube.nodeSelector
 
@@ -127,6 +137,7 @@ func init() {
 	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.kube.context, "kube-context-name", viper.GetString("kube-context"), "Name of the kubernetes context on which venona should be installed (default is current-context) [$KUBE_CONTEXT]")
 	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.kube.nodeSelector, "kube-node-selector", "", "The kubernetes node selector \"key=value\" to be used by venona resources (default is no node selector)")
 	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.tolerations, "tolerations", "", "The kubernetes tolerations as JSON string to be used by venona resources (default is no tolerations)")
+	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.envVars, "envVars", "", "More env vars to be declared \"key=value\"")
 
 	installAgentCmd.Flags().BoolVar(&installAgentCmdOptions.kube.inCluster, "in-cluster", false, "Set flag if venona is been installed from inside a cluster")
 	installAgentCmd.Flags().BoolVar(&installAgentCmdOptions.dryRun, "dry-run", false, "Set to true to simulate installation")

venonactl/cmd/upgrade.go

@@ -17,31 +17,55 @@ limitations under the License.
 */
 
 import (
-	"os"
-
+	"github.com/codefresh-io/venona/venonactl/pkg/plugins"
+	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 var upgradeCmdOpt struct {
 	kube struct {
-		context string
+		context   string
+		namespace string
 	}
-	dryRun bool
 }
 
 // upgradeCmd represents the upgrade command
 var upgradeCmd = &cobra.Command{
-	Use:   "upgrade [name]",
-	Short: "Upgrade existing runtime-environment",
+	Use:   "upgrade",
+	Short: "Upgrade existing 1.X runner",
 	Run: func(cmd *cobra.Command, args []string) {
 		lgr := createLogger("Upgrade", true, logFormatter)
-		lgr.Warn("Upgrade is not supported from version < 1.0.0 to version >= 1.x.x, please run the migration script: https://github.com/codefresh-io/venona/blob/master/scripts/migration.sh to upgrade to the latest version")
-		os.Exit(0)
+		builder := plugins.NewBuilder(lgr)
+		builder.Add(plugins.VenonaPluginType)
+
+		s := store.GetStore()
+		buildBasicStore(lgr)
+		extendStoreWithKubeClient(lgr)
+		extendStoreWithCodefershClient(lgr)
+		extendStoreWithAgentAPI(lgr, "", "")
+		fillKubernetesAPI(lgr, upgradeCmdOpt.kube.context, upgradeCmdOpt.kube.namespace, false)
+		values := s.BuildValues()
+		spn := createSpinner("Upgarding runtime (might take a few seconds)", "")
+		spn.Start()
+		defer spn.Stop()
+		var err error
+		for _, p := range builder.Get() {
+			values, err = p.Upgrade(&plugins.UpgradeOptions{
+				Name: s.AppName,
+				ClusterNamespace: upgradeCmdOpt.kube.namespace,
+				ClusterName:      upgradeCmdOpt.kube.namespace,
+				KubeBuilder:      getKubeClientBuilder(upgradeCmdOpt.kube.context, upgradeCmdOpt.kube.namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster),
+			}, values)
+			if err != nil {
+				dieOnError(err)
+			}
+		}
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(upgradeCmd)
 	upgradeCmd.Flags().StringVar(&upgradeCmdOpt.kube.context, "kube-context-name", "", "Set name to overwrite the context name saved in Codefresh")
-	upgradeCmd.Flags().BoolVar(&upgradeCmdOpt.dryRun, "dry-run", false, "Set to to actually upgrade the kubernetes components")
+	upgradeCmd.Flags().StringVar(&upgradeCmdOpt.kube.namespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which venona is installed [$KUBE_NAMESPACE]")
 }

venonactl/pkg/plugins/helper.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 
 	// import all cloud providers auth clients
+	"gopkg.in/yaml.v2"
 	authv1 "k8s.io/api/authorization/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
@@ -87,6 +88,26 @@ func nodeSelectorParamToYaml(ns string) string {
 	return nodeSelectorYaml
 }
 
+func nodeSelectorToString(nodeSelectors map[string]string) string {
+	str := ""
+	for key, value := range nodeSelectors {
+
+		//str = strings.Join([]string {str, fmt.Sprintf("%s=%s", key, value)} , ",")
+		str = fmt.Sprintf("%s,%s=%s", str, key, value)
+
+	}
+	return strings.TrimPrefix(str, ",")
+}
+func tolerationsToSring(tolerations []v1.Toleration) string {
+	// [{\"effect\":\"NoSchedule\",\"key\":\"dedicated\",\"value\":\"codefresh\"},{\"effect\":\"NoSchedule\",\"key\":\"dedicated\",\"value\":\"codefresh\"}]
+	y, err := yaml.Marshal(&tolerations)
+	if err != nil {
+		return ""
+	}
+	return fmt.Sprintf("\n%s", string(y))
+
+}
+
 // ExecuteTemplate - executes templates in tpl str with config as values
 func ExecuteTemplate(tplStr string, data interface{}) (string, error) {
 	funcMap := template.FuncMap{

venonactl/pkg/plugins/plugin.go

@@ -90,15 +90,12 @@ type (
 	}
 
 	UpgradeOptions struct {
-		CodefreshHost    string
-		CodefreshToken   string
 		ClusterName      string
 		ClusterNamespace string
 		Name             string
 		KubeBuilder      interface {
 			BuildClient() (*kubernetes.Clientset, error)
 		}
-		DryRun bool
 	}
 
 	MigrateOptions struct {

venonactl/pkg/plugins/venona.go

@@ -30,6 +30,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 )
 
 // venonaPlugin installs assets on Kubernetes Dind runtimectl Env
@@ -40,7 +41,7 @@ type venonaPlugin struct {
 type migrationData struct {
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 	Tolerations  []v1.Toleration   `json:"tolerations,omitempty"`
-	Env          []v1.EnvVar
+	Env          map[string]string `json:"env,omitempty"`
 }
 
 const (
@@ -168,6 +169,7 @@ func (u *venonaPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
 	if err != nil {
 		return nil, err
 	}
+	v, err = updateValuesBasedOnPreviousDeployment(opt.ClusterNamespace, kubeClientset, v)
 
 	for fileName, local := range kubeObjects {
 		if _, ok := deletePriorUpgrade[fileName]; ok {
@@ -192,7 +194,6 @@ func (u *venonaPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
 				kubeClientSet:  kubeClientset,
 				namespace:      opt.ClusterNamespace,
 				matchPattern:   fileName,
-				dryRun:         opt.DryRun,
 				operatorType:   VenonaPluginType,
 			}
 			err = install(installOpt)
@@ -215,6 +216,50 @@ func (u *venonaPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
 	return v, nil
 }
 
+func updateValuesBasedOnPreviousDeployment(ns string, kubeClientset *kubernetes.Clientset, v Values) (Values, error) {
+
+	runnerDeployment, err := kubeClientset.AppsV1().Deployments(ns).Get(AppName, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+	// Update the values with existing deployment values
+	if runnerDeployment.Spec.Template.Spec.NodeSelector != nil {
+
+	}
+	if runnerDeployment.Spec.Template.Spec.NodeSelector != nil {
+		v["NodeSelector"] = nodeSelectorToString(runnerDeployment.Spec.Template.Spec.NodeSelector)
+	}
+	if runnerDeployment.Spec.Template.Spec.Tolerations != nil {
+		v["Tolerations"] = tolerationsToSring(runnerDeployment.Spec.Template.Spec.Tolerations)
+	}
+
+	v["AdditionalEnvVars"] = getEnvVarsFromDeployment(runnerDeployment.Spec.Template.Spec.Containers)
+	return v, nil
+
+}
+
+func getEnvVarsFromDeployment(containers []v1.Container) map[string]string {
+	// Get env for containers
+	preDefinedEnvVars := map[string]interface{}{}
+	newEnvVars := map[string]string{}
+	preDefinedEnvVars["SELF_DEPLOYMENT_NAME"] = "SELF_DEPLOYMENT_NAME"
+	preDefinedEnvVars["CODEFRESH_TOKEN"] = "CODEFRESH_TOKEN"
+	preDefinedEnvVars["CODEFRESH_HOST"] = "CODEFRESH_HOST"
+	preDefinedEnvVars["AGENT_MODE"] = "AGENT_MODE"
+	preDefinedEnvVars["AGENT_NAME"] = "AGENT_NAME"
+	preDefinedEnvVars["AGENT_ID"] = "AGENT_ID"
+	preDefinedEnvVars["VENONA_CONFIG_DIR"] = "VENONA_CONFIG_DIR"
+
+	for _, container := range containers {
+		for _, envVar := range container.Env {
+			if preDefinedEnvVars[envVar.Name] == nil {
+				newEnvVars[envVar.Name] = envVar.Value
+			}
+		}
+	}
+	return newEnvVars
+}
+
 func (u *venonaPlugin) Migrate(opt *MigrateOptions, v Values) error {
 	var deletePriorUpgrade = map[string]interface{}{
 		"deployment.venona.yaml": nil,
@@ -242,7 +287,7 @@ func (u *venonaPlugin) Migrate(opt *MigrateOptions, v Values) error {
 	migrationData := migrationData{
 		Tolerations:  list.Items[0].Spec.Tolerations,
 		NodeSelector: list.Items[0].Spec.NodeSelector,
-		Env:          list.Items[0].Spec.Containers[0].Env,
+		Env:          getEnvVarsFromDeployment(list.Items[0].Spec.Containers),
 	}
 	var jsonData []byte
 	jsonData, err = json.Marshal(migrationData)

venonactl/pkg/store/store.go

@@ -47,6 +47,8 @@ type (
 
 		// need for define if monitor use cluster role or just role
 		UseNamespaceWithRole bool
+
+		AdditionalEnvVars map[string]string
 	}
 
 	KubernetesAPI struct {
@@ -106,13 +108,14 @@ func (s *Values) BuildValues() map[string]interface{} {
 			"Name": "codefresh/venona",
 			"Tag":  s.Version.Current.Version,
 		},
-		"Namespace":    s.KubernetesAPI.Namespace,
-		"ConfigPath":   s.KubernetesAPI.ConfigPath,
-		"Context":      s.KubernetesAPI.ContextName,
-		"NodeSelector": s.KubernetesAPI.NodeSelector,
-		"Tolerations":  s.KubernetesAPI.Tolerations,
-		"AgentToken":   s.AgentAPI.Token,
-		"AgentId":      s.AgentAPI.Id,
+		"AdditionalEnvVars": s.AdditionalEnvVars,
+		"Namespace":         s.KubernetesAPI.Namespace,
+		"ConfigPath":        s.KubernetesAPI.ConfigPath,
+		"Context":           s.KubernetesAPI.ContextName,
+		"NodeSelector":      s.KubernetesAPI.NodeSelector,
+		"Tolerations":       s.KubernetesAPI.Tolerations,
+		"AgentToken":        s.AgentAPI.Token,
+		"AgentId":           s.AgentAPI.Id,
 		"ServerCert": map[string]string{
 			"Cert": "",
 			"Key":  "",

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

@@ -38,6 +38,12 @@ spec:
       {{ end }}
       containers:
       - env:
+        {{- if $.AdditionalEnvVars }}
+        {{- range $key, $value := $.AdditionalEnvVars }}
+        - name: {{ $key }}
+          value: "{{ $value}}"
+        {{- end}}
+        {{- end}}
         - name: SELF_DEPLOYMENT_NAME
           valueFrom:
             fieldRef:
@@ -53,7 +59,7 @@ spec:
           value: {{ .Mode }}
         - name: AGENT_NAME
           value: {{ .AppName }}
-        - name: AGENT_ID
+        - name: "AGENT_ID"
           value: {{ .AgentId }}
         - name: VENONA_CONFIG_DIR
           value: "/etc/secrets"