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

[kommander] Deps bump, change kommander ui paths #351

Merged
merged 4 commits into from
Jan 14, 2020
+12 −12
Merged

[kommander] Deps bump, change kommander ui paths #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77f99ad
kommander: Update grafana path to /ops/portal/kommander
gracedo Jan 9, 2020
c617e9f
kommander: Modify kommander ui ingress path
gracedo Jan 9, 2020
8f239ea
kommander: Change Thanos Querier dashboard to Thanos Query
gracedo Jan 13, 2020
8ba03cc
kommander: Bump kommander-karma and kommander-thanos deps
gracedo Jan 13, 2020
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 @@ -7,4 +7,4 @@ maintainers:
- name: alejandroEsc
- name: jimmidyson
name: kommander
version: 0.3.9
version: 0.3.10
Binary file removed stable/kommander/charts/kommander-karma-0.3.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added stable/kommander/charts/kommander-karma-0.3.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed stable/kommander/charts/kommander-thanos-0.1.6.tgz
View file
Open in desktop
Binary file not shown.
Binary file added stable/kommander/charts/kommander-thanos-0.1.7.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified stable/kommander/charts/kubeaddons-catalog-0.1.4.tgz
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions stable/kommander/requirements.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ dependencies:
version: 0.1.4
- name: kommander-cluster-lifecycle
repository: https://mesosphere.github.io/kommander-cluster-lifecycle/charts
version: 0.3.3
version: v0.3.3
- name: kommander-thanos
repository: https://mesosphere.github.io/charts/stable
version: 0.1.6
version: 0.1.7
- name: kommander-karma
repository: https://mesosphere.github.io/charts/stable
version: 0.3.0
version: 0.3.1
- name: grafana
repository: https://kubernetes-charts.storage.googleapis.com
version: 3.8.19
digest: sha256:adea23b6beb90655455d31597b2fcbf8c3f06c3ba551a2e432b3ad867603b27a
generated: "2020-01-09T14:46:15.856649+01:00"
digest: sha256:89a8933078d8e69c3a15e5af17c957268322dd4d7c779f32e09048bfb75263ba
generated: "2020-01-13T15:15:32.989145-08:00"
4 changes: 2 additions & 2 deletions stable/kommander/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ dependencies:
repository: "https://mesosphere.github.io/kommander-cluster-lifecycle/charts"
condition: kommander-cluster-lifecycle.enabled, global.kommander-cluster-lifecycle.enabled
- name: kommander-thanos
version: "0.1.6"
version: "0.1.7"
repository: "https://mesosphere.github.io/charts/stable"
condition: kommander-thanos.enabled
- name: kommander-karma
version: "0.3.0"
version: "0.3.1"
repository: "https://mesosphere.github.io/charts/stable"
condition: kommander-karma.enabled
- name: grafana
Expand Down
2 changes: 1 addition & 1 deletion stable/kommander/templates/grafana/dashboards/thanos-query-dashboard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ data:
]
},
"timezone": "browser",
"title": "Thanos Querier",
"title": "Thanos Query",
"uid": "opwl5gSiz",
"version": 1
}
Expand Down
6 changes: 3 additions & 3 deletions stable/kommander/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ingress:
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
path: /ops/portal/kommander
path: /ops/portal/kommander/ui

federate:
kubeaddonsInitializer:
Expand Down Expand Up @@ -111,7 +111,7 @@ grafana:
server:
protocol: http
enable_gzip: true
root_url: "%(protocol)s://%(domain)s:%(http_port)s/kommander/monitoring/grafana"
root_url: "%(protocol)s://%(domain)s:%(http_port)s/ops/portal/kommander/monitoring/grafana"
auth.proxy:
enabled: true
header_name: X-Forwarded-User
Expand Down Expand Up @@ -149,7 +149,7 @@ grafana:
- ""

## Path for grafana ingress
path: /kommander/monitoring/grafana
path: /ops/portal/kommander/monitoring/grafana

## TLS configuration for grafana Ingress
## Secret must be manually created in the namespace
Expand Down