Skip to content

Commit

Permalink
Merge branch 'main' into elastic-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
DrFaust92 authored Sep 12, 2023
2 parents 5252cac + c0c87f0 commit 2e2bf0c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 24 deletions.
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 51.0.0
version: 51.0.2
appVersion: v0.68.0
kubeVersion: ">=1.19.0-0"
home: https://github.com/prometheus-operator/kube-prometheus
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
{{- if .Values.alertmanager.enabled }}
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -44,6 +45,9 @@ spec:
targetPort: {{ .Values.alertmanager.service.targetPort }}
protocol: TCP
- name: reloader-web
{{- if semverCompare ">=1.20.0-0" $kubeTargetVersion }}
appProtocol: http
{{- end }}
port: 8080
targetPort: reloader-web
{{- if .Values.alertmanager.service.additionalPorts }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ spec:
- port: "8080"
{{- end }}
protocol: "TCP"
{{- if not .Values.prometheusOperator.tls.enabled }}
rules:
http:
- method: "GET"
path: "/metrics"
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
{{- if .Values.prometheus.enabled }}
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -43,6 +44,9 @@ spec:
port: {{ .Values.prometheus.service.port }}
targetPort: {{ .Values.prometheus.service.targetPort }}
- name: reloader-web
{{- if semverCompare "> 1.20.0-0" $kubeTargetVersion }}
appProtocol: http
{{- end }}
port: 8080
targetPort: reloader-web
{{- if .Values.prometheus.thanosIngress.enabled }}
Expand Down
12 changes: 6 additions & 6 deletions charts/prometheus-kafka-exporter/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: "v1.6.0"
appVersion: "v1.7.0"
description: A Helm chart to export the metrics from Kafka in Prometheus format using the kafka-exporter from https://github.com/danielqsj/kafka_exporter
name: prometheus-kafka-exporter
home: https://github.com/danielqsj/kafka_exporter
version: 2.4.0
version: 2.5.0
kubeVersion: ">=1.19.0-0"
sources:
- https://gkarthiks.github.io/helm-charts/charts/prometheus-kafka-exporter
Expand All @@ -22,7 +22,7 @@ annotations:
- name: Chart Source
url: https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-kafka-exporter
dependencies:
- name: kafka
version: "18.5.0"
repository: https://charts.bitnami.com/bitnami
condition: kafka.enabled
- name: kafka
version: "18.5.0"
repository: https://charts.bitnami.com/bitnami
condition: kafka.enabled
12 changes: 6 additions & 6 deletions charts/prometheus-operator-admission-webhook/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
apiVersion: v2
description: Prometheus Operator Admission Webhook
name: prometheus-operator-admission-webhook
version: 0.6.0
appVersion: 0.67.0
version: 0.7.0
appVersion: 0.68.0
home: https://github.com/prometheus-operator/prometheus-operator
icon: https://github.com/prometheus-operator/prometheus-operator/raw/main/Documentation/logos/prometheus-operator-logo.png
keywords:
Expand All @@ -21,7 +21,7 @@ type: application
annotations:
"artifacthub.io/license": Apache-2.0
"artifacthub.io/links": |
- name: Chart Source
url: https://github.com/prometheus-community/helm-charts
- name: Upstream Project
url: https://github.com/prometheus-operator/prometheus-operator
- name: Chart Source
url: https://github.com/prometheus-community/helm-charts
- name: Upstream Project
url: https://github.com/prometheus-operator/prometheus-operator
22 changes: 11 additions & 11 deletions charts/prometheus-pushgateway/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
apiVersion: v2
appVersion: "v1.6.0"
appVersion: "v1.6.1"
description: A Helm chart for prometheus pushgateway
name: prometheus-pushgateway
version: 2.4.0
version: 2.4.1
home: https://github.com/prometheus/pushgateway
sources:
- https://github.com/prometheus/pushgateway
- https://github.com/prometheus/pushgateway
type: application
keywords:
- pushgateway
- prometheus
- pushgateway
- prometheus
maintainers:
- email: [email protected]
name: gianrubio
- email: [email protected]
name: cstaud
- email: [email protected]
name: zeritti
- email: [email protected]
name: gianrubio
- email: [email protected]
name: cstaud
- email: [email protected]
name: zeritti
annotations:
"artifacthub.io/license": Apache-2.0
"artifacthub.io/links": |
Expand Down

0 comments on commit 2e2bf0c

Please sign in to comment.