Merge pull request #1983 from prometheus-operator/automated-updates-main

[bot] [main] Automated version update

Merge pull request #1983 from prometheus-operator/automated-updates-main
9977e3c8 · Matthias Loibl · GitHub · 68feba1e · ff89167e · 9977e3c8
Unverified Commit 9977e3c8 authored 2 years ago by Matthias Loibl Committed by GitHub 2 years ago
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -6,7 +6,7 @@
  "nodeExporter": "1.5.0",
  "prometheus": "2.41.0",
  "prometheusAdapter": "0.10.0",
-  "prometheusOperator": "0.61.1",
+  "prometheusOperator": "0.62.0",
  "kubeRbacProxy": "0.14.0",
  "configmapReload": "0.5.0",
  "pyrra": "0.5.2"

--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "9169522d72b2203c923ee511e4e938dedfc5338b",
+      "version": "108cd9abaa947bf3e6f606ed57715ee26ed57087",
      "sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
    },
    {
@@ -58,7 +58,7 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "d68f9a6e0b1af7c4c4056dc2b43fb8f3bac01f43",
+      "version": "bb39488d030dd783ac8ceaa1ff936be14be993f0",
      "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
    },
    {
@@ -78,7 +78,7 @@
          "subdir": "jsonnet/kube-state-metrics"
        }
      },
-      "version": "f1288f943a49344b00ed3d02cc07799da7226414",
+      "version": "ef627d6a1f8208ce8e9979e8bee531b12bbb9a6a",
      "sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI="
    },
    {
@@ -88,7 +88,7 @@
          "subdir": "jsonnet/kube-state-metrics-mixin"
        }
      },
-      "version": "f1288f943a49344b00ed3d02cc07799da7226414",
+      "version": "ef627d6a1f8208ce8e9979e8bee531b12bbb9a6a",
      "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
    },
    {
@@ -98,7 +98,7 @@
          "subdir": "jsonnet/mixin"
        }
      },
-      "version": "5485624cf90dd4de046b4f90757950691d5e71bc",
+      "version": "a3ce9177af24d4ed03075cbc2d15449ac603f67d",
      "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
      "name": "prometheus-operator-mixin"
    },
@@ -109,8 +109,8 @@
          "subdir": "jsonnet/prometheus-operator"
        }
      },
-      "version": "5485624cf90dd4de046b4f90757950691d5e71bc",
-      "sum": "wJ1E8XxYJ0RJrUuDNWLzE7bzo6JrH7P9q1lAu/xi4Ow="
+      "version": "a3ce9177af24d4ed03075cbc2d15449ac603f67d",
+      "sum": "mIHCeM53O4u5RBf4z2Snl+CQRDINv4J3bMygsQWauq4="
    },
    {
      "source": {
@@ -119,7 +119,7 @@
          "subdir": "doc/alertmanager-mixin"
        }
      },
-      "version": "87ad8437fc1e28280e8c5c5fdcb41e0a8904a855",
+      "version": "ecb66f76b0058957e5045114ae01f8b98994451e",
      "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
      "name": "alertmanager"
    },
@@ -130,7 +130,7 @@
          "subdir": "docs/node-mixin"
        }
      },
-      "version": "4484f185663b2808f8a40b5a992711d5277334de",
+      "version": "a3bd2e13052929663dbd7d680fab4a952efb1de6",
      "sum": "TwdaTm0Z++diiLyaKAAimmC6hBL7XbrJc0RHhBCpAdU="
    },
    {
@@ -140,7 +140,7 @@
          "subdir": "documentation/prometheus-mixin"
        }
      },
-      "version": "e1b708200853371517480176da0a03437b3bb2c2",
+      "version": "3b4cbf8da4c5b9b8c6c2a0a30ae182dfbb0b8213",
      "sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
      "name": "prometheus"
    },
@@ -151,7 +151,7 @@
          "subdir": "config/crd/bases"
        }
      },
-      "version": "1b11dfbbf5d8fc5e201d0c22df94f0858ac8f43a",
+      "version": "2584cefb8e6859eb9ee103df199e232cd0066aab",
      "sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
    },
    {
@@ -161,7 +161,7 @@
          "subdir": "mixin"
        }
      },
-      "version": "b60c09b1184c37f43990ae5071daedcb72f51879",
+      "version": "ad10fac477dfadc5b1fabed8b14e708c46ead2fb",
      "sum": "Io++1+lp1oQVoQiVRSCXUiGdTIRPV7aL6Ewgs3bShEs=",
      "name": "thanos-mixin"
    },

--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
  name: prometheus-operator
 rules:
 - apiGroups:

--- a/manifests/prometheusOperator-clusterRoleBinding.yaml
+++ b/manifests/prometheusOperator-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
  name: prometheus-operator
 roleRef:
  apiGroup: rbac.authorization.k8s.io

--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
  name: prometheus-operator
  namespace: monitoring
 spec:
@@ -23,14 +23,14 @@ spec:
        app.kubernetes.io/component: controller
        app.kubernetes.io/name: prometheus-operator
        app.kubernetes.io/part-of: kube-prometheus
-        app.kubernetes.io/version: 0.61.1
+        app.kubernetes.io/version: 0.62.0
    spec:
      automountServiceAccountToken: true
      containers:
      - args:
        - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.61.1
-        image: quay.io/prometheus-operator/prometheus-operator:v0.61.1
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.62.0
+        image: quay.io/prometheus-operator/prometheus-operator:v0.62.0
        name: prometheus-operator
        ports:
        - containerPort: 8080

--- a/manifests/prometheusOperator-networkPolicy.yaml
+++ b/manifests/prometheusOperator-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
  name: prometheus-operator
  namespace: monitoring
 spec:

--- a/manifests/prometheusOperator-prometheusRule.yaml
+++ b/manifests/prometheusOperator-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
    prometheus: k8s
    role: alert-rules
  name: prometheus-operator-rules

--- a/manifests/prometheusOperator-service.yaml
+++ b/manifests/prometheusOperator-service.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
  name: prometheus-operator
  namespace: monitoring
 spec:

--- a/manifests/prometheusOperator-serviceAccount.yaml
+++ b/manifests/prometheusOperator-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
  name: prometheus-operator
  namespace: monitoring
--- a/manifests/prometheusOperator-serviceMonitor.yaml
+++ b/manifests/prometheusOperator-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: controller
    app.kubernetes.io/name: prometheus-operator
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.61.1
+    app.kubernetes.io/version: 0.62.0
  name: prometheus-operator
  namespace: monitoring
 spec:
@@ -21,4 +21,4 @@ spec:
      app.kubernetes.io/component: controller
      app.kubernetes.io/name: prometheus-operator
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 0.61.1
+      app.kubernetes.io/version: 0.62.0
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -4382,6 +4382,12 @@ spec:
                    type: object
                type: object
                x-kubernetes-map-type: atomic
+              podTargetLabels:
+                description: PodTargetLabels are added to all Pod/ServiceMonitors'
+                  podTargetLabels
+                items:
+                  type: string
+                type: array
              portName:
                description: Port name used for the pods and governing service. This
                  defaults to web