Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

[release/4][BACKPORT] [auto-bump][chart] kubernetes-dashboard-4.5.0 #1273

Merged
merged 5 commits into from
Aug 13, 2021
Merged
Changes from 2 commits
Commits
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
15 changes: 14 additions & 1 deletion addons/dashboard/dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,20 @@ metadata:
labels:
kubeaddons.mesosphere.io/name: dashboard
annotations:
<<<<<<< HEAD
<<<<<<< HEAD
catalog.kubeaddons.mesosphere.io/addon-revision: "3.0.2-0"
appversion.kubeaddons.mesosphere.io/dashboard: "3.0.2"
=======
catalog.kubeaddons.mesosphere.io/addon-revision: "2.3.1-1"
=======
catalog.kubeaddons.mesosphere.io/addon-revision: "3.1.0-1"
>>>>>>> 5fe65f9... fix bad revision bump automation
appversion.kubeaddons.mesosphere.io/dashboard: "2.3.1"
>>>>>>> 4b19b3a... Bump kubernetes-dashboard to 4.5.0
joejulian marked this conversation as resolved.
Show resolved Hide resolved
endpoint.kubeaddons.mesosphere.io/dashboard: "/ops/portal/kubernetes/"
docs.kubeaddons.mesosphere.io/dashboard: "https://github.com/kubernetes/dashboard/blob/master/README.md"
values.chart.helm.kubeaddons.mesosphere.io/dashboard: "https://raw.githubusercontent.com/helm/charts/7e45e67/stable/kubernetes-dashboard/values.yaml"
values.chart.helm.kubeaddons.mesosphere.io/dashboard: "https://raw.githubusercontent.com/helm/charts/f4f301a/stable/kubernetes-dashboard/values.yaml"
# versions of the dashboard older than v2 are not directly compatible and so a delete uprade is needed in this case to avoid conflicts with the older resources.
helm.kubeaddons.mesosphere.io/upgrade-strategy: "[{\"upgradeFrom\": \"<=2.0.0\", \"strategy\": \"delete\"}]"
helm2.kubeaddons.mesosphere.io/upgrade-strategy: "[{\"upgradeFrom\": \"<=2.0.0\", \"strategy\": \"delete\"}]"
Expand All @@ -33,7 +42,11 @@ spec:
chartReference:
chart: kubernetes-dashboard
repo: https://kubernetes.github.io/dashboard/
<<<<<<< HEAD
version: 3.0.2
=======
version: 4.5.0
>>>>>>> 4b19b3a... Bump kubernetes-dashboard to 4.5.0
joejulian marked this conversation as resolved.
Show resolved Hide resolved
valuesRemap:
"ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url"
values: |
Expand Down