CR-14985-flag (#608)

* add internalRouterApplied flag + adjust internal router ingress * bump version * fixes * fixes * fixes * fixes * fixes
codefresh-io · Oct 26, 2022 · d1c2bf5 · d1c2bf5
1 parent 22f2774
commit d1c2bf5
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.548
+VERSION=v0.0.549
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -897,20 +897,17 @@ 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.543"))
+	hasLatestInternalRouter := !curRt.Spec.Version.LessThan(semver.MustParse("v0.0.549"))
 	isIngress := curRt.Spec.AccessMode == platmodel.AccessModeIngress
-	isNotAlb := curRt.Spec.IngressController != string(routingutil.IngressControllerALB)
 
-	if !opts.SkipIngress && needsInternalRouter && isIngress && isNotAlb {
+	handleCliStep(reporter.UpgradeStepInstallNewComponents, "Install new components", err, false, false)
+	if !opts.SkipIngress && !hasLatestInternalRouter && isIngress {
 		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)
 	}
 
@@ -979,7 +976,7 @@ func migrateInternalRouter(ctx context.Context, opts *RuntimeUpgradeOptions, new
 
 	if err := util.Retry(ctx, &util.RetryOptions{
 		Func: func() error {
-			return CreateInternalRouterIngress(ctx, createOpts, newRt)
+			return CreateInternalRouterIngress(ctx, createOpts, newRt, true)
 		},
 	}); err != nil {
 		return fmt.Errorf("failed to patch Internal Router ingress: %w", err)

diff --git a/cmd/commands/runtime_install.go b/cmd/commands/runtime_install.go
@@ -1032,7 +1032,7 @@ func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 
 	// bitbucket cloud take more time to push a commit
 	// the perpuse of all retries is to avoid issues of cloning before pervious commit was pushed
-	if opts.shouldInstallIngress() && rt.Spec.IngressController != string(routingutil.IngressControllerALB) {
+	if opts.shouldInstallIngress() {
 		if err = util.Retry(ctx, &util.RetryOptions{
 			Func: func() error {
 				return CreateInternalRouterIngress(ctx, &CreateIngressOptions{
@@ -1048,7 +1048,7 @@ func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 					InternalIngressAnnotation: opts.InternalIngressAnnotation,
 					ExternalIngressAnnotation: opts.ExternalIngressAnnotation,
 					useGatewayAPI:             opts.useGatewayAPI,
-				}, rt)
+				}, rt, false)
 			},
 		}); err != nil {
 			return fmt.Errorf("failed to patch Internal Router ingress: %w", err)
@@ -1397,7 +1397,7 @@ func persistRuntime(ctx context.Context, cloneOpts *apgit.CloneOptions, rt *runt
 	return apu.PushWithMessage(ctx, r, "Persisted runtime data")
 }
 
-func CreateInternalRouterIngress(ctx context.Context, opts *CreateIngressOptions, rt *runtime.Runtime) error {
+func CreateInternalRouterIngress(ctx context.Context, opts *CreateIngressOptions, rt *runtime.Runtime, onlyWebhooks bool) error {
 	r, fs, err := opts.InsCloneOpts.GetRepo(ctx)
 	if err != nil {
 		return err
@@ -1416,7 +1416,7 @@ func CreateInternalRouterIngress(ctx context.Context, opts *CreateIngressOptions
 		GatewayName:       opts.GatewayName,
 		GatewayNamespace:  opts.GatewayNamespace,
 	}
-	routeName, route := routingutil.CreateInternalRouterRoute(&routeOpts, opts.useGatewayAPI, !internalIngressEnabled)
+	routeName, route := routingutil.CreateInternalRouterRoute(&routeOpts, opts.useGatewayAPI, !internalIngressEnabled, onlyWebhooks)
 	routeFileName := fmt.Sprintf("%s.yaml", routeName)
 
 	if err := writeObjectToYaml(fs, fs.Join(overlaysDir, routeFileName), &route, cleanUpFieldsIngress); err != nil {
@@ -1432,7 +1432,7 @@ func CreateInternalRouterIngress(ctx context.Context, opts *CreateIngressOptions
 		kust.Resources = append(kust.Resources, routeFileName)
 	}
 
-	if internalIngressEnabled {
+	if !onlyWebhooks && internalIngressEnabled {
 		routeOpts := routingutil.CreateRouteOpts{
 			RuntimeName:       rt.Name,
 			Namespace:         rt.Namespace,

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.548/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.549/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.548/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.549/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/internal-router/internal-router.cm.yaml b/manifests/internal-router/internal-router.cm.yaml
@@ -16,6 +16,7 @@ data:
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
+        chunked_transfer_encoding off;
     
         proxy_pass http://cap-app-proxy:3017;
       }

diff --git a/manifests/internal-router/internal-router.deploy.yaml b/manifests/internal-router/internal-router.deploy.yaml
@@ -14,7 +14,10 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: nginx:1.23-alpine
+          # do not upgrade to 1.23 until it's really critical
+          # 1.23 removed support for "Transfer-Encoding: identity" header value
+          # and it will break SSE from app-proxy
+          image: nginx:1.22-alpine
           ports:
             - containerPort: 80
           volumeMounts:

diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
@@ -4,8 +4,8 @@ metadata:
   name: "{{ name }}"
   namespace: "{{ namespace }}"
 spec:
-  defVersion: 2.1.0
-  version: 0.0.548
+  defVersion: 2.1.1
+  version: 0.0.549
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

diff --git a/pkg/store/store.go b/pkg/store/store.go
@@ -30,7 +30,7 @@ var (
 	buildDate                = ""
 	gitCommit                = ""
 	SegmentWriteKey          = ""
-	maxDefVersion            = "2.1.0"
+	maxDefVersion            = "2.1.1"
 	RuntimeDefURL            = "manifests/runtime.yaml"
 	AddClusterDefURL         = "https://github.com/codefresh-io/csdp-official/add-cluster/kustomize"
 	FallbackAddClusterDefURL = "https://github.com/codefresh-io/cli-v2/manifests/add-cluster/kustomize"

diff --git a/pkg/util/routing/common.go b/pkg/util/routing/common.go
@@ -90,7 +90,7 @@ func CreateInternalRouterInternalRoute(opts *CreateRouteOpts, useGatewayAPI bool
 	return routeName, route
 }
 
-func CreateInternalRouterRoute(opts *CreateRouteOpts, useGatewayAPI bool, includeInternalRoutes bool) (string, interface{}) {
+func CreateInternalRouterRoute(opts *CreateRouteOpts, useGatewayAPI bool, includeInternalRoutes bool, onlyWebhooks bool) (string, interface{}) {
 	var route interface{}
 	var routeName string
 
@@ -109,20 +109,26 @@ func CreateInternalRouterRoute(opts *CreateRouteOpts, useGatewayAPI bool, includ
 				serviceName: store.Get().InternalRouterServiceName,
 				servicePort: store.Get().InternalRouterServicePort,
 			},
-			{
+		},
+		Annotations:       opts.Annotations,
+		IngressController: opts.IngressController,
+	}
+
+	// on upgrade, we do not want collisions with existing ingresses
+	if !onlyWebhooks {
+		createRouteOpts.Paths = append(createRouteOpts.Paths,
+			RoutePath{
 				pathType:    PrefixPath,
 				path:        store.Get().ArgoWfIngressPath,
 				serviceName: store.Get().InternalRouterServiceName,
 				servicePort: store.Get().InternalRouterServicePort,
 			},
-		},
-		Annotations:       opts.Annotations,
-		IngressController: opts.IngressController,
+		)
 	}
 
 	// when using internal ingress -- we need to extract app-proxy
 	// to a separate ingress (with its own host and annotations)
-	if includeInternalRoutes {
+	if !onlyWebhooks && includeInternalRoutes {
 		createRouteOpts.Paths = append(createRouteOpts.Paths,
 			RoutePath{
 				pathType:    PrefixPath,