From b7b7e973832725c1dd268028fc5dffa9fc80ea4a Mon Sep 17 00:00:00 2001
From: mikhail-klimko <mikhail.klimko@codefresh.io>
Date: Wed, 19 Jun 2024 23:25:46 +0300
Subject: [PATCH] fix(app-proxy): fix app-proxy prefix (#437)

---
 charts/cf-runtime/Chart.yaml                                | 4 ++--
 charts/cf-runtime/README.md                                 | 4 ++--
 .../templates/_components/app-proxy/_ingress.yaml           | 2 +-
 .../cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml | 2 +-
 charts/cf-runtime/values.yaml                               | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/cf-runtime/Chart.yaml b/charts/cf-runtime/Chart.yaml
index 34a2b8a2..dca18be9 100644
--- a/charts/cf-runtime/Chart.yaml
+++ b/charts/cf-runtime/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Codefresh Runner
 name: cf-runtime
-version: 6.3.34
+version: 6.3.35
 keywords:
   - codefresh
   - runner
@@ -18,7 +18,7 @@ annotations:
   # Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
   artifacthub.io/changes: |
     - kind: fixed
-      description: Fix reconcile-runtime sidecar container drift in runner deployment
+      description: Fix app-proxy prefix path
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
diff --git a/charts/cf-runtime/README.md b/charts/cf-runtime/README.md
index f7e69710..67a906f7 100644
--- a/charts/cf-runtime/README.md
+++ b/charts/cf-runtime/README.md
@@ -1,6 +1,6 @@
 ## Codefresh Runner
 
-![Version: 6.3.34](https://img.shields.io/badge/Version-6.3.34-informational?style=flat-square)
+![Version: 6.3.35](https://img.shields.io/badge/Version-6.3.35-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
 
@@ -1016,7 +1016,7 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | appProxy.ingress.annotations | object | `{}` | Set extra annotations for ingress object |
 | appProxy.ingress.class | string | `""` | Set ingress class |
 | appProxy.ingress.host | string | `""` | Set DNS hostname the ingress will use |
-| appProxy.ingress.pathPrefix | string | `"/"` | Set path prefix for ingress |
+| appProxy.ingress.pathPrefix | string | `""` | Set path prefix for ingress (keep empty for default `/` path) |
 | appProxy.ingress.tlsSecret | string | `""` | Set k8s tls secret for the ingress object |
 | appProxy.nodeSelector | object | `{}` | Set node selector |
 | appProxy.podAnnotations | object | `{}` | Set pod annotations |
diff --git a/charts/cf-runtime/templates/_components/app-proxy/_ingress.yaml b/charts/cf-runtime/templates/_components/app-proxy/_ingress.yaml
index 975e508e..d7860b36 100644
--- a/charts/cf-runtime/templates/_components/app-proxy/_ingress.yaml
+++ b/charts/cf-runtime/templates/_components/app-proxy/_ingress.yaml
@@ -22,7 +22,7 @@ spec:
     - host: {{ .Values.ingress.host }}
       http:
         paths:
-          - path: {{ .Values.ingress.pathPrefix }}
+          - path: {{ .Values.ingress.pathPrefix | default "/" }}
             pathType: ImplementationSpecific
             backend:
               service:
diff --git a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
index f06bb1a1..4c11ff9c 100644
--- a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
+++ b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
@@ -197,7 +197,7 @@ accounts: {{- toYaml .Values.runtime.accounts | nindent 2 }}
 {{- if .Values.appProxy.enabled }}
 appProxy:
   externalIP: >-
-    {{ printf "https://%s%s" .Values.appProxy.ingress.host .Values.appProxy.ingress.pathPrefix }}
+    {{ printf "https://%s%s" .Values.appProxy.ingress.host (.Values.appProxy.ingress.pathPrefix | default "/") }}
 {{- end }}
 {{- if not .Values.runtime.agent }}
 systemHybrid: true
diff --git a/charts/cf-runtime/values.yaml b/charts/cf-runtime/values.yaml
index bb19ef97..c6c424b5 100644
--- a/charts/cf-runtime/values.yaml
+++ b/charts/cf-runtime/values.yaml
@@ -667,8 +667,8 @@ appProxy:
   # Set app-proxy ingress parameters
   # @default -- See below
   ingress:
-    # -- Set path prefix for ingress
-    pathPrefix: "/"
+    # -- Set path prefix for ingress (keep empty for default `/` path)
+    pathPrefix: ""
     # -- Set ingress class
     class: ""
     # -- Set DNS hostname the ingress will use
@@ -679,7 +679,7 @@ appProxy:
     annotations: {}
     # E.g.
     # ingress:
-    #   pathPrefix: "/app-proxy"
+    #   pathPrefix: "/cf-app-proxy"
     #   class: "nginx"
     #   host: "mydomain.com"
     #   tlsSecret: "tls-cert-app-proxy"