Add validation to block usage of --ingress-host flag together with --… (#648)

* Add validation to block usage of --ingress-host flag together with --access-mode=tunnel

* fix according to code review

Author: danielm-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.1.10
+VERSION=v0.1.11
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/runtime_install.go

@@ -109,7 +109,6 @@ type (
 		IpsAllowList                   string
 		SkipIngress                    bool
 		BypassIngressClassCheck        bool
-		DownloadRuntimeDef             *runtime.Runtime
 
 		versionStr        string
 		kubeContext       string
@@ -196,11 +195,15 @@ func NewRuntimeInstallCommand() *cobra.Command {
 
 			createAnalyticsReporter(ctx, reporter.InstallFlow, installationOpts.DisableTelemetry)
 
-			if (accessMode != "") {
+			if accessMode != "" {
 				installationOpts.AccessMode = platmodel.AccessMode(strings.ToUpper(accessMode))
 				if !installationOpts.AccessMode.IsValid() {
 					return fmt.Errorf("invalid access-mode %s, must be one of: ingress|tunnel", accessMode)
 				}
+
+				if installationOpts.AccessMode == platmodel.AccessModeTunnel && installationOpts.IngressHost != "" {
+					return fmt.Errorf("ingress host can't be set when access mode is Tunnel")
+				}
 			}
 
 			err := runtimeInstallCommandPreRunHandler(cmd, installationOpts)
@@ -394,7 +397,6 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 
 	opts.Insecure = true // installs argo-cd in insecure mode, we need this so that the eventsource can talk to the argocd-server with http
 	opts.CommonConfig = &runtime.CommonConfig{CodefreshBaseURL: cfConfig.GetCurrentContext().URL}
-	opts.DownloadRuntimeDef = rt
 
 	return nil
 }
@@ -1145,7 +1147,11 @@ func preInstallationChecks(ctx context.Context, opts *RuntimeInstallOptions) (*r
 		return nil, err
 	}
 
-	rt := opts.DownloadRuntimeDef
+	runtimeDef := getRuntimeDef(opts.runtimeDef, opts.versionStr)
+	rt, err := runtime.Download(runtimeDef, opts.RuntimeName, opts.featuresToInstall)
+	if err != nil {
+		return nil, fmt.Errorf("failed to download runtime definition: %w", err)
+	}
 
 	handleCliStep(reporter.InstallStepRunPreCheckEnsureCliVersion, "Checking CLI version", err, true, false)
 	if err != nil {

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.10/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.11/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.10/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.11/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf