fixed windows compatiblity bugs and added app-proxy upgrade (#199)

* fixed windows compatiblity bugs and added app-proxy upgrade

* removed useless write to file

Co-authored-by: roikramer120 <[email protected]>

Author: roi-codefresh

venona/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

venonactl/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

venonactl/cmd/cmdutils.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/user"
-	"path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -75,9 +75,12 @@ func extendStoreWithCodefershClient(logger logger.Logger) error {
 			return err
 		}
 
-		configPath := path.Join(currentUser.HomeDir, ".cfconfig")
-		logger.Debug("cfconfig path not set, using:", "cfconfig", configPath)
+		configPath = filepath.Join(currentUser.HomeDir, ".cfconfig")
+		logger.Debug(fmt.Sprint("cfconfig path not set, using: ", configPath))
+	}
 
+	if _, err := os.Stat(configPath); err != nil {
+		return fmt.Errorf(".cfconfig file not found")
 	}
 
 	if cfAPIHost == "" && cfAPIToken == "" {
@@ -117,7 +120,7 @@ func extendStoreWithKubeClient(logger logger.Logger) {
 	if kubeConfigPath == "" {
 		currentUser, _ := user.Current()
 		if currentUser != nil {
-			kubeConfigPath = path.Join(currentUser.HomeDir, ".kube", "config")
+			kubeConfigPath = filepath.Join(currentUser.HomeDir, ".kube", "config")
 			logger.Debug("Path to kubeconfig not set, using:", "kubeconfig", kubeConfigPath)
 		}
 	}

venonactl/cmd/upgrade-app-proxy.go

@@ -0,0 +1,90 @@
+package cmd
+
+/*
+Copyright 2019 The Codefresh Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import (
+	"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 upgradeAppProxyCmdOptions struct {
+	kube struct {
+		context   string
+		namespace string
+	}
+	templateValues     []string
+	templateFileValues []string
+	templateValueFiles []string
+}
+
+var upgradeAppProxyCmd = &cobra.Command{
+	Use:   "app-proxy",
+	Short: "Upgrade App proxy",
+	Run: func(cmd *cobra.Command, args []string) {
+
+		templateValuesMap, err := templateValuesToMap(
+			upgradeAppProxyCmdOptions.templateValueFiles,
+			upgradeAppProxyCmdOptions.templateValues,
+			upgradeAppProxyCmdOptions.templateFileValues)
+		if err != nil {
+			dieOnError(err)
+		}
+
+		mergeValueStr(templateValuesMap, "ConfigPath", &kubeConfigPath)
+		mergeValueStr(templateValuesMap, "CodefreshHost", &cfAPIHost)
+		mergeValueStr(templateValuesMap, "Namespace", &upgradeAppProxyCmdOptions.kube.namespace)
+		mergeValueStr(templateValuesMap, "Context", &upgradeAppProxyCmdOptions.kube.context)
+
+		lgr := createLogger("Upgrade-AppProxy", verbose, logFormatter)
+		builder := plugins.NewBuilder(lgr)
+
+		builder.Add(plugins.AppProxyPluginType)
+
+		s := store.GetStore()
+		buildBasicStore(lgr)
+		extendStoreWithKubeClient(lgr)
+		dieOnError(extendStoreWithCodefershClient(lgr))
+		extendStoreWithAgentAPI(lgr, "", "")
+		fillKubernetesAPI(lgr, upgradeAppProxyCmdOptions.kube.context, upgradeAppProxyCmdOptions.kube.namespace, false)
+		values := s.BuildValues()
+		values = mergeMaps(values, templateValuesMap)
+
+		for _, p := range builder.Get() {
+			values, err = p.Upgrade(&plugins.UpgradeOptions{
+				Name:             store.AppProxyApplicationName,
+				ClusterNamespace: upgradeAppProxyCmdOptions.kube.namespace,
+				ClusterName:      upgradeAppProxyCmdOptions.kube.namespace,
+				KubeBuilder:      getKubeClientBuilder(upgradeAppProxyCmdOptions.kube.context, upgradeAppProxyCmdOptions.kube.namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster),
+			}, values)
+			if err != nil {
+				dieOnError(err)
+			}
+		}
+	},
+}
+
+func init() {
+	viper.BindEnv("kube-namespace", "KUBE_NAMESPACE")
+	viper.BindEnv("kube-context", "KUBE_CONTEXT")
+	upgradeCmd.AddCommand(upgradeAppProxyCmd)
+	upgradeAppProxyCmd.Flags().StringVar(&upgradeAppProxyCmdOptions.kube.namespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which venona should be installed [$KUBE_NAMESPACE]")
+	upgradeAppProxyCmd.Flags().StringVar(&upgradeAppProxyCmdOptions.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]")
+	upgradeAppProxyCmd.Flags().StringArrayVarP(&upgradeAppProxyCmdOptions.templateValueFiles, "values", "f", []string{}, "specify values in a YAML file")
+	upgradeAppProxyCmd.Flags().StringArrayVar(&upgradeAppProxyCmdOptions.templateValues, "set-value", []string{}, "Set values for templates, example: --set-value LocalVolumesDir=/mnt/disks/ssd0/codefresh-volumes")
+}

venonactl/cmd/upgrade.go

@@ -60,7 +60,7 @@ var upgradeCmd = &cobra.Command{
 		s := store.GetStore()
 		buildBasicStore(lgr)
 		extendStoreWithKubeClient(lgr)
-		extendStoreWithCodefershClient(lgr)
+		dieOnError(extendStoreWithCodefershClient(lgr))
 		extendStoreWithAgentAPI(lgr, "", "")
 		fillKubernetesAPI(lgr, upgradeCmdOpt.kube.context, upgradeCmdOpt.kube.namespace, false)
 		values := s.BuildValues()

venonactl/pkg/plugins/app-proxy.go

@@ -1,13 +1,28 @@
 package plugins
 
+/*
+Copyright 2019 The Codefresh Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import (
-	"encoding/json"
 	"fmt"
-	"os"
 
 	"github.com/codefresh-io/venona/venonactl/pkg/logger"
 	templates "github.com/codefresh-io/venona/venonactl/pkg/templates/kubernetes"
 	"github.com/stretchr/objx"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type appProxyPlugin struct {
@@ -49,25 +64,7 @@ func (u *appProxyPlugin) Install(opt *InstallOptions, v Values) (Values, error)
 	pathPrefix := objx.New(v["AppProxy"]).Get("PathPrefix").Str()
 	appProxyURL := fmt.Sprintf("https://%v%v", host, pathPrefix)
 	u.logger.Info(fmt.Sprintf("\napp proxy is running at: %v", appProxyURL))
-
-	// update IPC
-	file := os.NewFile(3, "pipe")
-	if file == nil {
-		return v, nil
-	}
-	data := map[string]interface{}{
-		"ingressIP": appProxyURL,
-	}
-	var jsonData []byte
-	jsonData, err = json.Marshal(data)
-	n, err := file.Write(jsonData)
-	if err != nil {
-		u.logger.Error("Failed to write to stream", err)
-		return v, fmt.Errorf("Failed to write to stream")
-	}
-	u.logger.Debug(fmt.Sprintf("%v bytes were written to stream\n", n))
-	return v, err
-
+	return v, nil
 }
 
 func (u *appProxyPlugin) Status(statusOpt *StatusOptions, v Values) ([][]string, error) {
@@ -93,7 +90,33 @@ func (u *appProxyPlugin) Delete(deleteOpt *DeleteOptions, v Values) error {
 }
 
 func (u *appProxyPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
-	return nil, nil
+	kubeClientset, err := opt.KubeBuilder.BuildClient()
+	if err != nil {
+		u.logger.Error(fmt.Sprintf("Cannot create kubernetes clientset: %v ", err))
+		return nil, err
+	}
+
+	list, err := kubeClientset.CoreV1().Pods(opt.ClusterNamespace).List(metav1.ListOptions{LabelSelector: fmt.Sprintf("app=%v", opt.Name)})
+	if err != nil {
+		u.logger.Error(fmt.Sprintf("Failed to list app-proxy pods: %v ", err))
+		return nil, err
+	}
+	if len(list.Items) == 0 {
+		u.logger.Info("no app-proxy pods found")
+		return nil, nil
+	}
+
+	for _, pod := range list.Items {
+		podName := pod.ObjectMeta.Name
+		u.logger.Debug(fmt.Sprintf("Deleting app-proxy pod: %v", podName))
+		err = kubeClientset.CoreV1().Pods(opt.ClusterNamespace).Delete(podName, &metav1.DeleteOptions{})
+		if err != nil {
+			u.logger.Error(fmt.Sprintf("Cannot delete app-proxy pod: %v ", err))
+			return nil, err
+		}
+	}
+
+	return v, nil
 }
 func (u *appProxyPlugin) Migrate(*MigrateOptions, Values) error {
 	return fmt.Errorf("not supported")