Cr 1290 removed runnerType option and added runtime service account (#201)

* removed runnerType option and added runtime service account

Author: roi-codefresh

venona/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

venonactl/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

venonactl/cmd/install-agent.go

@@ -40,16 +40,15 @@ var installAgentCmdOptions struct {
 	venona struct {
 		version string
 	}
-	agentToken           string
-	agentID              string
-	kubernetesRunnerType bool
-	tolerations          string
-	envVars              []string
-	dockerRegistry       string
-	templateValues       []string
-	templateFileValues   []string
-	templateValueFiles   []string
-	resources            map[string]interface{}
+	agentToken         string
+	agentID            string
+	tolerations        string
+	envVars            []string
+	dockerRegistry     string
+	templateValues     []string
+	templateFileValues []string
+	templateValueFiles []string
+	resources          map[string]interface{}
 }
 
 var installAgentCmd = &cobra.Command{
@@ -85,7 +84,6 @@ var installAgentCmd = &cobra.Command{
 		//mergeValueStrArray(&installAgentCmdOptions.envVars, "envVars", nil, "More env vars to be declared \"key=value\"")
 
 		mergeValueBool(templateValuesMap, "InCluster", &installAgentCmdOptions.kube.inCluster)
-		mergeValueBool(templateValuesMap, "kubernetesRunnerType", &installAgentCmdOptions.kubernetesRunnerType)
 
 		s := store.GetStore()
 		lgr := createLogger("Install-agent", verbose, logFormatter)
@@ -192,7 +190,6 @@ func init() {
 
 	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")
-	installAgentCmd.Flags().BoolVar(&installAgentCmdOptions.kubernetesRunnerType, "kubernetes-runner-type", false, "Set the runner type to kubernetes (alpha feature)")
 
 	installAgentCmd.Flags().StringArrayVar(&installAgentCmdOptions.templateValues, "set-value", []string{}, "Set values for templates --set-value agentId=12345")
 	installAgentCmd.Flags().StringArrayVar(&installAgentCmdOptions.templateFileValues, "set-file", []string{}, "Set values for templates from file")

venonactl/cmd/install-runtime.go

@@ -38,7 +38,6 @@ var installRuntimeCmdOptions struct {
 	storageClass           string
 	dockerRegistry         string
 	runtimeEnvironmentName string
-	kubernetesRunnerType   bool
 	tolerations            string
 	templateValues         []string
 	templateFileValues     []string
@@ -90,7 +89,6 @@ var installRuntimeCmd = &cobra.Command{
 
 		mergeValueBool(templateValuesMap, "InCluster", &installRuntimeCmdOptions.kube.inCluster)
 		mergeValueBool(templateValuesMap, "insecure", &installRuntimeCmdOptions.insecure)
-		mergeValueBool(templateValuesMap, "kubernetesRunnerType", &installRuntimeCmdOptions.kubernetesRunnerType)
 
 		s := store.GetStore()
 		lgr := createLogger("Install-runtime", verbose, logFormatter)
@@ -136,18 +134,13 @@ var installRuntimeCmd = &cobra.Command{
 			StorageClass:          installRuntimeCmdOptions.storageClass,
 			IsDefaultStorageClass: isDefault,
 			DryRun:                installRuntimeCmdOptions.dryRun,
-			KubernetesRunnerType:  installRuntimeCmdOptions.kubernetesRunnerType,
 			CodefreshHost:         cfAPIHost,
 			CodefreshToken:        installRuntimeCmdOptions.codefreshToken,
 			RuntimeEnvironment:    installRuntimeCmdOptions.runtimeEnvironmentName,
 			ClusterNamespace:      installRuntimeCmdOptions.kube.namespace,
 			Insecure:              installRuntimeCmdOptions.insecure,
 		}
 
-		if installRuntimeCmdOptions.kubernetesRunnerType {
-			builder.Add(plugins.EnginePluginType)
-		}
-
 		if isDefault {
 			builderInstallOpt.StorageClass = plugins.DefaultStorageClassNamePrefix
 		}
@@ -164,6 +157,7 @@ var installRuntimeCmd = &cobra.Command{
 		// s.ClusterInCodefresh = installRuntimeCmdOptions.clusterNameInCodefresh
 
 		builder.Add(plugins.RuntimeEnvironmentPluginType)
+		builder.Add(plugins.EnginePluginType)
 
 		if isDefault {
 			builder.Add(plugins.VolumeProvisionerPluginType)
@@ -202,7 +196,6 @@ func init() {
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.insecure, "insecure", false, "Set to true to disable TLS when communicating with the codefresh platform")
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.kube.inCluster, "in-cluster", false, "Set flag if venona is been installed from inside a cluster")
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.dryRun, "dry-run", false, "Set to true to simulate installation")
-	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.kubernetesRunnerType, "kubernetes-runner-type", false, "Set the runner type to kubernetes (alpha feature)")
 	installRuntimeCmd.Flags().StringVar(&installRuntimeCmdOptions.kube.nodeSelector, "kube-node-selector", "", "The kubernetes node selector \"key=value\" to be used by venona resources (default is no node selector)")
 	installRuntimeCmd.Flags().StringVar(&installRuntimeCmdOptions.tolerations, "tolerations", "", "The kubernetes tolerations as JSON string to be used by venona resources (default is no tolerations)")
 

venonactl/cmd/install-venona.go

@@ -42,7 +42,6 @@ var installCmdOptions struct {
 	installOnlyRuntimeEnvironment bool
 	skipRuntimeInstallation       bool
 	runtimeEnvironmentName        string
-	kubernetesRunnerType          bool
 	buildNodeSelector             string
 	buildAnnotations              []string
 	tolerationJSONString          string

venonactl/cmd/uninstall-runtime.go

@@ -62,10 +62,10 @@ var uninstallRuntimeCmd = &cobra.Command{
 
 		builder := plugins.NewBuilder(lgr)
 		if uninstallRunimeCmdOptions.kube.context == "" {
-			dieOnError(fmt.Errorf("Context name is required in order to uninstall agent"))
+			dieOnError(fmt.Errorf("Context name is required in order to uninstall runtime"))
 		}
 		if uninstallRunimeCmdOptions.kube.namespace == "" {
-			dieOnError(fmt.Errorf("Namespace name is required to in order to uninstall agent"))
+			dieOnError(fmt.Errorf("Namespace name is required to in order to uninstall runtime"))
 		}
 		s.KubernetesAPI.ContextName = uninstallRunimeCmdOptions.kube.context
 		s.KubernetesAPI.Namespace = uninstallRunimeCmdOptions.kube.namespace
@@ -102,6 +102,7 @@ var uninstallRuntimeCmd = &cobra.Command{
 			builder.Add(plugins.VolumeProvisionerPluginType)
 		}
 		builder.Add(plugins.RuntimeAttachType)
+		builder.Add(plugins.EnginePluginType)
 		deleteOptions.ClusterNamespace = uninstallRunimeCmdOptions.kube.namespace
 		deleteOptions.AgentNamespace = uninstallRunimeCmdOptions.kubeVenona.namespace
 		deleteOptions.RuntimeEnvironment = uninstallRunimeCmdOptions.runtimeEnvironmentName

venonactl/pkg/codefresh/cfapi.go

@@ -44,7 +44,6 @@ type (
 		Insecure              bool
 		StorageClass          string
 		IsDefaultStorageClass bool
-		KubernetesRunnerType  bool
 		BuildNodeSelector     map[string]string
 		Annotations           map[string]string
 	}
@@ -64,7 +63,6 @@ type (
 		markAsDefault         bool
 		storageClass          string
 		isDefaultStorageClass bool
-		kubernetesRunnerType  bool
 		buildNodeSelector     map[string]string
 		annotations           map[string]string
 	}
@@ -101,7 +99,6 @@ func NewCodefreshAPI(opt *APIOptions) API {
 		registerWithAgent:     opt.RegisterWithAgent,
 		storageClass:          opt.StorageClass,
 		isDefaultStorageClass: opt.IsDefaultStorageClass,
-		kubernetesRunnerType:  opt.KubernetesRunnerType,
 		buildNodeSelector:     opt.BuildNodeSelector,
 		annotations:           opt.Annotations,
 	}
@@ -186,9 +183,6 @@ func (a *api) Register() (*codefresh.RuntimeEnvironment, error) {
 		HasAgent:  a.registerWithAgent,
 		Cluster:   a.clustername,
 	}
-	if a.kubernetesRunnerType {
-		options.RunnerType = codefresh.KubernetesRunnerType
-	}
 	if len(a.buildNodeSelector) != 0 {
 		options.NodeSelector = a.buildNodeSelector
 	}

venonactl/pkg/plugins/app-proxy.go

@@ -63,7 +63,7 @@ func (u *appProxyPlugin) Install(opt *InstallOptions, v Values) (Values, error)
 	host := objx.New(v["AppProxy"]).Get("Host").Str()
 	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))
+	u.logger.Info(fmt.Sprintf("app proxy is running at: %v", appProxyURL))
 	return v, nil
 }
 

venonactl/pkg/plugins/engine.go

@@ -20,9 +20,7 @@ import (
 	"fmt"
 
 	"github.com/codefresh-io/venona/venonactl/pkg/logger"
-	"github.com/codefresh-io/venona/venonactl/pkg/obj/kubeobj"
 	templates "github.com/codefresh-io/venona/venonactl/pkg/templates/kubernetes"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // enginePlugin installs assets on Kubernetes Dind runtimectl Env
@@ -96,49 +94,6 @@ func (u *enginePlugin) Delete(deleteOpt *DeleteOptions, v Values) error {
 }
 
 func (u *enginePlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
-
-	// replace of sa creates new secert with sa creds
-	// avoid it till patch fully implemented
-	var skipUpgradeFor = map[string]interface{}{
-		"service-account.venona.yaml": nil,
-	}
-
-	var err error
-
-	kubeClientset, err := opt.KubeBuilder.BuildClient()
-	if err != nil {
-		u.logger.Error(fmt.Sprintf("Cannot create kubernetes clientset: %v ", err))
-		return nil, err
-	}
-
-	// special case when we need to get the token from the remote to no regenrate it
-	// whole flow should be more like kubectl apply that build a patch
-	// based on remote object and candidate object
-
-	secret, err := kubeClientset.CoreV1().Secrets(opt.ClusterNamespace).Get(opt.Name, metav1.GetOptions{})
-	if err != nil {
-		return nil, err
-	}
-	token := secret.Data["codefresh.token"]
-	v["AgentToken"] = string(token)
-
-	kubeObjects, err := getKubeObjectsFromTempalte(v, engineFilesPattern, u.logger)
-	if err != nil {
-		return nil, err
-	}
-
-	for fileName, local := range kubeObjects {
-		if _, ok := skipUpgradeFor[fileName]; ok {
-			u.logger.Debug(fmt.Sprintf("Skipping upgrade of %s: should be ignored", fileName))
-			continue
-		}
-
-		_, _, err := kubeobj.ReplaceObject(kubeClientset, local, opt.ClusterNamespace)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	return v, nil
 }
 

venonactl/pkg/plugins/plugin.go

@@ -69,7 +69,6 @@ type (
 			EnsureNamespaceExists(cs *kubernetes.Clientset) error
 		}
 		DryRun                bool
-		KubernetesRunnerType  bool
 		BuildNodeSelector     map[string]string
 		Annotations           map[string]string
 		RuntimeEnvironment    string