create venonacli docker image

* respect KUBE_NAMESPACE , KUBE_CONTEXT, API_HOST, API_TOKEN

Author: Oleg Sucharevich

.codefresh/codefresh.yaml

@@ -164,3 +164,31 @@ steps:
       branch:
         ignore:
         - master
+
+  build_cli_image:
+    title: "Building venona cli image"
+    type: build
+    stage: Build & Test
+    tag: ${{CF_BRANCH_TAG_NORMALIZED}}
+    working_directory: ${{main_clone}}/venonactl
+    image_name: codefresh/venonacli
+    when:
+      steps:
+      - name: build_binaries
+        on:
+        - success
+
+  push_cli_image:
+    title: "Push image with venona cli"
+    stage: Release
+    type: push
+    candidate: ${{build_cli_image}}
+    tags:
+    - latest
+    - ${{VERSION}}
+    registry: "dockerhub"
+    when:
+      steps:
+        - name: build_cli_image
+          on:
+          - success

package.json

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

venonactl/Dockerfile

@@ -0,0 +1,7 @@
+FROM scratch
+
+COPY dist/linux_386/venona /
+
+ENTRYPOINT [ "/venona" ]
+
+CMD [ "--help" ]

venonactl/cmd/install.go

@@ -29,6 +29,7 @@ import (
 	"github.com/codefresh-io/venona/venonactl/pkg/codefresh"
 	runtimectl "github.com/codefresh-io/venona/venonactl/pkg/operators"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 var (
@@ -37,6 +38,9 @@ var (
 	skipRuntimeInstallation       bool
 	installOnlyRuntimeEnvironment bool
 	setDefaultRuntime             bool
+
+	kubeNamespace   string
+	kubeContextName string
 )
 
 // installCmd represents the install command
@@ -46,16 +50,16 @@ var installCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		s := store.GetStore()
 
-		kubeContextName := cmd.Flag("kube-context-name").Value.String()
-		kubeNamespace := cmd.Flag("kube-namespace").Value.String()
-
 		if kubeContextName == "" {
 			config := clientcmd.GetConfigFromFileOrDie(s.KubernetesAPI.ConfigPath)
 			kubeContextName = config.CurrentContext
 			logrus.WithFields(logrus.Fields{
 				"Kube-Context-Name": kubeContextName,
 			}).Debug("Kube Context is not set, using current context")
 		}
+		if kubeNamespace == "" {
+			kubeNamespace = "default"
+		}
 		s.KubernetesAPI.ContextName = kubeContextName
 		s.KubernetesAPI.Namespace = kubeNamespace
 
@@ -96,14 +100,18 @@ var installCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(installCmd)
+
+	viper.BindEnv("kube-namespace", "KUBE_NAMESPACE")
+	viper.BindEnv("kube-context", "KUBE_CONTEXT")
+
 	installCmd.Flags().StringVar(&clusterName, "cluster-name", "", "cluster name (if not passed runtime-environment will be created cluster-less)")
 	installCmd.Flags().String("venona-version", "", "Version of venona to install (default is the latest)")
 	installCmd.Flags().BoolVar(&skipRuntimeInstallation, "skip-runtime-installation", false, "Set flag if you already have a configured runtime-environment, add --runtime-environment flag with name")
 	installCmd.Flags().String("runtime-environment", "", "if --skip-runtime-installation set, will try to configure venona on current runtime-environment")
 	installCmd.Flags().BoolVar(&installOnlyRuntimeEnvironment, "only-runtime-environment", false, "Set to true to onlky configure namespace as runtime-environment for Codefresh")
 	installCmd.Flags().BoolVar(&dryRun, "dry-run", false, "Set to true to simulate installation")
-	installCmd.Flags().String("kube-namespace", "default", "Name of the namespace on which venona should be installed")
-	installCmd.Flags().String("kube-context-name", "", "Name of the kubernetes context on which venona should be installed (default is current-context)")
+	installCmd.Flags().StringVar(&kubeNamespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which venona should be installed [$KUBE_NAMESPACE]")
+	installCmd.Flags().StringVar(&kubeContextName, "kube-context-name", viper.GetString("kube-context"), "Name of the kubernetes context on which venona should be installed (default is current-context) [$KUBE_CONTEXT]")
 	installCmd.Flags().BoolVar(&setDefaultRuntime, "set-default", false, "Mark the install runtime-environment as default one after installation")
 }
 

venonactl/cmd/root.go

@@ -47,6 +47,13 @@ var (
 	// set to false by default, when running hack/build.sh will change to true
 	// to prevent version checking during development
 	localDevFlow = "false"
+
+	configPath string
+	cfAPIHost  string
+	cfAPIToken string
+	cfContext  string
+
+	kubeConfigPath string
 )
 
 var rootCmd = &cobra.Command{
@@ -59,23 +66,30 @@ var rootCmd = &cobra.Command{
 			logrus.SetLevel(logrus.DebugLevel)
 		}
 
-		configPath := cmd.Flag("cfconfig").Value.String()
 		if configPath == "" {
 			configPath = fmt.Sprintf("%s/.cfconfig", os.Getenv("HOME"))
 		}
-		context, err := sdkUtils.ReadAuthContext(configPath, cmd.Flag("context").Value.String())
-		if err != nil {
-			return err
+
+		if cfAPIHost == "" && cfAPIToken == "" {
+			context, err := sdkUtils.ReadAuthContext(configPath, cfContext)
+			if err != nil {
+				return err
+			}
+			cfAPIHost = context.URL
+			cfAPIToken = context.Token
+
+			logrus.WithFields(logrus.Fields{
+				"Context-Name":   context.Name,
+				"Codefresh-Host": cfAPIHost,
+			}).Debug("Using codefresh context")
+		} else {
+			logrus.Debug("Using creentials from environment variables")
 		}
-		logrus.WithFields(logrus.Fields{
-			"Context-Name":   context.Name,
-			"Codefresh-Host": context.URL,
-		}).Debug("Using codefresh context")
 		client := codefresh.New(&codefresh.ClientOptions{
 			Auth: codefresh.AuthOptions{
-				Token: context.Token,
+				Token: cfAPIToken,
 			},
-			Host: context.URL,
+			Host: cfAPIHost,
 		})
 
 		s := store.GetStore()
@@ -118,8 +132,6 @@ var rootCmd = &cobra.Command{
 			}
 		}
 
-		kubeConfigPath := cmd.Flag("kube-config-path").Value.String()
-
 		if kubeConfigPath == "" {
 			currentUser, _ := user.Current()
 			kubeConfigPath = path.Join(currentUser.HomeDir, ".kube", "config")
@@ -134,8 +146,8 @@ var rootCmd = &cobra.Command{
 		}
 		s.ClusterInCodefresh = clusterName
 		s.CodefreshAPI = &store.CodefreshAPI{
-			Host:   context.URL,
-			Token:  context.Token,
+			Host:   cfAPIHost,
+			Token:  cfAPIToken,
 			Client: client,
 		}
 		s.Mode = store.ModeInCluster
@@ -157,9 +169,15 @@ func init() {
 	viper.BindEnv("kubeconfig", "KUBECONFIG")
 	viper.BindEnv("cfconfig", "CFCONFIG")
 
-	rootCmd.PersistentFlags().String("cfconfig", viper.GetString("cfconfig"), "Config file (default is $HOME/.cfconfig) [$CFCONFIG]")
-	rootCmd.PersistentFlags().String("context", "", "Name of the context from --cfconfig (default is current-context)")
-	rootCmd.PersistentFlags().String("kube-config-path", viper.GetString("kubeconfig"), "Path to kubeconfig file (default is $HOME/.kube/config) [$KUBECONFIG]")
+	viper.BindEnv("apihost", "API_HOST")
+	viper.BindEnv("apitoken", "API_TOKEN")
+
+	rootCmd.PersistentFlags().StringVar(&configPath, "cfconfig", viper.GetString("cfconfig"), "Config file (default is $HOME/.cfconfig) [$CFCONFIG]")
+	rootCmd.PersistentFlags().StringVar(&cfAPIHost, "api-host", viper.GetString("apihost"), "Host of codefresh [$API_HOST]")
+	rootCmd.PersistentFlags().StringVar(&cfAPIToken, "api-token", viper.GetString("apitoken"), "Codefresh API token [$API_TOKEN]")
+	rootCmd.PersistentFlags().StringVar(&cfContext, "context", "", "Name of the context from --cfconfig (default is current-context)")
+
+	rootCmd.PersistentFlags().StringVar(&kubeConfigPath, "kube-config-path", viper.GetString("kubeconfig"), "Path to kubeconfig file (default is $HOME/.kube/config) [$KUBECONFIG]")
 	rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "Print logs")
 	rootCmd.PersistentFlags().BoolVar(&skipVerionCheck, "skip-version-check", false, "Do not compare current Venona's version with latest")