Saas 7098 - renamed venona to runner (#145)

Author: roi-codefresh

.gitignore

@@ -17,5 +17,6 @@ venonactl/dist/*
 venonactl-linux
 venonalog.json
 .venonaconf
+.runnerconf
 .cover
 configdir

package.json

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

venonactl/VERSION

@@ -1,2 +1 @@
-1.3.4
-
+1.3.5

venonactl/cmd/attach.go

@@ -17,6 +17,8 @@ limitations under the License.
 */
 
 import (
+	"fmt"
+
 	"github.com/codefresh-io/venona/venonactl/pkg/plugins"
 	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/spf13/cobra"
@@ -63,7 +65,9 @@ var attachRuntimeCmd = &cobra.Command{
 			attachRuntimeCmdOptions.kubeVenona.context = attachRuntimeCmdOptions.kube.context
 		}
 
-		attachRuntimeCmdOptions.kube.serviceAccount = "venona"
+		if attachRuntimeCmdOptions.kube.serviceAccount == "" {
+			attachRuntimeCmdOptions.kube.serviceAccount = s.AppName
+		}
 
 		if attachRuntimeCmdOptions.kube.kubePath == "" {
 			attachRuntimeCmdOptions.kube.kubePath = kubeConfigPath
@@ -116,6 +120,7 @@ func init() {
 	attachRuntimeCmd.Flags().StringVar(&attachRuntimeCmdOptions.kube.namespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which venona should be installed [$KUBE_NAMESPACE]")
 	attachRuntimeCmd.Flags().StringVar(&attachRuntimeCmdOptions.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]")
 	attachRuntimeCmd.Flags().StringVar(&attachRuntimeCmdOptions.kube.kubePath, "kube-config-path", viper.GetString("kubeconfig"), "Path to kubeconfig file (default is $HOME/.kube/config) [$KUBECONFIG]")
+	attachRuntimeCmd.Flags().StringVar(&attachRuntimeCmdOptions.kube.serviceAccount, "kube-service-account", viper.GetString("kube-service-account"), fmt.Sprintf("Name of the kubernetes service account (default is %s)", plugins.AppName))
 
 	attachRuntimeCmd.Flags().StringVar(&attachRuntimeCmdOptions.runtimeEnvironmentName, "runtime-name", viper.GetString("runtime-name"), "Name of the runtime as in codefresh")
 

venonactl/go.sum

@@ -77,6 +77,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codefresh-io/go-sdk v0.18.0 h1:tSP1m89l66qQ2PF5NvuUCL5dCorxQUGhyq7lyRKv35Q=
 github.com/codefresh-io/go-sdk v0.18.0/go.mod h1:b6hK9euSW+MDXUDHU1+YgP8vzcij749I31ZIZSXed+I=
+github.com/codefresh-io/venona v1.0.2 h1:fpQ2y4/DLgW8q/RNrrkc4aISvIIyXHT0jcr5F3eiSYs=
 github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
 github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=

venonactl/pkg/plugins/plugin.go

@@ -17,7 +17,7 @@ const (
 	MonitorAgentPluginType        = "monitor-agent"
 	VolumeProvisionerPluginType   = "volume-provisioner"
 	EnginePluginType              = "engine"
-	DefaultStorageClassNamePrefix = "dind-local-volumes-venona"
+	DefaultStorageClassNamePrefix = "dind-local-volumes-runner"
 	RuntimeAttachType             = "runtime-attach"
 )
 

venonactl/pkg/plugins/runtime-attach.go

@@ -31,7 +31,7 @@ type venonaConf struct {
 
 const (
 	runtimeAttachFilesPattern = ".*.runtime-attach.yaml"
-	runtimeSecretName         = "venonaconf"
+	runtimeSecretName         = "runnerconf"
 )
 
 func buildRuntimeConfig(opt *InstallOptions, v Values) (RuntimeConfiguration, error) {
@@ -114,7 +114,7 @@ func (u *runtimeAttachPlugin) Install(opt *InstallOptions, v Values) (Values, er
 	// read current venona conf
 	currentVenonaConf, err := readCurrentVenonaConf(opt.AgentKubeBuilder, opt.ClusterNamespace)
 	if err != nil {
-		u.logger.Error(fmt.Sprintf("Cannot read venonaconf: %v ", err))
+		u.logger.Error(fmt.Sprintf("Cannot read runnerconf: %v ", err))
 		return nil, err
 	}
 
@@ -135,13 +135,13 @@ func (u *runtimeAttachPlugin) Install(opt *InstallOptions, v Values) (Values, er
 		// marshel prior persist
 		d, err := yaml.Marshal(runtime)
 		if err != nil {
-			u.logger.Error(fmt.Sprintf("Cannot marshal merged venonaconf: %v ", err))
+			u.logger.Error(fmt.Sprintf("Cannot marshal merged runnerconf: %v ", err))
 			return nil, err
 		}
 
 		runtimes[name] = base64.StdEncoding.EncodeToString([]byte(d))
 	}
-	v["venonaConf"] = runtimes
+	v["runnerConf"] = runtimes
 
 	cs.CoreV1().Secrets(opt.ClusterNamespace).Delete(runtimeSecretName, &metav1.DeleteOptions{})
 
@@ -223,12 +223,12 @@ func (u *runtimeAttachPlugin) Delete(deleteOpt *DeleteOptions, v Values) error {
 		u.logger.Error(fmt.Sprintf("Cannot create kubernetes clientset: %v ", err))
 		return err
 	}
-	// Delete the entry from venonaconf - if this is the only , delete the secret
+	// Delete the entry from runnerconf - if this is the only , delete the secret
 
 	// read current venona conf
 	currentVenonaConf, err := readCurrentVenonaConf(deleteOpt.AgentKubeBuilder, deleteOpt.AgentNamespace)
 	if err != nil {
-		u.logger.Error(fmt.Sprintf("Cannot read venonaconf: %v ", err))
+		u.logger.Error(fmt.Sprintf("Cannot read runnerconf: %v ", err))
 		return err
 	}
 	name := strings.ReplaceAll(deleteOpt.RuntimeEnvironment, "/", ".")
@@ -246,15 +246,15 @@ func (u *runtimeAttachPlugin) Delete(deleteOpt *DeleteOptions, v Values) error {
 			// marshel prior persist
 			d, err := yaml.Marshal(runtime)
 			if err != nil {
-				u.logger.Error(fmt.Sprintf("Cannot marshal merged venonaconf: %v ", err))
+				u.logger.Error(fmt.Sprintf("Cannot marshal merged runnerconf: %v ", err))
 				return err
 			}
 
 			runtimes[name] = base64.StdEncoding.EncodeToString([]byte(d))
 		}
 
 		shouldDelete = false
-		v["venonaConf"] = runtimes
+		v["runnerConf"] = runtimes
 
 		cs.CoreV1().Secrets(deleteOpt.AgentNamespace).Delete(runtimeSecretName, &metav1.DeleteOptions{})
 

venonactl/pkg/plugins/types.go

@@ -17,7 +17,7 @@ package plugins
 
 const (
 	// AppName - app name for config
-	AppName = "venona"
+	AppName = "runner"
 
 	// TypeKubernetesDind - name for Kubernetes  Dind runtimectl
 	TypeKubernetesDind = "kubernetesDind"

venonactl/pkg/plugins/venona.go

@@ -226,7 +226,7 @@ func (u *venonaPlugin) Migrate(opt *MigrateOptions, v Values) error {
 		u.logger.Error(fmt.Sprintf("Cannot create kubernetes clientset: %v ", err))
 		return err
 	}
-
+	v["AppName"] = "venona" // use old app name for migration
 	kubeObjects, err := getKubeObjectsFromTempalte(v, venonaFilesPattern, u.logger)
 	if err != nil {
 		return err

venonactl/pkg/store/store.go

@@ -2,13 +2,14 @@ package store
 
 import (
 	"fmt"
+
 	"github.com/codefresh-io/go-sdk/pkg/codefresh"
 	"github.com/codefresh-io/venona/venonactl/pkg/certs"
 )
 
 const (
 	ModeInCluster          = "InCluster"
-	ApplicationName        = "venona"
+	ApplicationName        = "runner"
 	MonitorApplicationName = "monitor"
 )