CR-9052 ingress host from cluster (#228)

* getting ingress host from cluster

* bump

* small fix

* add info log

* docs update

* take ingress controller from class spec

* take services from all ns

* improved logs

Author: rotem-codefresh

Makefile

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

cmd/commands/common.go

@@ -33,6 +33,7 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
 	"github.com/manifoldco/promptui"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/spf13/cobra"
@@ -81,8 +82,9 @@ func IsValidName(s string) (bool, error) {
 	return regexp.MatchString(`^[a-z]([-a-z0-9]{0,61}[a-z0-9])?$`, s)
 }
 
-func IsValidIngressHost(ingress string) (bool, error) {
-	return regexp.MatchString(`^(http|https)://`, ingress)
+func getControllerName(s string) string {
+	split := strings.Split(s, "/")
+	return split[1]
 }
 
 func askUserIfToInstallDemoResources(cmd *cobra.Command, sampleInstall *bool) error {
@@ -360,44 +362,31 @@ func getKubeContextNameFromUserSelect(cmd *cobra.Command, kubeContextName *strin
 	return nil
 }
 
-func getIngressHostFromUserInput(cmd *cobra.Command, ingressHost *string) error {
-	if ingressHost != nil && *ingressHost != "" {
-		*ingressHost = strings.TrimSpace(*ingressHost)
-		return nil
-	}
-
-	if store.Get().Silent {
-		return fmt.Errorf("missing ingress host")
-	}
-
-	ingressHostPrompt := promptui.Prompt{
-		Label: "Ingress host (required)",
-	}
+func getIngressHostFromCluster(ctx context.Context, opts *RuntimeInstallOptions) error {
+	log.G(ctx).Info("Retrieving ingress controller info from your cluster...\n")
 
-	ingressHostInput, err := ingressHostPrompt.Run()
+	cs := opts.KubeFactory.KubernetesClientSetOrDie()
+	ServicesList, err := cs.CoreV1().Services("").List(ctx, metav1.ListOptions{})
 	if err != nil {
-		return fmt.Errorf("Prompt error: %w", err)
+		return fmt.Errorf("failed to get ingress controller info from your cluster: %w", err)
 	}
 
-	ingressHostInput = strings.TrimSpace(ingressHostInput)
-	if ingressHostInput == "" {
-		return fmt.Errorf("missing ingress host")
+	for _, s := range ServicesList.Items {
+		if s.ObjectMeta.Name == opts.IngressController {
+			opts.IngressHost = fmt.Sprintf("https://%s", s.Status.LoadBalancer.Ingress[0].Hostname)
+			break
+		}
 	}
 
-	die(cmd.Flags().Set("ingress-host", ingressHostInput))
-	*ingressHost = ingressHostInput
+	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 nil
 }
 
 func checkIngressHostCertificate(ctx context.Context, ingress string) (bool, error) {
 	var err error
-	match, _ := regexp.MatchString(`^http://`, ingress)
-	if match { //if user provided http ingress
-		log.G(ctx).Warn("The ingress host uses an insecure protocol. The browser may block subsequent runtime requests from the UI unless explicitly approved.")
-
-		return true, nil
-	}
 
 	res, err := http.Get(ingress)
 
@@ -459,7 +448,7 @@ func askUserIfToProceedWithInsecure(ctx context.Context) error {
 		Selected: "{{ . | yellow }} ",
 	}
 
-	log.G(ctx).Warnf("The provided ingressHost does not have a valid certificate.")
+	log.G(ctx).Warnf("The ingress host does not have a valid certificate.")
 	labelStr := fmt.Sprintf("%vDo you wish to continue the installation with insecure ingress host mode?%v", CYAN, COLOR_RESET)
 
 	prompt := promptui.Select{

cmd/commands/runtime.go

@@ -74,6 +74,7 @@ type (
 		RuntimeStoreIV       string
 		IngressHost          string
 		IngressClass         string
+		IngressController    string
 		Insecure             bool
 		InstallDemoResources bool
 		Version              *semver.Version
@@ -190,7 +191,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 				"Runtime name":              installationOpts.RuntimeName,
 				"Repository URL":            installationOpts.InsCloneOpts.Repo,
 				"Ingress host":              installationOpts.IngressHost,
-				"IngressClass":              installationOpts.IngressClass,
+				"Ingress class":              installationOpts.IngressClass,
 				"Installing demo resources": strconv.FormatBool(installationOpts.InstallDemoResources),
 			}
 
@@ -225,8 +226,8 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	})
 	installationOpts.KubeFactory = kube.AddFlags(cmd.Flags())
 
-	util.Die(cmd.MarkFlagRequired("ingress-host"))
 	util.Die(cmd.Flags().MarkHidden("bypass-ingress-class-check"))
+	util.Die(cmd.Flags().MarkHidden("ingress-host"))
 
 	return cmd
 }
@@ -282,20 +283,20 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 		return err
 	}
 
-	err = ensureRepo(cmd, opts.RuntimeName, opts.InsCloneOpts, false)
-	handleCliStep(reporter.InstallStepPreCheckEnsureRuntimeRepo, "Getting runtime repo", err, false)
+	err = ensureIngressHost(cmd, opts)
+	handleCliStep(reporter.InstallStepPreCheckEnsureIngressHost, "Getting ingressHost", err, false)
 	if err != nil {
 		return err
 	}
 
-	err = ensureGitToken(cmd, opts.InsCloneOpts)
-	handleCliStep(reporter.InstallStepPreCheckEnsureGitToken, "Getting git token", err, false)
+	err = ensureRepo(cmd, opts.RuntimeName, opts.InsCloneOpts, false)
+	handleCliStep(reporter.InstallStepPreCheckEnsureRuntimeRepo, "Getting runtime repo", err, false)
 	if err != nil {
 		return err
 	}
 
-	err = ensureIngressHost(cmd, opts)
-	handleCliStep(reporter.InstallStepPreCheckEnsureIngressHost, "Getting ingressHost", err, false)
+	err = ensureGitToken(cmd, opts.InsCloneOpts)
+	handleCliStep(reporter.InstallStepPreCheckEnsureGitToken, "Getting git token", err, false)
 	if err != nil {
 		return err
 	}
@@ -381,17 +382,18 @@ func runtimeUpgradeCommandPreRunHandler(cmd *cobra.Command, args []string, clone
 }
 
 func ensureIngressHost(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
-	if err := getIngressHostFromUserInput(cmd, &opts.IngressHost); err != nil {
-		return err
+	if opts.IngressHost != "" { // ingress host provided by hidden flag (for our tests)
+		return nil
 	}
 
-	isValid, err := IsValidIngressHost(opts.IngressHost)
-	if err != nil {
-		log.G(cmd.Context()).Fatal("failed to check the validity of the ingress host")
-	} else if !isValid {
-		log.G(cmd.Context()).Fatal("ingress host must begin with a protocol http:// or https://")
+	if err := getIngressHostFromCluster(cmd.Context(), opts); err != nil {
+		return err
 	}
 
+	log.G(cmd.Context()).Infof("Using ingress host: %s", opts.IngressHost)
+
+	log.G(cmd.Context()).Info("Validating ingress host")
+
 	certValid, err := checkIngressHostCertificate(cmd.Context(), opts.IngressHost)
 	if err != nil {
 		log.G(cmd.Context()).Fatalf("failed to check ingress host: %v", err)
@@ -410,8 +412,8 @@ func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error
 	if store.Get().BypassIngressClassCheck {
 		return nil
 	}
-	
-	fmt.Print("Retrieving ingress class info from your cluster...\n")
+
+	log.G(ctx).Info("Retrieving ingress class info from your cluster...\n")
 
 	cs := opts.KubeFactory.KubernetesClientSetOrDie()
 	ingressClassList, err := cs.NetworkingV1().IngressClasses().List(ctx, metav1.ListOptions{})
@@ -420,18 +422,21 @@ func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error
 	}
 
 	var ingressClassNames []string
+	ingressClassNameToController := make(map[string]string)
 	var isValidClass bool
 	for _, ic := range ingressClassList.Items {
 		if ic.ObjectMeta.Labels["app.kubernetes.io/name"] == "ingress-nginx" {
 			ingressClassNames = append(ingressClassNames, ic.Name)
+			ingressClassNameToController[ic.Name] = fmt.Sprintf("%s-controller", getControllerName(ic.Spec.Controller))
 			if opts.IngressClass == ic.Name {
 				isValidClass = true
 			}
 		}
 	}
 
 	if opts.IngressClass != "" { //if user provided ingress class by flag
-		if isValidClass { 
+		if isValidClass {
+			opts.IngressController = ingressClassNameToController[opts.IngressClass]
 			return nil
 		}
 		return fmt.Errorf("Ingress Class '%s' is not supported. Only the ingress class of type NGINX is supported. for more information: %s", opts.IngressClass, store.Get().RequirementsLink)
@@ -444,11 +449,18 @@ func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error
 	if len(ingressClassNames) == 1 {
 		log.G(ctx).Info("Using ingress class: ", ingressClassNames[0])
 		opts.IngressClass = ingressClassNames[0]
+		opts.IngressController = ingressClassNameToController[opts.IngressClass]
 		return nil
 	}
 
 	if !store.Get().Silent {
-		return getIngressClassFromUserSelect(ctx, ingressClassNames, &opts.IngressClass)
+		err = getIngressClassFromUserSelect(ctx, ingressClassNames, &opts.IngressClass)
+		if err != nil {
+			return err
+		}
+
+		opts.IngressController = ingressClassNameToController[opts.IngressClass]
+		return nil
 	}
 
 	return fmt.Errorf("Please add the --ingress-class flag and define its value")

docs/commands/cli-v2_runtime_install.md

@@ -38,7 +38,6 @@ 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

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.0.209/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.210/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.0.209/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.210/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
     namespace: '{{ namespace }}'
 spec:
     defVersion: 1.0.0
-    version: 0.0.209
+    version: 0.0.210
     bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
     components:
         - name: events