Sync main with 0.65.2 release (prometheus-operator#5623)

* Fix relabelings for ScrapeConfig (prometheus-operator#5611) Signed-off-by: EtienneBarbier <etienne.barbier@atos.net> * chore: Prep for release 0.65.2 (prometheus-operator#5622) * test: Add tests for ScrapeConfig relabelling --------- Signed-off-by: EtienneBarbier <etienne.barbier@atos.net> Co-authored-by: Etienne Barbier <etienne.barbier@atos.net>
mcbenjemaa · Jul 14, 2023 · ce5e6c9 · ce5e6c9
1 parent 6332670
commit ce5e6c9
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.65.2 / 2022-05-31
+
+* [BUGFIX] Fix relabeling issue in `ScrapeConfig` CRD. #5611
+
 ## 0.65.1 / 2022-05-05
 
 * [BUGFIX] Fix panic when ScrapeConfig CRD is not installed. #5550

diff --git a/Documentation/operator.md b/Documentation/operator.md
@@ -58,7 +58,7 @@ Usage of ./operator:
   -namespaces value
     	Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with --deny-namespaces.
   -prometheus-config-reloader string
-    	Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.65.1")
+    	Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.65.2")
   -prometheus-default-base-image string
     	Prometheus default base image (path without tag/version) (default "quay.io/prometheus/prometheus")
   -prometheus-instance-namespaces value

diff --git a/Documentation/rbac.md b/Documentation/rbac.md
@@ -26,7 +26,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -181,7 +181,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
 ```
@@ -197,7 +197,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/Documentation/user-guides/webhook.md b/Documentation/user-guides/webhook.md
@@ -86,7 +86,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
 ```
@@ -97,7 +97,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:
@@ -114,7 +114,7 @@ spec:
         kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook
       labels:
         app.kubernetes.io/name: prometheus-operator-admission-webhook
-        app.kubernetes.io/version: 0.65.1
+        app.kubernetes.io/version: 0.65.2
     spec:
       affinity:
         podAntiAffinity:
@@ -131,7 +131,7 @@ spec:
         - --web.enable-tls=true
         - --web.cert-file=/etc/tls/private/tls.crt
         - --web.key-file=/etc/tls/private/tls.key
-        image: quay.io/prometheus-operator/admission-webhook:v0.65.1
+        image: quay.io/prometheus-operator/admission-webhook:v0.65.2
         name: prometheus-operator-admission-webhook
         ports:
         - containerPort: 8443
@@ -179,7 +179,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.65.1
+0.65.2
diff --git a/bundle.yaml b/bundle.yaml
@@ -38427,7 +38427,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -38444,7 +38444,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -38531,7 +38531,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
 spec:
@@ -38547,14 +38547,14 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: 0.65.1
+        app.kubernetes.io/version: 0.65.2
     spec:
       automountServiceAccountToken: true
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.65.1
-        image: quay.io/prometheus-operator/prometheus-operator:v0.65.1
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.65.2
+        image: quay.io/prometheus-operator/prometheus-operator:v0.65.2
         name: prometheus-operator
         ports:
         - containerPort: 8080
@@ -38588,7 +38588,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
 ---
@@ -38598,7 +38598,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
 spec:

diff --git a/example/admission-webhook/deployment.yaml b/example/admission-webhook/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:
@@ -20,7 +20,7 @@ spec:
         kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook
       labels:
         app.kubernetes.io/name: prometheus-operator-admission-webhook
-        app.kubernetes.io/version: 0.65.1
+        app.kubernetes.io/version: 0.65.2
     spec:
       affinity:
         podAntiAffinity:
@@ -37,7 +37,7 @@ spec:
         - --web.enable-tls=true
         - --web.cert-file=/etc/tls/private/tls.crt
         - --web.key-file=/etc/tls/private/tls.key
-        image: quay.io/prometheus-operator/admission-webhook:v0.65.1
+        image: quay.io/prometheus-operator/admission-webhook:v0.65.2
         name: prometheus-operator-admission-webhook
         ports:
         - containerPort: 8443

diff --git a/example/admission-webhook/pod-disruption-budget.yaml b/example/admission-webhook/pod-disruption-budget.yaml
@@ -3,7 +3,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

diff --git a/example/admission-webhook/service-account.yaml b/example/admission-webhook/service-account.yaml
@@ -4,6 +4,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
diff --git a/example/admission-webhook/service-monitor.yaml b/example/admission-webhook/service-monitor.yaml
@@ -3,7 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:
@@ -13,4 +13,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: prometheus-operator-admission-webhook
-      app.kubernetes.io/version: 0.65.1
+      app.kubernetes.io/version: 0.65.2
diff --git a/example/admission-webhook/service.yaml b/example/admission-webhook/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
 rules:
 - apiGroups:

diff --git a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
 spec:
@@ -20,14 +20,14 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: 0.65.1
+        app.kubernetes.io/version: 0.65.2
     spec:
       automountServiceAccountToken: true
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.65.1
-        image: quay.io/prometheus-operator/prometheus-operator:v0.65.1
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.65.2
+        image: quay.io/prometheus-operator/prometheus-operator:v0.65.2
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml
@@ -5,6 +5,6 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
 spec:
@@ -15,4 +15,4 @@ spec:
     matchLabels:
       app.kubernetes.io/component: controller
       app.kubernetes.io/name: prometheus-operator
-      app.kubernetes.io/version: 0.65.1
+      app.kubernetes.io/version: 0.65.2
diff --git a/example/rbac/prometheus-operator/prometheus-operator-service.yaml b/example/rbac/prometheus-operator/prometheus-operator-service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.65.1
+    app.kubernetes.io/version: 0.65.2
   name: prometheus-operator
   namespace: default
 spec:

diff --git a/go.mod b/go.mod
@@ -21,8 +21,8 @@ require (
 	github.com/oklog/run v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus-community/prom-label-proxy v0.6.0
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.65.1
-	github.com/prometheus-operator/prometheus-operator/pkg/client v0.65.1
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.65.2
+	github.com/prometheus-operator/prometheus-operator/pkg/client v0.65.2
 	github.com/prometheus/alertmanager v0.25.0
 	github.com/prometheus/client_golang v1.15.1
 	github.com/prometheus/common v0.44.0

diff --git a/pkg/client/go.mod b/pkg/client/go.mod
@@ -3,7 +3,7 @@ module github.com/prometheus-operator/prometheus-operator/pkg/client
 go 1.19
 
 require (
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.65.1
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.65.2
 	k8s.io/api v0.27.1
 	k8s.io/apiextensions-apiserver v0.27.1
 	k8s.io/apimachinery v0.27.1

diff --git a/pkg/prometheus/promcfg.go b/pkg/prometheus/promcfg.go
@@ -2132,6 +2132,7 @@ func (cg *ConfigGenerator) generateScrapeConfig(
 	}
 
 	cpf := cg.prom.GetCommonPrometheusFields()
+	relabelings := initRelabelings()
 	labeler := namespacelabeler.New(cpf.EnforcedNamespaceLabel, cpf.ExcludedFromEnforcement, false)
 
 	if sc.Spec.HonorTimestamps != nil {
@@ -2147,10 +2148,8 @@ func (cg *ConfigGenerator) generateScrapeConfig(
 	}
 
 	if sc.Spec.RelabelConfigs != nil {
-		cfg = append(cfg, yaml.MapItem{
-			Key:   "relabel_configs",
-			Value: labeler.GetRelabelingConfigs(sc.TypeMeta, sc.ObjectMeta, sc.Spec.RelabelConfigs),
-		})
+		relabelings = append(relabelings, generateRelabelConfig(labeler.GetRelabelingConfigs(sc.TypeMeta, sc.ObjectMeta, sc.Spec.RelabelConfigs))...)
+		cfg = append(cfg, yaml.MapItem{Key: "relabel_configs", Value: relabelings})
 	}
 
 	// StaticConfig