Merge branch 'main' into main

prometheus-community · Dec 23, 2024 · 0594cb6 · 0594cb6
2 parents 6958bc4 + 619b91c
commit 0594cb6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
 
       - name: Set up chart-testing
         uses: helm/[email protected]
@@ -42,7 +42,7 @@ jobs:
         run: ct lint --config .github/linters/ct.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.10.0
+        uses: helm/kind-action@v1.12.0
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Apply Gateway API CRDs
@@ -62,8 +62,5 @@ jobs:
           fi
         if: steps.list-changed.outputs.changed == 'true'
 
-      - name: Apply Gateway API CRDs
-        run: kubectl apply -k https://github.com/kubernetes-sigs/gateway-api/config/crd
-
       - name: Run chart-testing (install)
         run: ct install --config .github/linters/ct.yaml
diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 6.5.1
+version: 6.6.0
 kubeVersion: ">=1.19.0-0"
 appVersion: "v1.8.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter

diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "elasticsearch-exporter.selectorLabels" . | nindent 8 }}
+        {{- include "elasticsearch-exporter.labels" . | nindent 8 }}
         {{- with .Values.commonLabels }}
           {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/prometheus-sql-exporter/Chart.yaml b/charts/prometheus-sql-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Prometheus SQL Exporter
 name: prometheus-sql-exporter
-version: 0.2.0
+version: 0.2.1
 appVersion: v0.5.8
 home: https://github.com/justwatchcom/sql_exporter
 sources:

diff --git a/charts/prometheus-sql-exporter/templates/deployment.yaml b/charts/prometheus-sql-exporter/templates/deployment.yaml
@@ -4,6 +4,13 @@ metadata:
   name: {{ template "prometheus-sql-exporter.fullname" . }}
   labels:
     {{- include "prometheus-sql-exporter.labels" . | nindent 4 }}
+    {{- if .Values.deployment.labels }}
+    {{- toYaml .Values.deployment.labels | trim | nindent 4 }}
+    {{- end }}
+  {{- if .Values.deployment.annotations }}
+  annotations:  
+    {{- toYaml .Values.deployment.annotations | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:

diff --git a/charts/prometheus-sql-exporter/values.yaml b/charts/prometheus-sql-exporter/values.yaml
@@ -133,6 +133,11 @@ annotations: {}
 
 podLabels: {}
 
+# Labels and annotations to attach to the deployment resource
+deployment:
+  annotations: {}
+  labels: {}
+
 # Configurable health checks
 livenessProbe:
   initialDelaySeconds: 3