From da3f9d98e1a467d291ca716e9b4aed1aadcd2dc1 Mon Sep 17 00:00:00 2001
From: Jie Yu <yujie.jay@gmail.com>
Date: Fri, 19 Jul 2019 12:41:03 -0700
Subject: [PATCH] chore: fix ops portal and kommander charts

Fix the traefik related annotations. Some traefik forward auth related
configurations should be moved to kubeaddons-configs.
---
 stable/kommander/Chart.yaml                       | 2 +-
 stable/kommander/templates/ingress.yaml           | 8 --------
 stable/opsportal/Chart.yaml                       | 2 +-
 stable/opsportal/templates/ingress-opsportal.yaml | 3 +++
 stable/opsportal/templates/landing.yaml           | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/stable/kommander/Chart.yaml b/stable/kommander/Chart.yaml
index 1ae2b4fd0..a6a8d4d1b 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.47.2"
 description: Kommander
-version: 0.1.11
+version: 0.1.12
 maintainers:
   - name: hectorj2f
diff --git a/stable/kommander/templates/ingress.yaml b/stable/kommander/templates/ingress.yaml
index 15a9cdefe..3a2a4a5a5 100644
--- a/stable/kommander/templates/ingress.yaml
+++ b/stable/kommander/templates/ingress.yaml
@@ -10,18 +10,10 @@ metadata:
     heritage: "{{ .Release.Service }}"
   annotations:
     kubernetes.io/ingress.class: traefik
-{{- if (eq "konvoy" .Values.mode) }}
-    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 }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-{{- end }}
 spec:
   rules:
     - http:
diff --git a/stable/opsportal/Chart.yaml b/stable/opsportal/Chart.yaml
index 276a89175..6947baab2 100644
--- a/stable/opsportal/Chart.yaml
+++ b/stable/opsportal/Chart.yaml
@@ -3,6 +3,6 @@ appVersion: "1.0.0"
 home: https://github.com/mesosphere/charts
 description: OpsPortal Chart
 name: opsportal
-version: 0.0.4
+version: 0.0.5
 maintainers:
   - name: hectorj2f
diff --git a/stable/opsportal/templates/ingress-opsportal.yaml b/stable/opsportal/templates/ingress-opsportal.yaml
index 15663de31..d46655a80 100644
--- a/stable/opsportal/templates/ingress-opsportal.yaml
+++ b/stable/opsportal/templates/ingress-opsportal.yaml
@@ -6,6 +6,9 @@ metadata:
     kubernetes.io/ingress.class: traefik
     traefik.frontend.rule.type: PathPrefixStrip
     traefik.ingress.kubernetes.io/priority: "2"
+    traefik.ingress.kubernetes.io/auth-type: forward
+    traefik.ingress.kubernetes.io/auth-url: http://traefik-forward-auth-kubeaddons.kubeaddons.svc.cluster.local:4181/
+    traefik.ingress.kubernetes.io/auth-response-headers: X-Forwarded-User
   name: {{ template "opsportal.fullname" . }}-addons
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/stable/opsportal/templates/landing.yaml b/stable/opsportal/templates/landing.yaml
index ccecc17e2..f82715a45 100644
--- a/stable/opsportal/templates/landing.yaml
+++ b/stable/opsportal/templates/landing.yaml
@@ -31,7 +31,7 @@ spec:
           - backend:
               serviceName: opsportal-landing
               servicePort: 80
-            path: /landing
+            path: /ops/landing
 ---
 apiVersion: apps/v1
 kind: Deployment