Merge branch 'main' into fix/priority-class

prometheus-community · Nov 8, 2023 · 67f6210 · 67f6210
2 parents 87ceb8f + 78952f9
commit 67f6210
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 17 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -18,17 +18,17 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: '3.7'
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
-          changed=$(ct list-changed --config .github/linters/ct.yaml)
+          changed="$(ct list-changed --config .github/linters/ct.yaml)"
           if [[ -n "$changed" ]]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
+            echo "changed=true" >> "$GITHUB_OUTPUT"
           fi
 
       # - name: install helm unittest plugin

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.0
+version: 1.6.1
 appVersion: "v1.3.0"
 home: "https://github.com/prometheus-community/jiralert"
 keywords:

diff --git a/...jiralert/ci/example-receivers-values.yaml → charts/jiralert/ci/test-values.yaml b/...jiralert/ci/example-receivers-values.yaml → charts/jiralert/ci/test-values.yaml
@@ -5,3 +5,6 @@ config:
   receivers:
     - name: 'default'
       project: EXAMPLE
+
+ingress:
+  enabled: true
diff --git a/charts/jiralert/templates/ingress.yaml b/charts/jiralert/templates/ingress.yaml
@@ -1,12 +1,11 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "jiralert.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}
 {{- end }}
-apiVersion: {{template "jiralert.ingress.apiversion" . }}
+apiVersion: {{ template "jiralert.ingress.apiversion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -49,10 +48,10 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: {{ $svcPort }}
+                  number: 9097
               {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              servicePort: 9097
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
 - prometheus
 - kubernetes
 type: application
-version: 5.14.0
+version: 5.15.0
 appVersion: 2.10.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:

diff --git a/charts/kube-state-metrics/templates/servicemonitor.yaml b/charts/kube-state-metrics/templates/servicemonitor.yaml
@@ -49,6 +49,9 @@ spec:
     {{- if .Values.prometheus.monitor.proxyUrl }}
       proxyUrl: {{ .Values.prometheus.monitor.proxyUrl}}
     {{- end }}
+    {{- if .Values.prometheus.monitor.enableHttp2 }}
+      enableHttp2: {{ .Values.prometheus.monitor.enableHttp2}}
+    {{- end }}
     {{- if .Values.prometheus.monitor.honorLabels }}
       honorLabels: true
     {{- end }}
@@ -85,6 +88,9 @@ spec:
     {{- if .Values.prometheus.monitor.proxyUrl }}
       proxyUrl: {{ .Values.prometheus.monitor.proxyUrl}}
     {{- end }}
+    {{- if .Values.prometheus.monitor.enableHttp2 }}
+      enableHttp2: {{ .Values.prometheus.monitor.enableHttp2}}
+    {{- end }}
     {{- if .Values.prometheus.monitor.honorLabels }}
       honorLabels: true
     {{- end }}

diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml
@@ -175,6 +175,8 @@ prometheus:
     labelValueLengthLimit: 0
     scrapeTimeout: ""
     proxyUrl: ""
+    ## Whether to enable HTTP2 for servicemonitor
+    # enableHttp2: false
     selectorOverride: {}
     honorLabels: false
     metricRelabelings: []

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

diff --git a/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml b/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml
@@ -12,6 +12,6 @@ metadata:
 rules:
 - apiGroups:
   - custom.metrics.k8s.io
-  resources: ["*"]
+  resources: {{ toYaml .Values.rbac.customMetrics.resources | nindent 2 }}
   verbs: ["*"]
 {{- end -}}
diff --git a/charts/prometheus-adapter/templates/external-metrics-cluster-role.yaml b/charts/prometheus-adapter/templates/external-metrics-cluster-role.yaml
@@ -12,8 +12,7 @@ metadata:
 rules:
 - apiGroups:
   - "external.metrics.k8s.io"
-  resources:
-  - "*"
+  resources: {{ toYaml .Values.rbac.externalMetrics.resources | nindent 2 }}
   verbs:
   - list
   - get

diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml
@@ -48,7 +48,7 @@ podSecurityContext:
 securityContext:
   allowPrivilegeEscalation: false
   capabilities:
-    drop: ["all"]
+    drop: ["ALL"]
   readOnlyRootFilesystem: true
   runAsNonRoot: true
   runAsUser: 10001
@@ -58,6 +58,10 @@ securityContext:
 rbac:
   # Specifies whether RBAC resources should be created
   create: true
+  externalMetrics:
+    resources: ["*"]
+  customMetrics:
+    resources: ["*"]
 
 psp:
   # Specifies whether PSP resources should be created

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