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] prometheus-elasticsearch-exporter-4.5.0 #1277

Merged
merged 3 commits into from
Aug 13, 2021
Merged

[release/4][BACKPORT] [auto-bump][chart] prometheus-elasticsearch-exporter-4.5.0 #1277

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0e4803
adding-files-with-cherrypick-conflicts
d2iq-dispatch Aug 7, 2021
9ed58ab
resolve merge conflict
joejulian Aug 13, 2021
e52f260
Merge branch 'release/4' into backport/release/4/master-1259
joejulian Aug 13, 2021
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
10 changes: 10 additions & 0 deletions addons/elasticsearchexporter/elasticsearchexporter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@ metadata:
labels:
kubeaddons.mesosphere.io/name: elasticsearchexporter
annotations:
<<<<<<< HEAD
catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-5"
appversion.kubeaddons.mesosphere.io/elasticsearchexporter: "1.1.0"
values.chart.helm.kubeaddons.mesosphere.io/elasticsearchexporter: "https://raw.githubusercontent.com/mesosphere/charts/f39e235/stable/elasticsearch-exporter/values.yaml"
=======
catalog.kubeaddons.mesosphere.io/addon-revision: "1.2.1-1"
appversion.kubeaddons.mesosphere.io/elasticsearchexporter: "1.2.1"
values.chart.helm.kubeaddons.mesosphere.io/elasticsearchexporter: "https://raw.githubusercontent.com/mesosphere/charts/8b85fea/stable/elasticsearch-exporter/values.yaml"
>>>>>>> b8fc1ae... Bump prometheus-elasticsearch-exporter to 4.5.0
joejulian marked this conversation as resolved.
Show resolved Hide resolved
spec:
kubernetes:
minSupportedVersion: v1.15.6
Expand All @@ -31,7 +37,11 @@ spec:
chartReference:
chart: prometheus-elasticsearch-exporter
repo: https://prometheus-community.github.io/helm-charts
<<<<<<< HEAD
version: 4.0.1
=======
version: 4.5.0
>>>>>>> b8fc1ae... Bump prometheus-elasticsearch-exporter to 4.5.0
joejulian marked this conversation as resolved.
Show resolved Hide resolved
values: |
---
# As defined in the readme file when migrating from old chart to new chart
Expand Down