Gateway API Support + HTTPProxy for AppProxy (#550)

* Revert "Revert gateway api (#547)"

This reverts commit 869f4fb.

* Using HTTPProxy for app-proxy instead of HTTPRoute

* remove usage of the gatewaya api pkg

* codegen

Author: danielm-codefresh

Makefile

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

cmd/commands/common.go

@@ -260,27 +260,6 @@ func getValueFromUserInput(label, defaultValue string, validate promptui.Validat
 	return prompt.Run()
 }
 
-func getIngressClassFromUserSelect(ingressClassNames []string) (string, error) {
-	templates := &promptui.SelectTemplates{
-		Selected: "{{ . | yellow }} ",
-	}
-
-	labelStr := fmt.Sprintf("%vSelect ingressClass%v", CYAN, COLOR_RESET)
-
-	prompt := promptui.Select{
-		Label:     labelStr,
-		Items:     ingressClassNames,
-		Templates: templates,
-	}
-
-	_, result, err := prompt.Run()
-	if err != nil {
-		return "", err
-	}
-
-	return result, nil
-}
-
 // ensureGitRuntimeToken gets the runtime token from the user (if !silent), and verifys it with he provider (if available)
 func ensureGitRuntimeToken(cmd *cobra.Command, gitProvider cfgit.Provider, cloneOpts *apgit.CloneOptions) error {
 	ctx := cmd.Context()

cmd/commands/git-source.go

@@ -28,7 +28,7 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/util"
 	apu "github.com/codefresh-io/cli-v2/pkg/util/aputil"
 	eventsutil "github.com/codefresh-io/cli-v2/pkg/util/events"
-	ingressutil "github.com/codefresh-io/cli-v2/pkg/util/ingress"
+	routingutil "github.com/codefresh-io/cli-v2/pkg/util/routing"
 	wfutil "github.com/codefresh-io/cli-v2/pkg/util/workflow"
 
 	"github.com/Masterminds/semver/v3"
@@ -50,7 +50,6 @@ import (
 	"github.com/juju/ansiterm"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
-	netv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -67,9 +66,12 @@ type (
 		HostName            string
 		IngressHost         string
 		IngressClass        string
-		IngressController   ingressutil.IngressController
+		IngressController   routingutil.RoutingController
+		GatewayName         string
+		GatewayNamespace    string
 		Flow                string
 		GitProvider         cfgit.Provider
+		useGatewayAPI       bool
 	}
 
 	GitSourceDeleteOptions struct {
@@ -102,7 +104,10 @@ type (
 		hostName          string
 		ingressHost       string
 		ingressClass      string
-		ingressController ingressutil.IngressController
+		ingressController routingutil.RoutingController
+		gatewayName       string
+		gatewayNamespace  string
+		useGatewayAPI     bool
 	}
 
 	dirConfig struct {
@@ -611,6 +616,9 @@ func createDemoResources(ctx context.Context, opts *GitSourceCreateOptions, gsRe
 			ingressHost:       opts.IngressHost,
 			ingressClass:      opts.IngressClass,
 			ingressController: opts.IngressController,
+			gatewayName:       opts.GatewayName,
+			gatewayNamespace:  opts.GatewayNamespace,
+			useGatewayAPI:     opts.useGatewayAPI,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
@@ -746,9 +754,17 @@ func createDemoCalendarTrigger() sensorsv1alpha1.Trigger {
 func createDemoGitPipeline(opts *gitSourceGitDemoPipelineOptions) error {
 	if !store.Get().SkipIngress {
 		// Create an ingress that will manage external access to the git eventsource service
-		ingress := createDemoPipelinesIngress(opts.ingressClass, opts.hostName, opts.ingressController, opts.runtimeName)
-		ingressFilePath := store.Get().DemoPipelinesIngressFileName
-		if err := writeObjectToYaml(opts.gsFs, ingressFilePath, &ingress, cleanUpFieldsIngress); err != nil {
+		routeOpts := routingutil.CreateRouteOpts{
+			RuntimeName:       opts.runtimeName,
+			IngressClass:      opts.ingressClass,
+			Hostname:          opts.hostName,
+			IngressController: opts.ingressController,
+			GatewayName:       opts.gatewayName,
+			GatewayNamespace:  opts.gatewayNamespace,
+		}
+		routeName, route := routingutil.CreateDemoPipelinesRoute(&routeOpts, opts.useGatewayAPI)
+		routeFilePath := fmt.Sprintf("%s.%s.yaml", store.Get().DemoPipelinesIngressObjectName, routeName)
+		if err := writeObjectToYaml(opts.gsFs, routeFilePath, &route, cleanUpFieldsIngress); err != nil {
 			return fmt.Errorf("failed to write yaml of demo pipeline ingress. Error: %w", err)
 		}
 	}
@@ -825,26 +841,6 @@ func createDemoBitbucketServerPipeline(opts *gitSourceGitDemoPipelineOptions) er
 	return nil
 }
 
-func createDemoPipelinesIngress(ingressClass string, hostName string, ingressController ingressutil.IngressController, runtimeName string) *netv1.Ingress {
-	ingressOptions := ingressutil.CreateIngressOptions{
-		Name:             store.Get().DemoPipelinesIngressObjectName,
-		IngressClassName: ingressClass,
-		Host:             hostName,
-		Paths: []ingressutil.IngressPath{
-			{
-				Path:        util.GenerateIngressPathForDemoGitEventSource(runtimeName),
-				ServiceName: store.Get().DemoGitEventSourceObjectName + "-eventsource-svc",
-				ServicePort: store.Get().DemoGitEventSourceServicePort,
-				PathType:    netv1.PathTypePrefix,
-			},
-		}}
-
-	ingress := ingressutil.CreateIngress(&ingressOptions)
-	ingressController.Decorate(ingress)
-
-	return ingress
-}
-
 func createDemoGithubEventSource(repoURL string, ingressHost string, runtimeName string, gitProvider cfgit.Provider) *eventsourcev1alpha1.EventSource {
 	name := store.Get().DemoGitEventSourceObjectName
 	es := createDemoEventSource(name)
@@ -1258,8 +1254,8 @@ func getBitbucketServerRepoFromGitURL(url string) eventsourcev1alpha1.BitbucketS
 	}
 }
 
-func cleanUpFieldsIngress(ingress **netv1.Ingress) (map[string]interface{}, error) {
-	crd, err := util.StructToMap(ingress)
+func cleanUpFieldsIngress(resource *interface{}) (map[string]interface{}, error) {
+	crd, err := util.StructToMap(resource)
 	if err != nil {
 		return nil, err
 	}