diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 5440e6a67d1441fa3efd0f87e9ae73805efc49d8..f035bb599025eb56e6966fd986551adb039a66e8 100644 --- 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" diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 0ce57a3289c9894cb8813fe73b11d99f6fb71713..e8442d46a879bcc8615f66501a388fd32942af96 100644 --- 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" }, diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml index 5c481349617058ae71e023286c45e729de9dbebb..0402f1b1fa498e396cc15f65084818d1f37ea9f7 100644 --- 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: diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml index 82e7fd135b7b11ed8629b7e7f9a7993ff3748212..bfbdb9725a626602e5fc5afb278e376694d274e7 100644 --- 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 diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml index 67013059d9e267ce6d909e955aa9dbf9f9311d9b..ca384ffc7c3238942087a0703c41e84f22dd058f 100644 --- 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 diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml index 634dcd51ce0a611ca9f1a3172971e98f3e0fc4ad..7b1d59a5ec745f8e81d20aae4afe6cf63f50394c 100644 --- 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: diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml index dfe1e86b7d8909cc9c1222753140326f56b978c1..b8973743bebbec7821f0ec440631d4019f9d9568 100644 --- 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 diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml index 03db714fbd43a023849c7487eb7d8150a8f8444e..16299eb4a8a5b9c0192804fbd2367aae246c8075 100644 --- 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: diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml index 0cc9c76beb787f1827a99dde82eb30030d777ca8..47dab1569cd3d3b1f340bb0dd2d52fe35b044978 100644 --- 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 diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml index 50d6cd81c30ca2dae9d36a13dbf3fe5d86deee33..0f7d68a733e7edc8983fae1f2a4606c4c5329ac7 100644 --- 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 diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 1f1bbf4ee99d00283246cac149d00381f1ff9a44..43390f7d9cc1ade13bcd4953991771dba1d1ff36 100644 --- 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