CR-9612 support nginx enterprise version controller (#263)

* support "nginx-ingress" controller

* wip

* wip

* adjust ensureIngressClass to support controller types

* code duplicate fix

* create master and minions ingresses when using nginx enterprise

* small logic fix

* added logic to find community controller name

* adjust paths to master ingress

* small fix

* added costumize health check to argocd-cm

* refactoring

* restore bootstrapSpecifier

* refactoring

* some error convention fixing

* logic fix

* add warning message to nginx-enterprise users, removed customized health check

* bump

Author: rotem-codefresh

Makefile

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

cmd/commands/common.go

@@ -88,11 +88,6 @@ func isValidIngressHost(ingressHost string) (bool, error) {
 	return regexp.MatchString(`^(http|https)://`, ingressHost)
 }
 
-func getControllerName(s string) string {
-	split := strings.Split(s, "/")
-	return split[1]
-}
-
 func askUserIfToInstallDemoResources(cmd *cobra.Command, sampleInstall *bool) error {
 	if !store.Get().Silent && !cmd.Flags().Changed("demo-resources") {
 		templates := &promptui.SelectTemplates{
@@ -206,7 +201,7 @@ func getRuntimeNameFromUserSelect(ctx context.Context, runtimeName *string) erro
 		}
 
 		if len(runtimes) == 0 {
-			return fmt.Errorf("No runtimes were found")
+			return fmt.Errorf("no runtimes were found")
 		}
 
 		runtimeNames := make([]string, len(runtimes))
@@ -448,6 +443,9 @@ func validateIngressHost(ingressHost string) error {
 }
 
 func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
+	var foundIngressHost string
+	var foundHostName string
+
 	log.G(ctx).Info("Retrieving ingress controller info from your cluster...\n")
 
 	cs := opts.KubeFactory.KubernetesClientSetOrDie()
@@ -456,9 +454,6 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 		return fmt.Errorf("failed to get ingress controller info from your cluster: %w", err)
 	}
 
-	var foundIngressHost string
-	var foundHostName string
-
 	for _, s := range ServicesList.Items {
 		if s.ObjectMeta.Name == opts.IngressController && s.Spec.Type == "LoadBalancer" {
 			if len(s.Status.LoadBalancer.Ingress) > 0 {
@@ -479,10 +474,9 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 	}
 
 	if store.Get().Silent {
-		log.G(ctx).Warnf("Using ingress host %s", foundIngressHost)
 		opts.IngressHost = foundIngressHost
 	} else {
-		err = getIngressHostFromUserInput(ctx, opts, foundIngressHost)
+		err := getIngressHostFromUserInput(ctx, opts, foundIngressHost)
 		if err != nil {
 			return err
 		}

cmd/commands/git-source.go

@@ -52,16 +52,17 @@ import (
 
 type (
 	GitSourceCreateOptions struct {
-		InsCloneOpts        *git.CloneOptions
-		GsCloneOpts         *git.CloneOptions
-		GsName              string
-		RuntimeName         string
-		CreateDemoResources bool
-		Exclude             string
-		Include             string
-		HostName            string
-		IngressHost         string
-		IngressClass        string
+		InsCloneOpts          *git.CloneOptions
+		GsCloneOpts           *git.CloneOptions
+		GsName                string
+		RuntimeName           string
+		CreateDemoResources   bool
+		Exclude               string
+		Include               string
+		HostName              string
+		IngressHost           string
+		IngressClass          string
+		IngressControllerType ingressControllerType
 	}
 
 	GitSourceDeleteOptions struct {
@@ -85,12 +86,13 @@ type (
 	}
 
 	gitSourceGithubExampleOptions struct {
-		runtimeName  string
-		gsCloneOpts  *git.CloneOptions
-		gsFs         fs.FS
-		hostName     string
-		ingressHost  string
-		ingressClass string
+		runtimeName           string
+		gsCloneOpts           *git.CloneOptions
+		gsFs                  fs.FS
+		hostName              string
+		ingressHost           string
+		ingressClass          string
+		ingressControllerType ingressControllerType
 	}
 
 	dirConfig struct {
@@ -252,12 +254,13 @@ func createDemoResources(ctx context.Context, opts *GitSourceCreateOptions, gsRe
 		}
 
 		err = createGithubExamplePipeline(&gitSourceGithubExampleOptions{
-			runtimeName:  opts.RuntimeName,
-			gsCloneOpts:  opts.GsCloneOpts,
-			gsFs:         gsFs,
-			hostName:     opts.HostName,
-			ingressHost:  opts.IngressHost,
-			ingressClass: opts.IngressClass,
+			runtimeName:           opts.RuntimeName,
+			gsCloneOpts:           opts.GsCloneOpts,
+			gsFs:                  gsFs,
+			hostName:              opts.HostName,
+			ingressHost:           opts.IngressHost,
+			ingressClass:          opts.IngressClass,
+			ingressControllerType: opts.IngressControllerType,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
@@ -730,7 +733,7 @@ func createDemoWorkflowTemplate(gsFs fs.FS) error {
 func createGithubExamplePipeline(opts *gitSourceGithubExampleOptions) error {
 	if !store.Get().SkipIngress {
 		// Create an ingress that will manage external access to the github eventsource service
-		ingress := createGithubExampleIngress(opts.ingressClass, opts.ingressHost, opts.hostName)
+		ingress := createGithubExampleIngress(opts.ingressClass, opts.ingressHost, opts.hostName, opts.ingressControllerType)
 		ingressFilePath := opts.gsFs.Join(opts.gsCloneOpts.Path(), store.Get().GithubExampleIngressFileName)
 
 		ingressRedundanded, err := cleanUpFieldsIngressGithub(&ingress)
@@ -783,8 +786,8 @@ func createGithubExamplePipeline(opts *gitSourceGithubExampleOptions) error {
 	return nil
 }
 
-func createGithubExampleIngress(ingressClass string, ingressHost string, hostName string) *netv1.Ingress {
-	return ingressutil.CreateIngress(&ingressutil.CreateIngressOptions{
+func createGithubExampleIngress(ingressClass string, ingressHost string, hostName string, ingressControllerType ingressControllerType) *netv1.Ingress {
+	ingressOptions := ingressutil.CreateIngressOptions{
 		Name:             store.Get().CodefreshDeliveryPipelines,
 		IngressClassName: ingressClass,
 		Host:             hostName,
@@ -795,7 +798,15 @@ func createGithubExampleIngress(ingressClass string, ingressHost string, hostNam
 				ServiceName: store.Get().GithubExampleEventSourceObjectName + "-eventsource-svc",
 				ServicePort: store.Get().GithubExampleEventSourceServicePort,
 			},
-		}})
+		}}
+
+	if ingressControllerType == IngressControllerNginxEnterprise {
+		ingressOptions.Annotations = map[string]string{
+			"nginx.org/mergeable-ingress-type": "minion",
+		}
+	}
+
+	return ingressutil.CreateIngress(&ingressOptions)
 }
 
 func getRepoOwnerAndNameFromRepoURL(repoURL string) (owner string, name string) {