Merge pull request #70 from meisterplan/feature/KNUTH-123154-remove-legacy-prometheus-he

KNUTH-123154 Remove legacy Prometheus Helm tagging on additional resources

Author: itd-jsu

CHANGELOG.md

@@ -1,5 +1,9 @@
 # spring-service
 
+## 5.1.1
+
+- Remove now unnecessary, confusing Helm chart labels on prom resources 
+
 ## 5.1.0
 
 - Update externalsecrets.io CRDs to v1.
@@ -223,6 +227,10 @@ deployment** with a short 503 service disruption due to a [bug in the ingress co
 
 # cronjob
 
+## 3.1.1
+
+- Remove now unnecessary, confusing Helm chart labels on prom resources
+
 ## 3.1.0
 
 - Update externalsecrets.io CRDs to v1.

charts/cronjob/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: cronjob
 description: A generalized cronjob that can access secrets.
-version: 3.1.0
+version: 3.1.1

charts/cronjob/templates/post-deployment/prometheus-rules.yaml

@@ -2,9 +2,6 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   namespace: "{{ .Values.namespace }}"
-  labels:
-    app: kube-prometheus-stack
-    release: prometheus
   name: "{{ .Values.cronJobName }}"
 spec:
   groups:

charts/spring-service/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: spring-service
 description: A generalized deployment for Meisterplan Spring Boot services in Kubernetes.
-version: 5.1.0
+version: 5.1.1

charts/spring-service/templates/post-deployment/prometheus-rules.yaml

@@ -2,9 +2,6 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   namespace: "{{ .Values.namespace }}"
-  labels:
-    app: kube-prometheus-stack
-    release: prometheus
   name: "{{ .Values.serviceName }}"
 spec:
   groups:

charts/spring-service/templates/pre-deployment/pod-monitor.yaml

@@ -4,9 +4,6 @@ kind: PodMonitor
 metadata:
   name: "{{ .Values.serviceName }}"
   namespace: "{{ .Values.namespace }}"
-  labels:
-    app: kube-prometheus-stack
-    release: prometheus
 spec:
   selector:
     matchLabels:

tests/cronjob/service-account-cronjob/expected/cronjob/templates/post-deployment/prometheus-rules.yaml

@@ -4,9 +4,6 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   namespace: "team-superpower"
-  labels:
-    app: kube-prometheus-stack
-    release: prometheus
   name: "simple-job-staging"
 spec:
   groups:

tests/cronjob/simple-cronjob/expected/cronjob/templates/post-deployment/prometheus-rules.yaml

@@ -4,9 +4,6 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   namespace: "team-superpower"
-  labels:
-    app: kube-prometheus-stack
-    release: prometheus
   name: "simple-job-staging"
 spec:
   groups:

tests/spring-service/complex-service/expected/spring-service/templates/post-deployment/prometheus-rules.yaml

@@ -4,9 +4,6 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   namespace: "team-supercool"
-  labels:
-    app: kube-prometheus-stack
-    release: prometheus
   name: "myservice"
 spec:
   groups:

tests/spring-service/complex-service/expected/spring-service/templates/pre-deployment/pod-monitor.yaml

@@ -5,9 +5,6 @@ kind: PodMonitor
 metadata:
   name: "myservice"
   namespace: "team-supercool"
-  labels:
-    app: kube-prometheus-stack
-    release: prometheus
 spec:
   selector:
     matchLabels: