Merge branch 'main' into add-sidecar

prometheus-community · Sep 28, 2023 · a29b4af · a29b4af
2 parents 3663a2b + da541e6
commit a29b4af
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 3 deletions.
diff --git a/charts/alertmanager/Chart.yaml b/charts/alertmanager/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/a
 sources:
   - https://github.com/prometheus/alertmanager
 type: application
-version: 1.6.1
+version: 1.7.0
 appVersion: v0.26.0
 kubeVersion: ">=1.19.0-0"
 keywords:

diff --git a/charts/alertmanager/templates/ingressperreplica.yaml b/charts/alertmanager/templates/ingressperreplica.yaml
@@ -0,0 +1,56 @@
+{{- if and .Values.servicePerReplica.enabled .Values.ingressPerReplica.enabled }}
+{{- $pathType := .Values.ingressPerReplica.pathType  }}
+{{- $count := .Values.replicaCount | int -}}
+{{- $servicePort := .Values.service.port -}}
+{{- $ingressValues := .Values.ingressPerReplica -}}
+{{- $fullName := include "alertmanager.fullname" . }}
+apiVersion: v1
+kind: List
+metadata:
+  name: {{ $fullName }}-ingressperreplica
+  namespace: {{ include "alertmanager.namespace" . }}
+items:
+{{- range $i, $e := until $count }}
+  - kind: Ingress
+    apiVersion: {{ include "alertmanager.ingress.apiVersion" $ }}
+    metadata:
+      name: {{ $fullName }}-{{ $i }}
+      namespace: {{ include "alertmanager.namespace" $ }}
+      labels:
+      {{- include "alertmanager.labels" $ | nindent 8 }}
+      {{- if $ingressValues.labels }}
+{{ toYaml $ingressValues.labels | indent 8 }}
+      {{- end }}
+      {{- if $ingressValues.annotations }}
+      annotations:
+{{ toYaml $ingressValues.annotations | indent 8 }}
+      {{- end }}
+    spec:
+      {{- if $ingressValues.className }}
+      ingressClassName: {{ $ingressValues.className }}
+      {{- end }}
+      rules:
+        - host: {{ $ingressValues.hostPrefix }}-{{ $i }}.{{ $ingressValues.hostDomain }}
+          http:
+            paths:
+      {{- range $p := $ingressValues.paths }}
+              - path: {{ tpl $p $ }}
+                pathType: {{ $pathType }}
+                backend:
+                  service:
+                    name: {{ $fullName }}-{{ $i }}
+                    port:
+                      name: http
+      {{- end -}}
+      {{- if or $ingressValues.tlsSecretName $ingressValues.tlsSecretPerReplica.enabled }}
+      tls:
+        - hosts:
+            - {{ $ingressValues.hostPrefix }}-{{ $i }}.{{ $ingressValues.hostDomain }}
+          {{- if $ingressValues.tlsSecretPerReplica.enabled }}
+          secretName: {{ $ingressValues.tlsSecretPerReplica.prefix }}-{{ $i }}
+          {{- else }}
+          secretName: {{ $ingressValues.tlsSecretName }}
+          {{- end }}
+      {{- end }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/alertmanager/templates/serviceperreplica.yaml b/charts/alertmanager/templates/serviceperreplica.yaml
@@ -0,0 +1,44 @@
+{{- if and .Values.servicePerReplica.enabled }}
+{{- $count := .Values.replicaCount | int -}}
+{{- $serviceValues := .Values.servicePerReplica -}}
+apiVersion: v1
+kind: List
+metadata:
+  name: {{ include "alertmanager.fullname" . }}-serviceperreplica
+  namespace: {{ include "alertmanager.namespace" . }}
+items:
+{{- range $i, $e := until $count }}
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      name: {{ include "alertmanager.fullname" $ }}-{{ $i }}
+      namespace: {{ include "alertmanager.namespace" $ }}
+      labels:
+        {{- include "alertmanager.labels" $ | nindent 8 }}
+      {{- if $serviceValues.annotations }}
+      annotations:
+{{ toYaml $serviceValues.annotations | indent 8 }}
+      {{- end }}
+    spec:
+      {{- if $serviceValues.clusterIP }}
+      clusterIP: {{ $serviceValues.clusterIP }}
+      {{- end }}
+      {{- if $serviceValues.loadBalancerSourceRanges }}
+      loadBalancerSourceRanges:
+      {{- range $cidr := $serviceValues.loadBalancerSourceRanges }}
+        - {{ $cidr }}
+      {{- end }}
+      {{- end }}
+      {{- if ne $serviceValues.type "ClusterIP" }}
+      externalTrafficPolicy: {{ $serviceValues.externalTrafficPolicy }}
+      {{- end }}
+      ports:
+        - name: http
+          port: {{ $.Values.service.port }}
+          targetPort: http
+      selector:
+        {{- include "alertmanager.selectorLabels" $ | nindent 8 }}
+        statefulset.kubernetes.io/pod-name: {{ include "alertmanager.fullname" $ }}-{{ $i }}
+      type: "{{ $serviceValues.type }}"
+{{- end }}
+{{- end }}
diff --git a/charts/alertmanager/values.yaml b/charts/alertmanager/values.yaml
@@ -114,6 +114,24 @@ service:
   # Optionally specify extra list of additional ports exposed on both services
   extraPorts: []
 
+# Configuration for creating a separate Service for each statefulset Alertmanager replica
+#
+servicePerReplica:
+  enabled: false
+  annotations: {}
+
+  # Loadbalancer source IP ranges
+  # Only used if servicePerReplica.type is "LoadBalancer"
+  loadBalancerSourceRanges: []
+
+  # Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints
+  #
+  externalTrafficPolicy: Cluster
+
+  # Service type
+  #
+  type: ClusterIP
+
 ingress:
   enabled: false
   className: ""
@@ -130,6 +148,50 @@ ingress:
   #    hosts:
   #      - alertmanager.domain.com
 
+# Configuration for creating an Ingress that will map to each Alertmanager replica service
+# alertmanager.servicePerReplica must be enabled
+#
+ingressPerReplica:
+  enabled: false
+
+  # className for the ingresses
+  #
+  className: ""
+
+  annotations: {}
+  labels: {}
+
+  # Final form of the hostname for each per replica ingress is
+  # {{ ingressPerReplica.hostPrefix }}-{{ $replicaNumber }}.{{ ingressPerReplica.hostDomain }}
+  #
+  # Prefix for the per replica ingress that will have `-$replicaNumber`
+  # appended to the end
+  hostPrefix: "alertmanager"
+  # Domain that will be used for the per replica ingress
+  hostDomain: "domain.com"
+
+  # Paths to use for ingress rules
+  #
+  paths:
+    - /
+
+  # PathType for ingress rules
+  #
+  pathType: ImplementationSpecific
+
+  # Secret name containing the TLS certificate for alertmanager per replica ingress
+  # Secret must be manually created in the namespace
+  tlsSecretName: ""
+
+  # Separated secret for each per replica Ingress. Can be used together with cert-manager
+  #
+  tlsSecretPerReplica:
+    enabled: false
+    # Final form of the secret for each per replica ingress is
+    # {{ tlsSecretPerReplica.prefix }}-{{ $replicaNumber }}
+    #
+    prefix: "alertmanager"
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

diff --git a/charts/prometheus-postgres-exporter/Chart.yaml b/charts/prometheus-postgres-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "v0.13.2"
+appVersion: "v0.14.0"
 description: A Helm chart for prometheus postgres-exporter
 name: prometheus-postgres-exporter
-version: 5.0.0
+version: 5.1.0
 home: https://github.com/prometheus-community/postgres_exporter
 sources:
 - https://github.com/prometheus-community/postgres_exporter