Merge branch 'main' into prom-2.48

Signed-off-by: zeritti <[email protected]>
prometheus-community · Nov 21, 2023 · aa07171 · aa07171
2 parents 293f6c6 + 4d95b7a
commit aa07171
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 9 deletions.
diff --git a/charts/jiralert/Chart.yaml b/charts/jiralert/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: jiralert
 description: A Helm chart for Kubernetes to install jiralert
 type: application
-version: 1.6.1
+version: 1.7.0
 appVersion: "v1.3.0"
 home: "https://github.com/prometheus-community/jiralert"
 keywords:

diff --git a/charts/jiralert/templates/deployment.yaml b/charts/jiralert/templates/deployment.yaml
@@ -72,6 +72,10 @@ spec:
               value: {{ $value | quote }}
           {{- end }}
         {{- end }}
+        {{- with .Values.envFrom }}
+          envFrom:
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
       serviceAccountName: {{ include "jiralert.serviceAccountName" . }}
       {{- with .Values.podSecurityContext }}
       securityContext:

diff --git a/charts/jiralert/values.yaml b/charts/jiralert/values.yaml
@@ -29,6 +29,9 @@ extraVolumeMounts: []
 # -- Additional Volumes
 extraVolumes: []
 
+# -- Additional envFrom for jiralert pods
+envFrom: {}
+
 # Number of pod replicas
 replicaCount: 1
 

diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.8.1
-appVersion: v0.11.1
+version: 4.8.3
+appVersion: v0.11.2
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter
 keywords:

diff --git a/charts/prometheus-adapter/templates/deployment.yaml b/charts/prometheus-adapter/templates/deployment.yaml
@@ -117,7 +117,9 @@ spec:
         {{- toYaml .Values.affinity | nindent 8 }}
       topologySpreadConstraints:
         {{- toYaml .Values.topologySpreadConstraints | nindent 8 }}
-      priorityClassName: {{ .Values.priorityClassName }}
+      {{- with .Values.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
       {{- if .Values.podSecurityContext }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}

diff --git a/charts/prometheus-windows-exporter/Chart.yaml b/charts/prometheus-windows-exporter/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
   - prometheus
   - exporter
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: 0.22.0
 home: https://github.com/prometheus-community/windows_exporter/
 sources:

diff --git a/charts/prometheus-windows-exporter/values.yaml b/charts/prometheus-windows-exporter/values.yaml
@@ -12,7 +12,7 @@ image:
 
 config: |-
   collectors:
-    enabled: '[defaults],container'
+    enabled: '[defaults],memory,container'
 
 imagePullSecrets: []
 # - name: "image-pull-secret"

diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: v2.48.0
-version: 25.7.0
+version: 25.8.0
 kubeVersion: ">=1.19.0-0"
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

diff --git a/charts/prometheus/templates/deploy.yaml b/charts/prometheus/templates/deploy.yaml
@@ -47,6 +47,9 @@ spec:
       {{- end }}
 {{- end }}
       serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }}
+{{- if kindIs "bool" .Values.server.automountServiceAccountToken }}
+      automountServiceAccountToken: {{ .Values.server.automountServiceAccountToken }}
+{{- end }}
       {{- if .Values.server.extraInitContainers }}
       initContainers:
 {{ toYaml .Values.server.extraInitContainers | indent 8 }}

diff --git a/charts/prometheus/templates/serviceaccount.yaml b/charts/prometheus/templates/serviceaccount.yaml
@@ -8,7 +8,9 @@ metadata:
   namespace: {{ include "prometheus.namespace" . }}
   annotations:
 {{ toYaml .Values.serviceAccounts.server.annotations | indent 4 }}
-{{- if .Values.serviceAccounts.server.automountServiceAccountToken }}
+{{- if kindIs "bool" .Values.server.automountServiceAccountToken }}
+automountServiceAccountToken: {{ .Values.server.automountServiceAccountToken }}
+{{- else if kindIs "bool" .Values.serviceAccounts.server.automountServiceAccountToken }}
 automountServiceAccountToken: {{ .Values.serviceAccounts.server.automountServiceAccountToken }}
 {{- end }}
 {{- end }}
diff --git a/charts/prometheus/templates/sts.yaml b/charts/prometheus/templates/sts.yaml
@@ -52,6 +52,9 @@ spec:
       {{- end }}
 {{- end }}
       serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }}
+{{- if kindIs "bool" .Values.server.automountServiceAccountToken }}
+      automountServiceAccountToken: {{ .Values.server.automountServiceAccountToken }}
+{{- end }}
       {{- if .Values.server.extraInitContainers }}
       initContainers:
 {{ toYaml .Values.server.extraInitContainers | indent 8 }}

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -19,7 +19,10 @@ serviceAccounts:
     create: true
     name: ""
     annotations: {}
-    # automountServiceAccountToken:
+
+    ## Opt out of automounting Kubernetes API credentials.
+    ## It will be overriden by server.automountServiceAccountToken value, if set.
+    # automountServiceAccountToken: false
 
 ## Additional labels to attach to all resources
 commonMetaLabels: {}
@@ -98,6 +101,10 @@ server:
   ##
   name: server
 
+  ## Opt out of automounting Kubernetes API credentials.
+  ## If set it will override serviceAccounts.server.automountServiceAccountToken value for ServiceAccount.
+  # automountServiceAccountToken: false
+
   ## Use a ClusterRole (and ClusterRoleBinding)
   ## - If set to false - we define a RoleBinding in the defined namespaces ONLY
   ##