Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix ops portal and kommander charts #55

Merged
merged 1 commit into from
Jul 19, 2019
Merged

chore: fix ops portal and kommander charts #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/kommander/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions stable/kommander/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,10 @@ metadata:
heritage: "{{ .Release.Service }}"
annotations:
kubernetes.io/ingress.class: traefik
{{- if (eq "konvoy" .Values.mode) }}
jieyu marked this conversation as resolved.
Show resolved Hide resolved
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:
Expand Down
2 changes: 1 addition & 1 deletion stable/opsportal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions stable/opsportal/templates/ingress-opsportal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion stable/opsportal/templates/landing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
- backend:
serviceName: opsportal-landing
servicePort: 80
path: /landing
path: /ops/landing
---
apiVersion: apps/v1
kind: Deployment
Expand Down