Add scrapeconfig and probe selectors to targetAllocator prometheusCR schema (#1525)

Author: lhp-nemlig

charts/opentelemetry-kube-stack/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-kube-stack
-version: 0.4.0
+version: 0.4.1
 description: |
   OpenTelemetry Quickstart chart for Kubernetes.
   Installs an operator and collector for an easy way to get started with Kubernetes observability.

charts/opentelemetry-kube-stack/charts/crds/crds/monitoring.coreos.com_probes.yaml

@@ -5,7 +5,7 @@ kind: OpAMPBridge
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

charts/opentelemetry-kube-stack/charts/crds/crds/monitoring.coreos.com_scrapeconfigs.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-cluster-stats
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        
@@ -187,7 +187,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml

@@ -62,4 +62,4 @@ spec:
           - -c
           - |
             kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-              -l helm.sh/chart=opentelemetry-kube-stack-0.4.0
+              -l helm.sh/chart=opentelemetry-kube-stack-0.4.1

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml

@@ -5,7 +5,7 @@ kind: Instrumentation
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-apiserver
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-controller-manager
     jobLabel: kube-controller-manager
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-controller-manager
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-dns
     jobLabel: kube-dns
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-dns
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-etcd
     jobLabel: kube-etcd
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-etcd
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-proxy
     jobLabel: kube-proxy
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-proxy
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-scheduler
     jobLabel: kube-scheduler
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-scheduler
-    helm.sh/chart: opentelemetry-kube-stack-0.4.0
+    helm.sh/chart: opentelemetry-kube-stack-0.4.1
     app.kubernetes.io/version: "0.117.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml

@@ -62,4 +62,4 @@ spec:
           - -c
           - |
             kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-              -l helm.sh/chart=opentelemetry-kube-stack-0.4.0
+              -l helm.sh/chart=opentelemetry-kube-stack-0.4.1

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml

@@ -1663,6 +1663,12 @@
         },
         "serviceMonitorSelector": {
           "$ref": "#/$defs/LabelSelector"
+        },
+        "probeSelector": {
+          "$ref": "#/$defs/LabelSelector"
+        },
+        "scrapeConfigSelector": {
+          "$ref": "#/$defs/LabelSelector"
         }
       },
       "additionalProperties": false,

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml

@@ -233,6 +233,12 @@ defaultCRConfig:
   #   serviceMonitorSelector:
   #     key1: value1
   #     key2: value2
+  #   probeSelector:
+  #     key1: value1
+  #     key2: value2
+  #   scrapeConfigSelector:
+  #     key1: value1
+  #     key2: value2
   # securityContext:
   #   runAsUser: 1000
   #   capabilities: