Cr 8871 - ALB support (#354)

danielm-codefresh · web-flow · commit 9a68d9cbbff2 · 2022-04-19T16:20:31.000+03:00
* initial commit

* Add ingressController field

* fix

* bump

* fixes according to code review

* Clean up ingress controller related logic

* bump
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.321
+VERSION=v0.0.322
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
diff --git a/cmd/commands/common.go b/cmd/commands/common.go
@@ -451,7 +451,7 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 	}
 
 	for _, s := range ServicesList.Items {
-		if s.ObjectMeta.Name == opts.IngressController && s.Spec.Type == "LoadBalancer" {
+		if s.ObjectMeta.Name == opts.IngressController.Name() && s.Spec.Type == "LoadBalancer" {
 			if len(s.Status.LoadBalancer.Ingress) > 0 {
 				ingress := s.Status.LoadBalancer.Ingress[0]
 				if ingress.Hostname != "" {
diff --git a/cmd/commands/git-source.go b/cmd/commands/git-source.go
@@ -53,17 +53,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
-		IngressControllerType ingressControllerType
+		InsCloneOpts        *git.CloneOptions
+		GsCloneOpts         *git.CloneOptions
+		GsName              string
+		RuntimeName         string
+		CreateDemoResources bool
+		Exclude             string
+		Include             string
+		HostName            string
+		IngressHost         string
+		IngressClass        string
+		IngressController   ingressutil.IngressController
 	}
 
 	GitSourceDeleteOptions struct {
@@ -87,13 +87,13 @@ type (
 	}
 
 	gitSourceGithubExampleOptions struct {
-		runtimeName           string
-		gsCloneOpts           *git.CloneOptions
-		gsFs                  fs.FS
-		hostName              string
-		ingressHost           string
-		ingressClass          string
-		ingressControllerType ingressControllerType
+		runtimeName       string
+		gsCloneOpts       *git.CloneOptions
+		gsFs              fs.FS
+		hostName          string
+		ingressHost       string
+		ingressClass      string
+		ingressController ingressutil.IngressController
 	}
 
 	dirConfig struct {
@@ -255,13 +255,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,
-			ingressControllerType: opts.IngressControllerType,
+			runtimeName:       opts.RuntimeName,
+			gsCloneOpts:       opts.GsCloneOpts,
+			gsFs:              gsFs,
+			hostName:          opts.HostName,
+			ingressHost:       opts.IngressHost,
+			ingressClass:      opts.IngressClass,
+			ingressController: opts.IngressController,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
@@ -742,7 +742,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, opts.ingressControllerType, opts.runtimeName)
+		ingress := createGithubExampleIngress(opts.ingressClass, opts.ingressHost, opts.hostName, opts.ingressController, opts.runtimeName)
 		ingressFilePath := opts.gsFs.Join(opts.gsCloneOpts.Path(), store.Get().GithubExampleIngressFileName)
 
 		ingressRedundanded, err := cleanUpFieldsIngressGithub(&ingress)
@@ -795,7 +795,7 @@ func createGithubExamplePipeline(opts *gitSourceGithubExampleOptions) error {
 	return nil
 }
 
-func createGithubExampleIngress(ingressClass string, ingressHost string, hostName string, ingressControllerType ingressControllerType, runtimeName string) *netv1.Ingress {
+func createGithubExampleIngress(ingressClass string, ingressHost string, hostName string, ingressController ingressutil.IngressController, runtimeName string) *netv1.Ingress {
 	ingressOptions := ingressutil.CreateIngressOptions{
 		Name:             store.Get().CodefreshDeliveryPipelines,
 		IngressClassName: ingressClass,
@@ -809,13 +809,10 @@ func createGithubExampleIngress(ingressClass string, ingressHost string, hostNam
 			},
 		}}
 
-	if ingressControllerType == IngressControllerNginxEnterprise {
-		ingressOptions.Annotations = map[string]string{
-			"nginx.org/mergeable-ingress-type": "minion",
-		}
-	}
+	ingress := ingressutil.CreateIngress(&ingressOptions)
+	ingressController.Decorate(ingress)
 
-	return ingressutil.CreateIngress(&ingressOptions)
+	return ingress
 }
 
 func getRepoOwnerAndNameFromRepoURL(repoURL string) (owner string, name string) {
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -84,8 +84,7 @@ type (
 		HostName                       string
 		IngressHost                    string
 		IngressClass                   string
-		IngressController              string
-		IngressControllerType          ingressControllerType
+		IngressController              ingressutil.IngressController
 		Insecure                       bool
 		InstallDemoResources           bool
 		SkipClusterChecks              bool
@@ -141,25 +140,12 @@ type (
 		message string
 		level   summaryLogLevels
 	}
-
-	ingressControllerType string
-
-	ingressController struct {
-		Name string
-		Type ingressControllerType
-	}
 )
 
 const (
 	Success summaryLogLevels = "Success"
 	Failed  summaryLogLevels = "Failed"
 	Info    summaryLogLevels = "Info"
-
-	IngressControllerNginxCommunity  ingressControllerType = "k8s.io/ingress-nginx"
-	IngressControllerNginxEnterprise ingressControllerType = "nginx.org/ingress-controller"
-	IngressControllerIstio           ingressControllerType = "istio.io/ingress-controller"
-	IngressControllerTraefik         ingressControllerType = "traefik.io/ingress-controller"
-	IngressControllerAmbassador      ingressControllerType = "getambassador.io/ingress-controller"
 )
 
 var summaryArr []summaryLog
@@ -475,6 +461,7 @@ func ensureIngressHost(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
 
 func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error {
 	if store.Get().BypassIngressClassCheck || store.Get().SkipIngress {
+		opts.IngressController = ingressutil.GetController("")
 		return nil
 	}
 
@@ -486,19 +473,15 @@ func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error
 		return fmt.Errorf("failed to get ingress class list from your cluster: %w", err)
 	}
 
-	supportedControllers := []ingressControllerType{IngressControllerNginxCommunity, IngressControllerNginxEnterprise, IngressControllerIstio, IngressControllerTraefik, IngressControllerAmbassador}
 	var ingressClassNames []string
-	ingressClassNameToController := make(map[string]ingressController)
+	ingressClassNameToController := make(map[string]ingressutil.IngressController)
 	var isValidClass bool
 
 	for _, ic := range ingressClassList.Items {
-		for _, controller := range supportedControllers {
+		for _, controller := range ingressutil.SupportedControllers {
 			if ic.Spec.Controller == string(controller) {
 				ingressClassNames = append(ingressClassNames, ic.Name)
-				ingressClassNameToController[ic.Name] = ingressController{
-					Name: getIngressControllerName(controller, ic.Name),
-					Type: controller,
-				}
+				ingressClassNameToController[ic.Name] = ingressutil.GetController(string(controller))
 
 				if opts.IngressClass == ic.Name { //if ingress class provided via flag
 					isValidClass = true
@@ -528,31 +511,15 @@ func ensureIngressClass(ctx context.Context, opts *RuntimeInstallOptions) error
 		}
 	}
 
-	opts.IngressController = ingressClassNameToController[opts.IngressClass].Name
-	opts.IngressControllerType = ingressClassNameToController[opts.IngressClass].Type
+	opts.IngressController = ingressClassNameToController[opts.IngressClass]
 
-	if opts.IngressControllerType == IngressControllerNginxEnterprise {
+	if opts.IngressController.Name() == string(ingressutil.IngressControllerNginxEnterprise) {
 		log.G(ctx).Warn("You are using the NGINX enterprise edition (nginx.org/ingress-controller) as your ingress controller. To successfully install the runtime, configure all required settings, as described in : ", store.Get().RequirementsLink)
 	}
 
 	return nil
 }
 
-func getIngressControllerName(controllerType ingressControllerType, className string) string {
-	switch controllerType {
-	case IngressControllerNginxCommunity:
-		return "ingress-nginx-controller"
-	case IngressControllerNginxEnterprise:
-		return fmt.Sprintf("%s-ingress-controller", className)
-	case IngressControllerTraefik:
-		return "traefik"
-	case IngressControllerIstio:
-		return "istio-ingressgateway"
-	default:
-		return ""
-	}
-}
-
 func getComponents(rt *runtime.Runtime, opts *RuntimeInstallOptions) []string {
 	var componentNames []string
 	for _, component := range rt.Spec.Components {
@@ -613,14 +580,17 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		postInstallationHandler(ctx, opts, err, &disableRollback)
 	}()
 
+	ingressControllerName := opts.IngressController.Name()
+
 	token, iv, err := createRuntimeOnPlatform(ctx, &model.RuntimeInstallationArgs{
-		RuntimeName:    opts.RuntimeName,
-		Cluster:        server,
-		RuntimeVersion: runtimeVersion,
-		IngressHost:    &opts.IngressHost,
-		ComponentNames: componentNames,
-		Repo:           &opts.InsCloneOpts.Repo,
-		IngressClass:   &opts.IngressClass,
+		RuntimeName:       opts.RuntimeName,
+		Cluster:           server,
+		RuntimeVersion:    runtimeVersion,
+		IngressHost:       &opts.IngressHost,
+		IngressClass:      &opts.IngressClass,
+		IngressController: &ingressControllerName,
+		ComponentNames:    componentNames,
+		Repo:              &opts.InsCloneOpts.Repo,
 	})
 	handleCliStep(reporter.InstallStepCreateRuntimeOnPlatform, "Creating runtime on platform", err, false, true)
 	if err != nil {
@@ -632,6 +602,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	rt.Spec.Cluster = server
 	rt.Spec.IngressHost = opts.IngressHost
 	rt.Spec.IngressClass = opts.IngressClass
+	rt.Spec.IngressController = string(opts.IngressController.Name())
 	rt.Spec.Repo = opts.InsCloneOpts.Repo
 
 	log.G(ctx).WithField("version", rt.Spec.Version).Infof("Installing runtime \"%s\"", opts.RuntimeName)
@@ -772,7 +743,7 @@ func createRuntimeComponents(ctx context.Context, opts *RuntimeInstallOptions, r
 		return err
 	}
 
-	if opts.IngressControllerType == IngressControllerNginxEnterprise {
+	if opts.IngressController.Name() == string(ingressutil.IngressControllerNginxEnterprise) {
 		err := createMasterIngressResource(ctx, opts)
 		if err != nil {
 			return fmt.Errorf("failed to create master ingress resource: %w", err)
@@ -820,15 +791,15 @@ func createMasterIngressResource(ctx context.Context, opts *RuntimeInstallOption
 func createGitSources(ctx context.Context, opts *RuntimeInstallOptions) error {
 	gitSrcMessage := fmt.Sprintf("Creating git source \"%s\"", store.Get().GitSourceName)
 	err := RunGitSourceCreate(ctx, &GitSourceCreateOptions{
-		InsCloneOpts:          opts.InsCloneOpts,
-		GsCloneOpts:           opts.GsCloneOpts,
-		GsName:                store.Get().GitSourceName,
-		RuntimeName:           opts.RuntimeName,
-		CreateDemoResources:   opts.InstallDemoResources,
-		HostName:              opts.HostName,
-		IngressHost:           opts.IngressHost,
-		IngressClass:          opts.IngressClass,
-		IngressControllerType: opts.IngressControllerType,
+		InsCloneOpts:        opts.InsCloneOpts,
+		GsCloneOpts:         opts.GsCloneOpts,
+		GsName:              store.Get().GitSourceName,
+		RuntimeName:         opts.RuntimeName,
+		CreateDemoResources: opts.InstallDemoResources,
+		HostName:            opts.HostName,
+		IngressHost:         opts.IngressHost,
+		IngressClass:        opts.IngressClass,
+		IngressController:   opts.IngressController,
 	})
 	handleCliStep(reporter.InstallStepCreateGitsource, gitSrcMessage, err, false, true)
 	if err != nil {
@@ -950,7 +921,7 @@ you can try to create it manually by running:
 func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *runtime.Runtime) error {
 	var err error
 
-	if !store.Get().SkipIngress {
+	if !store.Get().SkipIngress && rt.Spec.IngressController != string(ingressutil.IngressControllerALB) {
 		if err = createWorkflowsIngress(ctx, opts, rt); err != nil {
 			return fmt.Errorf("failed to patch Argo-Workflows ingress: %w", err)
 		}
@@ -1802,11 +1773,8 @@ func createWorkflowsIngress(ctx context.Context, opts *RuntimeInstallOptions, rt
 		},
 	}
 
-	if opts.IngressControllerType == IngressControllerNginxEnterprise {
-		ingressOptions.Annotations["nginx.org/mergeable-ingress-type"] = "minion"
-	}
-
 	ingress := ingressutil.CreateIngress(&ingressOptions)
+	opts.IngressController.Decorate(ingress)
 
 	if err = fs.WriteYamls(fs.Join(overlaysDir, "ingress.yaml"), ingress); err != nil {
 		return err
@@ -1891,13 +1859,8 @@ func configureAppProxy(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 			},
 		}
 
-		if opts.IngressControllerType == IngressControllerNginxEnterprise {
-			ingressOptions.Annotations = map[string]string{
-				"nginx.org/mergeable-ingress-type": "minion",
-			}
-		}
-
 		ingress := ingressutil.CreateIngress(&ingressOptions)
+		opts.IngressController.Decorate(ingress)
 
 		if err = fs.WriteYamls(fs.Join(overlaysDir, "ingress.yaml"), ingress); err != nil {
 			return err
diff --git a/docs/releases/release_notes.md b/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.321/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.322/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.321/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.322/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.321
+  version: 0.0.322
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events
diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -58,6 +58,7 @@ type (
 		Cluster            string          `json:"cluster"`
 		IngressHost        string          `json:"ingressHost"`
 		IngressClass       string          `json:"ingressClassName"`
+		IngressController  string          `json:"ingressController"`
 		Repo               string          `json:"repo"`
 
 		devMode bool
@@ -208,6 +209,7 @@ func (r *RuntimeSpec) upgrade(fs fs.FS, newRt *RuntimeSpec) ([]AppDef, error) {
 	newRt.Cluster = r.Cluster
 	newRt.IngressHost = r.IngressHost
 	newRt.IngressClass = r.IngressClass
+	newRt.IngressController = r.IngressController
 	newRt.Repo = r.Repo
 
 	newComponents := make([]AppDef, 0)
diff --git a/pkg/util/ingress/util.go b/pkg/util/ingress/util.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.0.321`
	`1`	`+VERSION=v0.0.322`
`2`	`2`
`3`	`3`	`OUT_DIR=dist`
`4`	`4`	`YEAR?=$(shell date +"%Y")`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`for _, s := range ServicesList.Items {`
`454`		`- if s.ObjectMeta.Name == opts.IngressController && s.Spec.Type == "LoadBalancer" {`
	`454`	`+ if s.ObjectMeta.Name == opts.IngressController.Name() && s.Spec.Type == "LoadBalancer" {`
`455`	`455`	`if len(s.Status.LoadBalancer.Ingress) > 0 {`
`456`	`456`	`ingress := s.Status.LoadBalancer.Ingress[0]`
`457`	`457`	`if ingress.Hostname != "" {`