CR-9099 editable ingress host (#240)

* editable ingress host

* docs update

* bump

* lint + added loadBalancer condition

* skip cert validation for http host

* bump

* fixes

Author: rotem-codefresh

cmd/commands/common.go

@@ -420,7 +420,24 @@ func getKubeContextNameFromUserSelect(cmd *cobra.Command, kubeContextName *strin
 	return nil
 }
 
-func getIngressHostFromCluster(ctx context.Context, opts *RuntimeInstallOptions) error {
+func getIngressHostFromUserInput(ctx context.Context, opts *RuntimeInstallOptions, foundIngressHost string) error {
+	ingressHostPrompt := promptui.Prompt{
+		Label: "Ingress host",
+		Default: foundIngressHost,
+		Pointer: promptui.PipeCursor,
+	}
+
+	ingressHostInput, err := ingressHostPrompt.Run()
+	if err != nil {
+		return fmt.Errorf("Prompt error: %w", err)
+	}
+
+	opts.IngressHost = ingressHostInput
+
+	return nil
+}
+
+func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 	log.G(ctx).Info("Retrieving ingress controller info from your cluster...\n")
 
 	cs := opts.KubeFactory.KubernetesClientSetOrDie()
@@ -429,27 +446,46 @@ func getIngressHostFromCluster(ctx context.Context, opts *RuntimeInstallOptions)
 		return fmt.Errorf("failed to get ingress controller info from your cluster: %w", err)
 	}
 
+	var foundIngressHost string
+
 	for _, s := range ServicesList.Items {
-		if s.ObjectMeta.Name == opts.IngressController {
+		if s.ObjectMeta.Name == opts.IngressController && s.Spec.Type == "LoadBalancer" {
 			ingress := s.Status.LoadBalancer.Ingress[0]
 			if ingress.Hostname != "" {
-				opts.IngressHost = fmt.Sprintf("https://%s", ingress.Hostname)
+				foundIngressHost = fmt.Sprintf("https://%s", ingress.Hostname)
+				break
 			} else {
-				opts.IngressHost = fmt.Sprintf("https://%s", ingress.IP)
+				foundIngressHost = fmt.Sprintf("https://%s", ingress.IP)
+				break
 			}
-			break
+		}
+	}
+
+	if store.Get().Silent {
+		log.G(ctx).Warnf("Using ingress host %s", foundIngressHost)
+		opts.IngressHost = foundIngressHost
+	} else {
+		err = getIngressHostFromUserInput(ctx, opts, foundIngressHost)
+		if err != nil {
+			return err
 		}
 	}
 
 	if opts.IngressController == "" {
-		return fmt.Errorf("failed to fetch ingress host from the cluster. please make sure you have a nginx ingress controller installed properly")
+		return fmt.Errorf("please provide an ingress host via --ingress-host or installation wizard")
 	}
 
 	return nil
 }
 
 func checkIngressHostCertificate(ctx context.Context, ingress string) (bool, error) {
-	var err error
+	match, err := regexp.MatchString("http:", ingress)
+	if err != nil {
+		return false, err
+	}
+	if match {
+		return true, nil
+	}
 
 	res, err := http.Get(ingress)
 

cmd/commands/runtime.go

@@ -232,7 +232,6 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	installationOpts.KubeFactory = kube.AddFlags(cmd.Flags())
 
 	util.Die(cmd.Flags().MarkHidden("bypass-ingress-class-check"))
-	util.Die(cmd.Flags().MarkHidden("ingress-host"))
 
 	return cmd
 }
@@ -273,7 +272,7 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 	err = ensureIngressClass(cmd.Context(), opts)
 	handleCliStep(reporter.InstallStepPreCheckEnsureIngressClass, "Getting ingress class", err, false)
 	if err != nil {
-		return util.DecorateErrorWithDocsLink(err, store.Get().RequirementsLink)
+		return err
 	}
 
 	err = ensureIngressHost(cmd, opts)
@@ -393,12 +392,10 @@ func runtimeUpgradeCommandPreRunHandler(cmd *cobra.Command, args []string, opts
 }
 
 func ensureIngressHost(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
-	if opts.IngressHost != "" { // ingress host provided by hidden flag (for our tests)
-		return nil
-	}
-
-	if err := getIngressHostFromCluster(cmd.Context(), opts); err != nil {
-		return err
+	if opts.IngressHost == "" { // ingress host not provided by flag
+		if err := setIngressHost(cmd.Context(), opts); err != nil {
+			return err
+		}
 	}
 
 	log.G(cmd.Context()).Infof("Using ingress host: %s", opts.IngressHost)

docs/commands/cli-v2_runtime_install.md

@@ -38,6 +38,7 @@ cli-v2 runtime install [runtime_name] [flags]
   -u, --git-user string            Your git provider user name [GIT_USER] (not required in GitHub)
   -h, --help                       help for install
       --ingress-class string       The ingress class name
+      --ingress-host string        The ingress host
       --kubeconfig string          Path to the kubeconfig file to use for CLI requests.
   -n, --namespace string           If present, the namespace scope for this CLI request
       --provider string            The git provider, one of: gitea|github|gitlab