Saas 8162 (#189)

Add support to inject resources via values files

Co-authored-by: Roi Kramer <[email protected]>

Author: oren-codefresh

venona/VERSION

@@ -1 +1 @@
-1.4.27
+1.4.28

venonactl/VERSION

@@ -1 +1 @@
-1.4.27
+1.4.28

venonactl/cmd/attach.go

@@ -39,20 +39,20 @@ var attachRuntimeCmdOptions struct {
 		kubePath  string
 		context   string
 	}
-	restartAgent bool
-	templateValues       []string
-	templateFileValues   []string
-	templateValueFiles   []string	
+	restartAgent       bool
+	templateValues     []string
+	templateFileValues []string
+	templateValueFiles []string
 }
 
 var attachRuntimeCmd = &cobra.Command{
 	Use:   "attach",
 	Short: "Attach Codefresh runtime to agent",
 	Run: func(cmd *cobra.Command, args []string) {
-		// get valuesMap from --values <values.yaml> --set-value k=v --set-file k=<context-of file> 
+		// get valuesMap from --values <values.yaml> --set-value k=v --set-file k=<context-of file>
 		templateValuesMap, err := templateValuesToMap(
-			attachRuntimeCmdOptions.templateValueFiles, 
-			attachRuntimeCmdOptions.templateValues, 
+			attachRuntimeCmdOptions.templateValueFiles,
+			attachRuntimeCmdOptions.templateValues,
 			attachRuntimeCmdOptions.templateFileValues)
 		if err != nil {
 			dieOnError(err)
@@ -120,7 +120,7 @@ var attachRuntimeCmd = &cobra.Command{
 		builder.Add(plugins.RuntimeAttachType)
 
 		values := s.BuildValues()
-		values = mergeMaps(values, templateValuesMap)		
+		values = mergeMaps(values, templateValuesMap)
 		spn := createSpinner("Attaching runtime to agent (might take a few seconds)", "")
 		spn.Start()
 		for _, p := range builder.Get() {

venonactl/cmd/cmdutils.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -25,9 +24,9 @@ import (
 	k8sApi "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/clientcmd"
 
+	"github.com/stretchr/objx"
 	cliValues "helm.sh/helm/v3/pkg/cli/values"
 	"helm.sh/helm/v3/pkg/getter"
-	"github.com/stretchr/objx"	
 )
 
 var (
@@ -230,24 +229,24 @@ func extendStoreWithAgentAPI(logger logger.Logger, token string, agentID string)
 // Parsing helpers --set-value , --set-file
 // by https://github.com/helm/helm/blob/ec1d1a3d3eb672232f896f9d3b3d0797e4f519e3/pkg/cli/values/options.go#L41
 
-// templateValuesToMap - processes cmd --values <values-file.yaml> --set-value k=v --set-file v=<context-of-file> 
+// templateValuesToMap - processes cmd --values <values-file.yaml> --set-value k=v --set-file v=<context-of-file>
 // using helm libraries
 func templateValuesToMap(templateValueFiles, templateValues, templateFileValues []string) (map[string]interface{}, error) {
 	valueOpts := &cliValues.Options{}
 	if len(templateValueFiles) > 0 {
-		for _, v := range(templateValueFiles) {
+		for _, v := range templateValueFiles {
 			valueOpts.ValueFiles = append(valueOpts.ValueFiles, v)
 		}
 	}
-	
+
 	if len(templateValues) > 0 {
-		for _, v := range(templateValues) {
+		for _, v := range templateValues {
 			valueOpts.Values = append(valueOpts.Values, v)
-		}			
+		}
 	}
-	
+
 	if len(templateFileValues) > 0 {
-		for _, v := range(templateFileValues) {
+		for _, v := range templateFileValues {
 			valueOpts.FileValues = append(valueOpts.FileValues, v)
 		}
 	}
@@ -275,24 +274,33 @@ func mergeMaps(a, b map[string]interface{}) map[string]interface{} {
 }
 
 // mergeValueStr - for merging cli parameters with mapped parameters
-func mergeValueStr(valuesMap map[string]interface{}, key string, param *string) {
+func mergeValueStr(valuesMap map[string]interface{}, key string, param *string, defaultValue ...string) {
 	mapX := objx.New(valuesMap)
 	if param != nil && *param != "" {
 		mapX.Set(key, *param)
-	    return
-    }
-    val := mapX.Get(key).String()
-    *param = val
+		return
+	}
+	val := mapX.Get(key).Str(defaultValue...)
+	*param = val
 }
 
 // mergeValueBool - for merging cli parameters with mapped parameters
 func mergeValueBool(valuesMap map[string]interface{}, key string, param *bool) {
 	mapX := objx.New(valuesMap)
-	if param != nil ||*param == true {
+	if param != nil || *param == true {
 		mapX.Set(key, *param)
 		return
 	}
 	val := mapX.Get(key).Bool()
 	*param = val
 }
 
+func mergeValueMSI(valuesMap map[string]interface{}, key string, param *map[string]interface{}, defaultValue ...map[string]interface{}) {
+	mapX := objx.New(valuesMap)
+	if param != nil && len(*param) > 0 {
+		mapX.Set(key, *param)
+		return
+	}
+	val := mapX.Get(key).MSI(defaultValue...)
+	*param = val
+}

venonactl/cmd/install-agent.go

@@ -49,6 +49,7 @@ var installAgentCmdOptions struct {
 	templateValues       []string
 	templateFileValues   []string
 	templateValueFiles   []string
+	resources            map[string]interface{}
 }
 
 var installAgentCmd = &cobra.Command{
@@ -79,6 +80,8 @@ var installAgentCmd = &cobra.Command{
 		mergeValueStr(templateValuesMap, "AgentId", &installAgentCmdOptions.agentID)
 		mergeValueStr(templateValuesMap, "Image.Tag", &installAgentCmdOptions.venona.version)
 
+		mergeValueMSI(templateValuesMap, "Runner.resources", &installAgentCmdOptions.resources)
+
 		//mergeValueStrArray(&installAgentCmdOptions.envVars, "envVars", nil, "More env vars to be declared \"key=value\"")
 
 		mergeValueBool(templateValuesMap, "InCluster", &installAgentCmdOptions.kube.inCluster)
@@ -111,6 +114,7 @@ var installAgentCmd = &cobra.Command{
 		}
 
 		fillKubernetesAPI(lgr, installAgentCmdOptions.kube.context, installAgentCmdOptions.kube.namespace, false)
+		s.Runner.Resources = installAgentCmdOptions.resources
 
 		s.KubernetesAPI.Tolerations = tolerations
 

venonactl/cmd/install-app-proxy.go

@@ -28,12 +28,30 @@ var installAppProxyCmdOptions struct {
 		namespace string
 		context   string
 	}
+	templateValues     []string
+	templateFileValues []string
+	templateValueFiles []string
+	resources          map[string]interface{}
 }
 
 var installAppProxyCmd = &cobra.Command{
 	Use:   "app-proxy",
 	Short: "Install App proxy ",
 	Run: func(cmd *cobra.Command, args []string) {
+
+		templateValuesMap, err := templateValuesToMap(
+			installAppProxyCmdOptions.templateValueFiles,
+			installAppProxyCmdOptions.templateValues,
+			installAppProxyCmdOptions.templateFileValues)
+		if err != nil {
+			dieOnError(err)
+		}
+
+		mergeValueStr(templateValuesMap, "Namespace", &installAppProxyCmdOptions.kube.namespace)
+		mergeValueStr(templateValuesMap, "Context", &installAppProxyCmdOptions.kube.context)
+
+		mergeValueMSI(templateValuesMap, "AppProxy.resources", &installAppProxyCmdOptions.resources)
+
 		s := store.GetStore()
 		lgr := createLogger("Install-agent", verbose, logFormatter)
 		buildBasicStore(lgr)
@@ -44,21 +62,22 @@ var installAppProxyCmd = &cobra.Command{
 		builderInstallOpt := &plugins.InstallOptions{
 			CodefreshHost: cfAPIHost,
 		}
-
+		s.AppProxy.Resources = installAppProxyCmdOptions.resources
 		extendStoreWithKubeClient(lgr)
 		fillCodefreshAPI(lgr)
 		fillKubernetesAPI(lgr, installAppProxyCmdOptions.kube.context, installAppProxyCmdOptions.kube.namespace, false)
 		s.AgentAPI = &store.AgentAPI{
 			Token: "",
 			Id:    "",
 		}
+
 		builderInstallOpt.ClusterName = s.KubernetesAPI.ContextName
 		builderInstallOpt.KubeBuilder = getKubeClientBuilder(builderInstallOpt.ClusterName, s.KubernetesAPI.Namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster)
 		builderInstallOpt.ClusterNamespace = s.KubernetesAPI.Namespace
 		builder.Add(plugins.AppProxyPluginType)
 
 		values := s.BuildValues()
-		var err error
+		values = mergeMaps(values, templateValuesMap)
 		spn := createSpinner("Installing app proxy (might take a few minutes)", "")
 		spn.Start()
 		defer spn.Stop()
@@ -79,4 +98,6 @@ func init() {
 	installCommand.AddCommand(installAppProxyCmd)
 	installAppProxyCmd.Flags().StringVar(&installAppProxyCmdOptions.kube.namespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which venona should be installed [$KUBE_NAMESPACE]")
 	installAppProxyCmd.Flags().StringVar(&installAppProxyCmdOptions.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]")
+	installAppProxyCmd.Flags().StringArrayVarP(&installAppProxyCmdOptions.templateValueFiles, "values", "f", []string{}, "specify values in a YAML file")
+
 }

venonactl/cmd/install-monitor.go

@@ -23,7 +23,6 @@ import (
 	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-
 )
 
 var installMonitorAgentCmdOptions struct {
@@ -32,25 +31,26 @@ var installMonitorAgentCmdOptions struct {
 		context      string
 		nodeSelector string
 	}
-	clusterId      string
-	helm3          bool
-	codefreshToken string
-	codefreshHost  string
-	dockerRegistry string
-	templateValues         []string
-	templateFileValues     []string
-	templateValueFiles     []string
+	clusterId          string
+	helm3              bool
+	codefreshToken     string
+	codefreshHost      string
+	dockerRegistry     string
+	templateValues     []string
+	templateFileValues []string
+	templateValueFiles []string
+	resources          map[string]interface{}
 }
 
 // installK8sAgentCmd represents the install command
 var installMonitorAgentCmd = &cobra.Command{
 	Use:   "monitor",
 	Short: "Install Codefresh's monitor agent on cluster",
 	Run: func(cmd *cobra.Command, args []string) {
-		// get valuesMap from --values <values.yaml> --set-value k=v --set-file k=<context-of file> 
+		// get valuesMap from --values <values.yaml> --set-value k=v --set-file k=<context-of file>
 		templateValuesMap, err := templateValuesToMap(
-			installMonitorAgentCmdOptions.templateValueFiles, 
-			installMonitorAgentCmdOptions.templateValues, 
+			installMonitorAgentCmdOptions.templateValueFiles,
+			installMonitorAgentCmdOptions.templateValues,
 			installMonitorAgentCmdOptions.templateFileValues)
 		if err != nil {
 			dieOnError(err)
@@ -64,6 +64,8 @@ var installMonitorAgentCmd = &cobra.Command{
 		mergeValueStr(templateValuesMap, "Namespace", &installMonitorAgentCmdOptions.kube.namespace)
 		mergeValueStr(templateValuesMap, "Context", &installMonitorAgentCmdOptions.kube.context)
 
+		mergeValueMSI(templateValuesMap, "Monitor.resources", &installMonitorAgentCmdOptions.resources)
+
 		mergeValueStr(templateValuesMap, "DockerRegistry", &installMonitorAgentCmdOptions.dockerRegistry)
 		mergeValueStr(templateValuesMap, "ClusterId", &installMonitorAgentCmdOptions.clusterId)
 		mergeValueBool(templateValuesMap, "helm3", &installMonitorAgentCmdOptions.helm3)
@@ -74,6 +76,7 @@ var installMonitorAgentCmd = &cobra.Command{
 		buildBasicStore(lgr)
 		extendStoreWithKubeClient(lgr)
 		fillKubernetesAPI(lgr, installMonitorAgentCmdOptions.kube.context, installMonitorAgentCmdOptions.kube.namespace, false)
+		s.Monitor.Resources = installMonitorAgentCmdOptions.resources
 
 		builder := plugins.NewBuilder(lgr)
 		builder.Add(plugins.MonitorAgentPluginType)

venonactl/cmd/install-runtime.go

@@ -23,7 +23,6 @@ import (
 	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-
 )
 
 var installRuntimeCmdOptions struct {
@@ -44,17 +43,19 @@ var installRuntimeCmdOptions struct {
 	templateValues         []string
 	templateFileValues     []string
 	templateValueFiles     []string
+	volumeProvisioner      map[string]interface{}
+	localVolumeMonitor     map[string]interface{}
 }
 
 var installRuntimeCmd = &cobra.Command{
 	Use:   "runtime",
 	Short: "Install Codefresh's runtime",
 	Run: func(cmd *cobra.Command, args []string) {
 
-		// get valuesMap from --values <values.yaml> --set-value k=v --set-file k=<context-of file> 
+		// get valuesMap from --values <values.yaml> --set-value k=v --set-file k=<context-of file>
 		templateValuesMap, err := templateValuesToMap(
-			installRuntimeCmdOptions.templateValueFiles, 
-			installRuntimeCmdOptions.templateValues, 
+			installRuntimeCmdOptions.templateValueFiles,
+			installRuntimeCmdOptions.templateValues,
 			installRuntimeCmdOptions.templateFileValues)
 		if err != nil {
 			dieOnError(err)
@@ -63,7 +64,7 @@ var installRuntimeCmd = &cobra.Command{
 		mergeValueStr(templateValuesMap, "ConfigPath", &kubeConfigPath)
 		mergeValueStr(templateValuesMap, "CodefreshHost", &cfAPIHost)
 		mergeValueStr(templateValuesMap, "Token", &cfAPIToken)
-		mergeValueStr(templateValuesMap, "Token", &installRuntimeCmdOptions.codefreshToken)		
+		mergeValueStr(templateValuesMap, "Token", &installRuntimeCmdOptions.codefreshToken)
 
 		mergeValueStr(templateValuesMap, "Namespace", &installRuntimeCmdOptions.kube.namespace)
 		mergeValueStr(templateValuesMap, "Context", &installRuntimeCmdOptions.kube.context)
@@ -73,12 +74,24 @@ var installRuntimeCmd = &cobra.Command{
 		//mergeValueStrArray(&installAgentCmdOptions.envVars, "envVars", nil, "More env vars to be declared \"key=value\"")
 		mergeValueStr(templateValuesMap, "DockerRegistry", &installRuntimeCmdOptions.dockerRegistry)
 		mergeValueStr(templateValuesMap, "StorageClass", &installRuntimeCmdOptions.storageClass)
-		
+
+		defaultVolumeProvResources := map[string]interface{}{
+			"limits": map[string]string{
+				"cpu":    "1000m",
+				"memory": "6000Mi",
+			},
+			"requests": map[string]string{
+				"cpu":    "200m",
+				"memory": "200Mi",
+			},
+		}
+		mergeValueMSI(templateValuesMap, "Storage.VolumeProvisioner.resources", &installRuntimeCmdOptions.volumeProvisioner, defaultVolumeProvResources)
+		mergeValueMSI(templateValuesMap, "Storage.LocalVolumeMonitor.resources", &installRuntimeCmdOptions.localVolumeMonitor)
+
 		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)
 		buildBasicStore(lgr)
@@ -140,6 +153,8 @@ var installRuntimeCmd = &cobra.Command{
 		}
 
 		fillKubernetesAPI(lgr, installRuntimeCmdOptions.kube.context, installRuntimeCmdOptions.kube.namespace, installRuntimeCmdOptions.kube.inCluster)
+		s.VolumeProvisioner.Resources = installRuntimeCmdOptions.volumeProvisioner
+		s.LocalVolumeMonitor.Resources = installRuntimeCmdOptions.localVolumeMonitor
 
 		if installRuntimeCmdOptions.dryRun {
 			s.DryRun = installRuntimeCmdOptions.dryRun

venonactl/cmd/install.go

@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import (
-
 	"github.com/spf13/cobra"
 )
 

venonactl/cmd/migrate.go

@@ -17,7 +17,6 @@ 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"
@@ -26,7 +25,7 @@ import (
 
 var migrateCmdOpt struct {
 	kube struct {
-		context string
+		context   string
 		namespace string
 	}
 }
@@ -52,10 +51,10 @@ var migrateCmd = &cobra.Command{
 		spn.Start()
 		defer spn.Stop()
 		for _, p := range builder.Get() {
-			err := p.Migrate( &plugins.MigrateOptions{
+			err := p.Migrate(&plugins.MigrateOptions{
 				ClusterNamespace: migrateCmdOpt.kube.namespace,
-				ClusterName: migrateCmdOpt.kube.context,
-				KubeBuilder: getKubeClientBuilder(migrateCmdOpt.kube.context, migrateCmdOpt.kube.namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster),
+				ClusterName:      migrateCmdOpt.kube.context,
+				KubeBuilder:      getKubeClientBuilder(migrateCmdOpt.kube.context, migrateCmdOpt.kube.namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster),
 			}, values)
 			if err != nil {
 				dieOnError(err)