Skip to content

Commit 50bfbd4

Browse files
authored
[prometheus-statsd-exporter]: remove support for depreacted ingress api (#5835)
Signed-off-by: AvivGuiser <[email protected]>
1 parent 22d1426 commit 50bfbd4

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

charts/prometheus-statsd-exporter/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: prometheus-statsd-exporter
33
description: A Helm chart for prometheus stats-exporter
4-
version: 0.15.1
4+
version: 1.0.0
55
appVersion: v0.28.0
66
home: https://github.com/prometheus/statsd_exporter
77
sources:

charts/prometheus-statsd-exporter/README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This chart bootstraps a [Statsd Exporter](https://github.com/prometheus/statsd_e
66

77
## Prerequisites
88

9-
- Kubernetes 1.16+ with Beta APIs enabled
9+
- Kubernetes 1.19+ with Beta APIs enabled
1010
- Helm 3+
1111

1212
## Usage
@@ -55,3 +55,11 @@ helm show values oci://ghcr.io/prometheus-community/charts/prometheus-statsd-exp
5555
### Statsd Exporter Server
5656

5757
- Use early created ConfigMap with file `statsd.mappingConf` contained in data or specify mapping values in `statsd.mappingConfig`
58+
59+
#### Upgrading an existing Release to a new major version
60+
61+
A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
62+
63+
##### 0.x to 1.x
64+
65+
Support for Kubernetes versions older then 1.19 has been removed.
Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
{{- if .Values.ingress.enabled -}}
22
{{- $fullName := include "prometheus-statsd-exporter.fullname" . -}}
33
{{- $svcPort := .Values.service.port -}}
4-
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
5-
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
6-
{{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
7-
{{- end }}
8-
{{- end }}
9-
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
104
apiVersion: networking.k8s.io/v1
11-
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
12-
apiVersion: networking.k8s.io/v1beta1
13-
{{- else -}}
14-
apiVersion: extensions/v1beta1
15-
{{- end }}
165
kind: Ingress
176
metadata:
187
name: {{ $fullName }}
@@ -23,7 +12,7 @@ metadata:
2312
{{- toYaml . | nindent 4 }}
2413
{{- end }}
2514
spec:
26-
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
15+
{{- if .Values.ingress.className }}
2716
ingressClassName: {{ .Values.ingress.className }}
2817
{{- end }}
2918
{{- if .Values.ingress.tls }}
@@ -43,19 +32,14 @@ spec:
4332
paths:
4433
{{- range .paths }}
4534
- path: {{ .path }}
46-
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
35+
{{- if .pathType }}
4736
pathType: {{ .pathType }}
4837
{{- end }}
4938
backend:
50-
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
5139
service:
5240
name: {{ $fullName }}
5341
port:
5442
number: {{ $svcPort }}
55-
{{- else }}
56-
serviceName: {{ $fullName }}
57-
servicePort: {{ $svcPort }}
58-
{{- end }}
5943
{{- end }}
6044
{{- end }}
6145
{{- end }}

0 commit comments

Comments
 (0)