chore: Removes default selector label from Helm chart

jmriebold · Aug 19, 2024 · 5ad201e · 5ad201e
1 parent adcc596
commit 5ad201e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/chart/sqs-prometheus-exporter/Chart.yaml b/chart/sqs-prometheus-exporter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: sqs-prometheus-exporter
-version: 2.0.0
+version: 2.0.1
 description: Helm chart for the SQS Prometheus Exporter
 keywords:
   - prometheus

diff --git a/chart/sqs-prometheus-exporter/README.md b/chart/sqs-prometheus-exporter/README.md
@@ -17,7 +17,7 @@ helm install release-name --set sqs.region=[region-name] \
 
 ### From 1.x.x to 2.x.x
 
-This version adds a Prometheus PodMonitor CRD and refactors the deployment selector labels, both of which are breaking changes, the latter of which requires a chart reinstall. When reinstalling, ensure that `podMonitor.labels.release` matches your Prometheus PodMonitor selector.
+This version adds a Prometheus PodMonitor CRD and refactors the deployment selector labels, both of which are breaking changes, the latter of which requires a chart reinstall. When reinstalling, ensure that you set `podMonitor.labels` if your Prometheus installation has a PodMonitor selector.
 
 # Configuration
 

diff --git a/chart/sqs-prometheus-exporter/values.yaml b/chart/sqs-prometheus-exporter/values.yaml
@@ -30,9 +30,8 @@ podMonitor:
   # Enable Prometheus metrics scraping
   enabled: true
   interval: 30s
-  labels:
-    # Must match Prometheus PodMonitor selector
-    release: kube-prometheus-stack
+  # Set Prometheus PodMonitor selector labels here if needed
+  labels: {}
   relabelings: []
   metricRelabelings: []
   targetLabels: []

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -50,6 +50,9 @@ deploy:
             enabled: false
           kubeScheduler:
             enabled: false
+          prometheus:
+            prometheusSpec:
+              podMonitorSelectorNilUsesHelmValues: false
 
       - name: sqs-prometheus-exporter
         chartPath: chart/sqs-prometheus-exporter
@@ -61,7 +64,8 @@ deploy:
             tag: "{{.IMAGE_TAG_sqs_prometheus_exporter}}@{{.IMAGE_DIGEST_sqs_prometheus_exporter}}"
           sqs:
             region: us-east-1
-            queueUrls: [ "http://sqs.us-east-1.localhost.localstack.cloud:4566/000000000000/sample-queue" ]
+            queueUrls:
+              - "http://sqs.us-east-1.localhost.localstack.cloud:4566/000000000000/sample-queue"
           deployment:
             extraEnv:
               AWS_ACCESS_KEY_ID: 123