From deedf5da1b1f527e83162110b0e23a4a43760b9f Mon Sep 17 00:00:00 2001
From: Steven Chung <schung@mesosphere.io>
Date: Thu, 18 Jul 2019 21:59:33 -0400
Subject: [PATCH] update traefik config for opsportal and kommander

---
 stable/kommander/Chart.yaml                       | 2 +-
 stable/kommander/templates/ingress.yaml           | 5 ++++-
 stable/opsportal/templates/ingress-opsportal.yaml | 1 +
 stable/opsportal/templates/landing.yaml           | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/stable/kommander/Chart.yaml b/stable/kommander/Chart.yaml
index 2e1cbcc66..4ed808deb 100644
--- a/stable/kommander/Chart.yaml
+++ b/stable/kommander/Chart.yaml
@@ -3,6 +3,6 @@ name: kommander
 home: https://github.com/mesosphere/kommander
 appVersion: "1.46.1"
 description: Kommander
-version: 0.1.9
+version: 0.1.10
 maintainers:
   - name: hectorj2f
diff --git a/stable/kommander/templates/ingress.yaml b/stable/kommander/templates/ingress.yaml
index 0c70e5e0b..15a9cdefe 100644
--- a/stable/kommander/templates/ingress.yaml
+++ b/stable/kommander/templates/ingress.yaml
@@ -11,8 +11,11 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: traefik
 {{- if (eq "konvoy" .Values.mode) }}
-    traefik.ingress.kubernetes.io/rewrite-target: /
     traefik.ingress.kubernetes.io/priority: "1"
+    traefik.ingress.kubernetes.io/redirect-permanent: "true"
+    traefik.ingress.kubernetes.io/redirect-regex: ^https://([^/]*)/ops/portal$
+    traefik.ingress.kubernetes.io/redirect-replacement: https://$1/ops/portal/
+    traefik.ingress.kubernetes.io/request-modifier: 'ReplacePathRegex: ^/ops/portal/(.*) /$1'
 {{- else }}
     traefik.frontend.rule.type: {{ .Values.ingress.traefikFrontendRuleType }}
     {{- with .Values.ingress.extraAnnotations }}
diff --git a/stable/opsportal/templates/ingress-opsportal.yaml b/stable/opsportal/templates/ingress-opsportal.yaml
index 5c2d1d69e..15663de31 100644
--- a/stable/opsportal/templates/ingress-opsportal.yaml
+++ b/stable/opsportal/templates/ingress-opsportal.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: traefik
     traefik.frontend.rule.type: PathPrefixStrip
+    traefik.ingress.kubernetes.io/priority: "2"
   name: {{ template "opsportal.fullname" . }}-addons
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/stable/opsportal/templates/landing.yaml b/stable/opsportal/templates/landing.yaml
index 0ecfa16bf..5a14fbdd9 100644
--- a/stable/opsportal/templates/landing.yaml
+++ b/stable/opsportal/templates/landing.yaml
@@ -21,8 +21,7 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/rewrite-target: /
-    traefik.ingress.kubernetes.io/priority: "1"
+    traefik.ingress.kubernetes.io/rule-type: Path
   name: opsportal-landing
   namespace: {{ .Release.Namespace }}
 spec:
@@ -32,6 +31,7 @@ spec:
           - backend:
               serviceName: opsportal-landing
               servicePort: 80
+            path: /landing
 ---
 apiVersion: apps/v1
 kind: Deployment