improved values yaml (#202)

* improved values yaml

Author: roi-codefresh

venonactl/cmd/install-app-proxy.go

@@ -37,6 +37,7 @@ var installAppProxyCmdOptions struct {
 	resources          map[string]interface{}
 	host               string
 	ingressClass       string
+	dryRun             bool
 }
 
 var installAppProxyCmd = &cobra.Command{
@@ -55,10 +56,9 @@ var installAppProxyCmd = &cobra.Command{
 		mergeValueStr(templateValuesMap, "CodefreshHost", &cfAPIHost)
 		mergeValueStr(templateValuesMap, "Namespace", &installAppProxyCmdOptions.kube.namespace)
 		mergeValueStr(templateValuesMap, "Context", &installAppProxyCmdOptions.kube.context)
-		mergeValueStr(templateValuesMap, "AppProxy.Host", &installAppProxyCmdOptions.host)
-		mergeValueStr(templateValuesMap, "AppProxy.IngressClass", &installAppProxyCmdOptions.ingressClass)
+		mergeValueStr(templateValuesMap, "AppProxy.Ingress.Host", &installAppProxyCmdOptions.host)
+		mergeValueStr(templateValuesMap, "AppProxy.Ingress.IngressClass", &installAppProxyCmdOptions.ingressClass)
 		mergeValueStr(templateValuesMap, "DockerRegistry", &installAppProxyCmdOptions.dockerRegistry)
-
 		mergeValueMSI(templateValuesMap, "AppProxy.resources", &installAppProxyCmdOptions.resources)
 
 		s := store.GetStore()
@@ -73,6 +73,7 @@ var installAppProxyCmd = &cobra.Command{
 		}
 		builderInstallOpt := &plugins.InstallOptions{
 			CodefreshHost: cfAPIHost,
+			DryRun:        installAppProxyCmdOptions.dryRun,
 		}
 		s.AppProxy.Resources = installAppProxyCmdOptions.resources
 		s.DockerRegistry = installAppProxyCmdOptions.dockerRegistry
@@ -112,5 +113,7 @@ func init() {
 	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")
+	installAppProxyCmd.Flags().StringArrayVar(&installAppProxyCmdOptions.templateFileValues, "set-file", []string{}, "Set values for templates from file")
 	installAppProxyCmd.Flags().StringArrayVar(&installAppProxyCmdOptions.templateValues, "set-value", []string{}, "Set values for templates, example: --set-value LocalVolumesDir=/mnt/disks/ssd0/codefresh-volumes")
+	installAppProxyCmd.Flags().BoolVar(&installAppProxyCmdOptions.dryRun, "dry-run", false, "Set to true to simulate installation")
 }

venonactl/cmd/install-monitor.go

@@ -40,6 +40,7 @@ var installMonitorAgentCmdOptions struct {
 	templateFileValues []string
 	templateValueFiles []string
 	resources          map[string]interface{}
+	dryRun             bool
 }
 
 // installK8sAgentCmd represents the install command
@@ -83,6 +84,7 @@ var installMonitorAgentCmd = &cobra.Command{
 
 		builderInstallOpt := &plugins.InstallOptions{
 			ClusterNamespace: s.KubernetesAPI.Namespace,
+			DryRun:           installMonitorAgentCmdOptions.dryRun,
 		}
 
 		builderInstallOpt.KubeBuilder = getKubeClientBuilder(s.KubernetesAPI.ContextName, s.KubernetesAPI.Namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster)
@@ -137,7 +139,7 @@ func init() {
 	installMonitorAgentCmd.Flags().StringVar(&installMonitorAgentCmdOptions.dockerRegistry, "docker-registry", "", "The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry=\"docker.io\"")
 
 	installMonitorAgentCmd.Flags().StringVar(&installMonitorAgentCmdOptions.codefreshHost, "codefreshHost", "", "Override codefresh host if you use your own codefresh installation")
-
+	installMonitorAgentCmd.Flags().BoolVar(&installMonitorAgentCmdOptions.dryRun, "dry-run", false, "Set to true to simulate installation")
 	installMonitorAgentCmd.Flags().BoolVar(&installMonitorAgentCmdOptions.helm3, "helm3", false, "Set flag if cluster use helm3")
 	installMonitorAgentCmd.Flags().StringArrayVar(&installMonitorAgentCmdOptions.templateValues, "set-value", []string{}, "Set values for templates, example: --set-value LocalVolumesDir=/mnt/disks/ssd0/codefresh-volumes")
 	installMonitorAgentCmd.Flags().StringArrayVar(&installMonitorAgentCmdOptions.templateFileValues, "set-file", []string{}, "Set values for templates from file, example: --set-file Storage.GoogleServiceAccount=/path/to/service-account.json")