Skip to content

Commit

Permalink
adding-files-with-cherrypick-conflicts (#1019)
Browse files Browse the repository at this point in the history
Co-authored-by: Dispatch CI <[email protected]>
  • Loading branch information
mesosphere-mergebot and d2iq-dispatch authored Apr 8, 2021
1 parent 275f12b commit a60188d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions addons/opsportal/opsportal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
labels:
kubeaddons.mesosphere.io/name: opsportal
annotations:
catalog.kubeaddons.mesosphere.io/addon-revision: "1.5.0-10"
catalog.kubeaddons.mesosphere.io/addon-revision: "1.5.0-12"
appversion.kubeaddons.mesosphere.io/opsportal: "1.5.0"
endpoint.kubeaddons.mesosphere.io/opsportal: /ops/portal/
values.chart.helm.kubeaddons.mesosphere.io/opsportal: "https://raw.githubusercontent.com/mesosphere/charts/4c72ff2/stable/opsportal/values.yaml"
values.chart.helm.kubeaddons.mesosphere.io/opsportal: "https://raw.githubusercontent.com/mesosphere/charts/371971c/stable/opsportal/values.yaml"
spec:
kubernetes:
minSupportedVersion: v1.15.6
Expand All @@ -29,7 +29,7 @@ spec:
chartReference:
chart: opsportal
repo: https://mesosphere.github.io/charts/stable
version: 0.5.0
version: 0.6.0
valuesRemap:
"kommander-ui.ingress.extraAnnotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url"
values: |
Expand Down

0 comments on commit a60188d

Please sign in to comment.