Merge pull request #35 from portefaix/fix/annotations

Duplicate annotations
portefaix · Apr 29, 2021 · 27a5515 · 27a5515
2 parents fb99a95 + bb2ff59
commit 27a5515
Show file tree

Hide file tree

Showing 25 changed files with 14 additions and 58 deletions.
diff --git a/charts/grafana-mixin/Chart.yaml b/charts/grafana-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/grafana-mixin/README.md b/charts/grafana-mixin/README.md
@@ -1,6 +1,6 @@
 # grafana-mixin
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.4.3](https://img.shields.io/badge/AppVersion-7.4.3-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.4.3](https://img.shields.io/badge/AppVersion-7.4.3-informational?style=flat-square)
 
 A Helm chart for Grafana Mixin
 

diff --git a/charts/grafana-mixin/templates/alerts.yaml b/charts/grafana-mixin/templates/alerts.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: GrafanaAlerts

diff --git a/charts/grafana-mixin/templates/rules.yaml b/charts/grafana-mixin/templates/rules.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: grafana_rules

diff --git a/charts/kube-state-metrics-mixin/Chart.yaml b/charts/kube-state-metrics-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/kube-state-metrics-mixin/README.md b/charts/kube-state-metrics-mixin/README.md
@@ -1,6 +1,6 @@
 # kube-state-metrics-mixin
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc0](https://img.shields.io/badge/AppVersion-2.0.0--rc0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc0](https://img.shields.io/badge/AppVersion-2.0.0--rc0-informational?style=flat-square)
 
 A Helm chart for Kube-State-Metrics Mixin
 

diff --git a/charts/kube-state-metrics-mixin/templates/alerts.yaml b/charts/kube-state-metrics-mixin/templates/alerts.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: kube-state-metrics

diff --git a/charts/loki-mixin/Chart.yaml b/charts/loki-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 0.4.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/loki-mixin/README.md b/charts/loki-mixin/README.md
@@ -1,6 +1,6 @@
 # loki-mixin
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
+![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
 
 A Helm chart for loki Mixin
 

diff --git a/charts/loki-mixin/templates/alerts.yaml b/charts/loki-mixin/templates/alerts.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: loki_alerts

diff --git a/charts/loki-mixin/templates/rules.yaml b/charts/loki-mixin/templates/rules.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: loki_rules

diff --git a/charts/prometheus-mixin/Chart.yaml b/charts/prometheus-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/prometheus-mixin/README.md b/charts/prometheus-mixin/README.md
@@ -1,6 +1,6 @@
 # prometheus-mixin
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
 
 A Helm chart for Prometheus Mixin
 

diff --git a/charts/prometheus-mixin/templates/alerts.yaml b/charts/prometheus-mixin/templates/alerts.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: prometheus

diff --git a/charts/prometheus-operator-mixin/Chart.yaml b/charts/prometheus-operator-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/prometheus-operator-mixin/README.md b/charts/prometheus-operator-mixin/README.md
@@ -1,6 +1,6 @@
 # prometheus-operator-mixin
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
 
 A Helm chart for Prometheus Operator Mixin
 

diff --git a/charts/prometheus-operator-mixin/templates/alerts.yaml b/charts/prometheus-operator-mixin/templates/alerts.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: prometheus-operator

diff --git a/charts/promtail-mixin/Chart.yaml b/charts/promtail-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 0.4.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/promtail-mixin/README.md b/charts/promtail-mixin/README.md
@@ -1,6 +1,6 @@
 # promtail-mixin
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
+![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
 
 A Helm chart for Promtail Mixin
 

diff --git a/charts/promtail-mixin/templates/alerts.yaml b/charts/promtail-mixin/templates/alerts.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: promtail_alerts

diff --git a/charts/promtail-mixin/templates/rules.yaml b/charts/promtail-mixin/templates/rules.yaml
@@ -14,10 +14,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: promtail_rules

diff --git a/charts/thanos-mixin/Chart.yaml b/charts/thanos-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.11.0
+version: 0.11.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/thanos-mixin/README.md b/charts/thanos-mixin/README.md
@@ -1,6 +1,6 @@
 # thanos-mixin
 
-![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.18.0](https://img.shields.io/badge/AppVersion-0.18.0-informational?style=flat-square)
+![Version: 0.11.1](https://img.shields.io/badge/Version-0.11.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.18.0](https://img.shields.io/badge/AppVersion-0.18.0-informational?style=flat-square)
 
 A Helm chart for Thanos Mixin
 

diff --git a/charts/thanos-mixin/templates/alerts.yaml b/charts/thanos-mixin/templates/alerts.yaml
@@ -15,10 +15,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: thanos-compact

diff --git a/charts/thanos-mixin/templates/rules.yaml b/charts/thanos-mixin/templates/rules.yaml
@@ -15,10 +15,6 @@ metadata:
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels | indent 4 }}
 {{- end }}
-{{- if .Values.additionalAnnotations }}
-  annotations:
-{{ toYaml .Values.additionalAnnotations | indent 4 }}
-{{- end }}
 spec:
   groups:
   - name: thanos-query.rules