CR-14554-ir (#593)

* add internal router manifests + remove ingresses

* add port

* configure liveness/readyness

* fixes

* fix

* fix

* support internal and external ingress host

* fixes

* move argo-server to internal router + add upgrade command

* return argo wf to external + add check for gateway installation on upgrade

* small fix

* fix comments + set correct version for go-sdk

* change tunneller chart

* fix argo workflows configuration

* small fix

* update version + scale down internal router

* fix

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* update version

* fixed missing tunnel client in tunnel mode

* updated version to 0.0.542

* fixed upgrade command

* fix

Co-authored-by: Noam Gal <noam.gal@codefresh.io>

Author: yaroslav-codefresh

Makefile

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

cmd/commands/assets/workflows-ingress-patch.json renamed to cmd/commands/assets/workflows-route-patch.json

@@ -47,8 +47,8 @@ var (
 	die  = util.Die
 	exit = os.Exit
 
-	//go:embed assets/workflows-ingress-patch.json
-	workflowsIngressPatch []byte
+	//go:embed assets/workflows-route-patch.json
+	workflowsRoutePatch []byte
 
 	cfConfig *config.Config
 

cmd/commands/common.go

@@ -260,7 +260,7 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
 		AppName:       opts.GsName,
 		AppSpecifier:  appSpecifier,
 		DestServer:    store.Get().InCluster,
-		DestNamespace: opts.RuntimeName,
+		DestNamespace: &opts.RuntimeName,
 		IsInternal:    &isInternal,
 		Include:       &opts.Include,
 		Exclude:       &opts.Exclude,
@@ -755,23 +755,6 @@ func createDemoCalendarTrigger() sensorsv1alpha1.Trigger {
 }
 
 func createDemoGitPipeline(opts *gitSourceGitDemoPipelineOptions) error {
-	if !opts.skipIngress && opts.accessMode == platmodel.AccessModeIngress {
-		// Create an ingress that will manage external access to the git eventsource service
-		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)
-		}
-	}
-
 	gitProviderType := opts.gitProvider.Type()
 	switch gitProviderType {
 	case "github":

cmd/commands/git-source.go

@@ -27,6 +27,8 @@ import (
 	"sync"
 	"time"
 
+	routingutil "github.com/codefresh-io/cli-v2/pkg/util/routing"
+
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/reporter"
 	"github.com/codefresh-io/cli-v2/pkg/runtime"
@@ -69,13 +71,13 @@ type (
 
 	RuntimeUpgradeOptions struct {
 		RuntimeName               string
-		Version                   *semver.Version
 		CloneOpts                 *apgit.CloneOptions
 		CommonConfig              *runtime.CommonConfig
 		SuggestedSharedConfigRepo string
 		DisableTelemetry          bool
 		runtimeDef                string
 
+		versionStr        string
 		featuresToInstall []runtime.InstallFeature
 	}
 
@@ -787,6 +789,11 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 				finalParameters["Version"] = versionStr
 			}
 
+			err = validateVersionIfExists(opts.versionStr)
+			if err != nil {
+				return err
+			}
+
 			err = getApprovalFromUser(ctx, finalParameters, "runtime upgrade")
 			if err != nil {
 				return err
@@ -799,13 +806,6 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 			var err error
 			ctx := cmd.Context()
 
-			if versionStr != "" {
-				opts.Version, err = semver.NewVersion(versionStr)
-				if err != nil {
-					return err
-				}
-			}
-
 			opts.CommonConfig = &runtime.CommonConfig{
 				CodefreshBaseURL: cfConfig.GetCurrentContext().URL,
 			}
@@ -816,7 +816,7 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&versionStr, "version", "", "The runtime version to upgrade to, defaults to latest")
+	cmd.Flags().StringVar(&opts.versionStr, "version", "", "The runtime version to upgrade to, defaults to latest")
 	cmd.Flags().StringVar(&opts.SuggestedSharedConfigRepo, "shared-config-repo", "", "URL to the shared configurations repo. (default: <installation-repo> or the existing one for this account)")
 	cmd.Flags().BoolVar(&opts.DisableTelemetry, "disable-telemetry", false, "If true, will disable analytics reporting for the upgrade process")
 	cmd.Flags().BoolVar(&store.Get().SetDefaultResources, "set-default-resources", false, "If true, will set default requests and limits on all of the runtime components")
@@ -834,7 +834,7 @@ func runRuntimeUpgrade(ctx context.Context, opts *RuntimeUpgradeOptions) error {
 
 	log.G(ctx).Info("Downloading runtime definition")
 
-	runtimeDef := getRuntimeDef(opts.runtimeDef, opts.Version.String())
+	runtimeDef := getRuntimeDef(opts.runtimeDef, opts.versionStr)
 	newRt, err := runtime.Download(runtimeDef, opts.RuntimeName, opts.featuresToInstall)
 	handleCliStep(reporter.UpgradeStepDownloadRuntimeDefinition, "Downloading runtime definition", err, true, false)
 	if err != nil {
@@ -897,6 +897,21 @@ func runRuntimeUpgrade(ctx context.Context, opts *RuntimeUpgradeOptions) error {
 
 	handleCliStep(reporter.UpgradeStepInstallNewComponents, "Install new components", err, false, false)
 
+	needsInternalRouter := curRt.Spec.Version.LessThan(semver.MustParse("v0.0.542"))
+	isIngress := curRt.Spec.AccessMode == platmodel.AccessModeIngress
+	isNotAlb := curRt.Spec.IngressController != string(routingutil.IngressControllerALB)
+
+	if needsInternalRouter && isIngress && isNotAlb {
+		log.G(ctx).Info("Migrating to Internal Router ")
+
+		err = migrateInternalRouter(ctx, opts, newRt)
+		if err != nil {
+			return fmt.Errorf("failed to migrate internal router: %w", err)
+		}
+
+		handleCliStep(reporter.UpgradeStepMigrateInternalRouter, "Migrate internal router", err, false, false)
+	}
+
 	log.G(ctx).Infof("Runtime upgraded to version: v%s", newRt.Spec.Version)
 
 	return nil
@@ -922,6 +937,55 @@ func NewRuntimeLogsCommand() *cobra.Command {
 	return cmd
 }
 
+func migrateInternalRouter(ctx context.Context, opts *RuntimeUpgradeOptions, newRt *runtime.Runtime) error {
+	dbRuntime, err := getRuntime(ctx, opts.RuntimeName)
+	if err != nil {
+		return fmt.Errorf("failed to get runtime: %s. Error: %w", opts.RuntimeName, err)
+	}
+
+	gatewayName := ""
+	gatewaysNamespace := ""
+
+	if dbRuntime.GatewayName != nil {
+		gatewayName = *dbRuntime.GatewayName
+	}
+
+	if dbRuntime.GatewayNamespace != nil {
+		gatewaysNamespace = *dbRuntime.GatewayNamespace
+	}
+
+	createOpts := &CreateIngressOptions{
+		IngressHost:         newRt.Spec.IngressHost,
+		IngressClass:        newRt.Spec.IngressClass,
+		InternalIngressHost: newRt.Spec.InternalIngressHost,
+		IngressController:   routingutil.GetIngressController(newRt.Spec.IngressController),
+		InsCloneOpts:        opts.CloneOpts,
+		useGatewayAPI:       gatewayName != "",
+		GatewayName:         gatewayName,
+		GatewayNamespace:    gatewaysNamespace,
+	}
+
+	if err = parseHostName(newRt.Spec.IngressHost, &createOpts.HostName); err != nil {
+		return err
+	}
+
+	if createOpts.InternalIngressHost != "" {
+		if err := parseHostName(newRt.Spec.InternalIngressHost, &createOpts.InternalHostName); err != nil {
+			return err
+		}
+	}
+
+	if err := util.Retry(ctx, &util.RetryOptions{
+		Func: func() error {
+			return CreateInternalRouterIngress(ctx, createOpts, newRt)
+		},
+	}); err != nil {
+		return fmt.Errorf("failed to patch Internal Router ingress: %w", err)
+	}
+
+	return nil
+}
+
 func isAllRequiredFlagsForDownloadRuntimeLogs() bool {
 	return store.Get().IsDownloadRuntimeLogs && store.Get().IngressHost != ""
 }