From 7bd4657d9ecb4d2ceb5be2a0efbd525b5d112a84 Mon Sep 17 00:00:00 2001 From: Michael Borens Date: Thu, 25 Jan 2024 14:39:30 +0100 Subject: [PATCH 1/3] fix: azuresdconfig typo (#6259) * fix: typo on AuthenticationMethod check --- pkg/prometheus/resource_selector.go | 2 +- pkg/prometheus/resource_selector_test.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/prometheus/resource_selector.go b/pkg/prometheus/resource_selector.go index 1da9df2d76..e5e5def60c 100644 --- a/pkg/prometheus/resource_selector.go +++ b/pkg/prometheus/resource_selector.go @@ -908,7 +908,7 @@ func (rs *ResourceSelector) validateEC2SDConfigs(ctx context.Context, sc *monito func (rs *ResourceSelector) validateAzureSDConfigs(ctx context.Context, sc *monitoringv1alpha1.ScrapeConfig) error { for i, config := range sc.Spec.AzureSDConfigs { // Since Prometheus uses default authentication method as "OAuth" - if ptr.Deref(config.AuthenticationMethod, "") == "ManagedIdentify" { + if ptr.Deref(config.AuthenticationMethod, "") == "ManagedIdentity" { continue } diff --git a/pkg/prometheus/resource_selector_test.go b/pkg/prometheus/resource_selector_test.go index 8b456bb635..1e9e5e1ea2 100644 --- a/pkg/prometheus/resource_selector_test.go +++ b/pkg/prometheus/resource_selector_test.go @@ -1846,6 +1846,17 @@ func TestSelectScrapeConfigs(t *testing.T) { }, selected: false, }, + { + scenario: "Azure SD config without options provided for ManagedIdentity authentication method", + updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) { + sc.AzureSDConfigs = []monitoringv1alpha1.AzureSDConfig{ + { + AuthenticationMethod: ptr.To("ManagedIdentity"), + }, + } + }, + selected: true, + }, { scenario: "OpenStack SD config with valid secret ref", updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) { From cf22056b6b052ff50cc3750b8b18518de4631b88 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Thu, 25 Jan 2024 15:05:31 +0100 Subject: [PATCH 2/3] chore: cut v0.71.2 Signed-off-by: Simon Pasquier --- CHANGELOG.md | 4 +++ Documentation/operator.md | 2 +- Documentation/rbac.md | 6 ++-- Documentation/user-guides/prometheus-agent.md | 2 +- Documentation/user-guides/webhook.md | 10 +++--- VERSION | 2 +- bundle.yaml | 36 +++++++++---------- example/admission-webhook/deployment.yaml | 6 ++-- .../pod-disruption-budget.yaml | 2 +- .../admission-webhook/service-account.yaml | 2 +- .../admission-webhook/service-monitor.yaml | 4 +-- example/admission-webhook/service.yaml | 2 +- .../alertmanager-crd-conversion/patch.json | 2 +- ...toring.coreos.com_alertmanagerconfigs.yaml | 2 +- .../monitoring.coreos.com_alertmanagers.yaml | 2 +- .../monitoring.coreos.com_podmonitors.yaml | 2 +- .../monitoring.coreos.com_probes.yaml | 2 +- ...onitoring.coreos.com_prometheusagents.yaml | 2 +- .../monitoring.coreos.com_prometheuses.yaml | 2 +- ...monitoring.coreos.com_prometheusrules.yaml | 2 +- .../monitoring.coreos.com_scrapeconfigs.yaml | 2 +- ...monitoring.coreos.com_servicemonitors.yaml | 2 +- .../monitoring.coreos.com_thanosrulers.yaml | 2 +- ...metheus-operator-cluster-role-binding.yaml | 2 +- .../prometheus-operator-cluster-role.yaml | 2 +- .../prometheus-operator-deployment.yaml | 8 ++--- .../prometheus-operator-service-account.yaml | 2 +- .../prometheus-operator-service-monitor.yaml | 4 +-- .../prometheus-operator-service.yaml | 2 +- go.mod | 4 +-- .../alertmanagerconfigs-crd.json | 2 +- .../alertmanagers-crd.json | 2 +- .../prometheus-operator/podmonitors-crd.json | 2 +- jsonnet/prometheus-operator/probes-crd.json | 2 +- .../prometheusagents-crd.json | 2 +- .../prometheus-operator/prometheuses-crd.json | 2 +- .../prometheusrules-crd.json | 2 +- .../scrapeconfigs-crd.json | 2 +- .../servicemonitors-crd.json | 2 +- .../prometheus-operator/thanosrulers-crd.json | 2 +- pkg/client/go.mod | 2 +- 41 files changed, 75 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4704b48ce3..cdb718ce2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.71.2 / 2024-01-25 + +* [BUGFIX] Fix Azure SD service discovery when using `ManagedIdentity`. #6259 + ## 0.71.1 / 2024-01-22 * [BUGFIX] Pass all the ThanosRuler `.spec.volumes` fields down to the pods. #6249 diff --git a/Documentation/operator.md b/Documentation/operator.md index 00e12900bd..8a17199708 100644 --- a/Documentation/operator.md +++ b/Documentation/operator.md @@ -64,7 +64,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.71.1") + Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.71.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 index 7a5476b90f..08295c9914 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator rules: - apiGroups: @@ -194,7 +194,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator namespace: default ``` @@ -210,7 +210,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/Documentation/user-guides/prometheus-agent.md b/Documentation/user-guides/prometheus-agent.md index b443808a73..81fce22091 100644 --- a/Documentation/user-guides/prometheus-agent.md +++ b/Documentation/user-guides/prometheus-agent.md @@ -26,7 +26,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator rules: - apiGroups: diff --git a/Documentation/user-guides/webhook.md b/Documentation/user-guides/webhook.md index 83fc859d51..e20305ba7d 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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.71.1 + app.kubernetes.io/version: 0.71.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.71.1 + app.kubernetes.io/version: 0.71.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.71.1 + image: quay.io/prometheus-operator/admission-webhook:v0.71.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.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/VERSION b/VERSION index 5e5d529aad..5d0ea336e5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.71.1 +0.71.2 diff --git a/bundle.yaml b/bundle.yaml index 6cde689563..cb157558ac 100644 --- a/bundle.yaml +++ b/bundle.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -5726,7 +5726,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -13154,7 +13154,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -13874,7 +13874,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -14611,7 +14611,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -23158,7 +23158,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -33108,7 +33108,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -33239,7 +33239,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -35386,7 +35386,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -36129,7 +36129,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -43045,7 +43045,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -43062,7 +43062,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator rules: - apiGroups: @@ -43162,7 +43162,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator namespace: default spec: @@ -43178,17 +43178,17 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.71.1 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.71.2 env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.71.1 + image: quay.io/prometheus-operator/prometheus-operator:v0.71.2 name: prometheus-operator ports: - containerPort: 8080 @@ -43222,7 +43222,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator namespace: default --- @@ -43232,7 +43232,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator namespace: default spec: diff --git a/example/admission-webhook/deployment.yaml b/example/admission-webhook/deployment.yaml index b8ba571cc5..baa942de90 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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.71.1 + app.kubernetes.io/version: 0.71.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.71.1 + image: quay.io/prometheus-operator/admission-webhook:v0.71.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 index b1d01238d7..09fb611a78 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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 index 848e43e3bf..a0e498d989 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator-admission-webhook namespace: default diff --git a/example/admission-webhook/service-monitor.yaml b/example/admission-webhook/service-monitor.yaml index 48059c5afb..5dde5bb24e 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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.71.1 + app.kubernetes.io/version: 0.71.2 diff --git a/example/admission-webhook/service.yaml b/example/admission-webhook/service.yaml index 6c17dfaf60..af2ef76bd3 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/example/alertmanager-crd-conversion/patch.json b/example/alertmanager-crd-conversion/patch.json index fff133bf97..3e4c111983 100644 --- a/example/alertmanager-crd-conversion/patch.json +++ b/example/alertmanager-crd-conversion/patch.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml index e84880f6a8..e71a3fd412 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml index d74428a132..eff9d65b43 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml index 03f98b0f55..d3d00e3f19 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml index 11b3353044..7fa1ca3c5f 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml index 9ecf89aaa2..6293704e59 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml index 456a9f84cc..03ea31aff2 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml index 80db23936c..8b0799cf04 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml index a545cb6e19..596d954169 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml index 2ca67c1e6e..7ae207ce3f 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml index 89aa49ea30..72420e0bf6 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.1 + operator.prometheus.io/version: 0.71.2 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml index 7fa964497b..e0acad72ff 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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 index cfbd511e6f..3ecd99c149 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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 index 8a4938e1a4..cbd193da6f 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator namespace: default spec: @@ -20,17 +20,17 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.71.1 + app.kubernetes.io/version: 0.71.2 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.71.1 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.71.2 env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.71.1 + image: quay.io/prometheus-operator/prometheus-operator:v0.71.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 index 0ce9b77b71..e69986e7ef 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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 index e1528b40be..1bd6d22c99 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.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.71.1 + app.kubernetes.io/version: 0.71.2 diff --git a/example/rbac/prometheus-operator/prometheus-operator-service.yaml b/example/rbac/prometheus-operator/prometheus-operator-service.yaml index 52a3ea1d14..39ae51c763 100644 --- 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.71.1 + app.kubernetes.io/version: 0.71.2 name: prometheus-operator namespace: default spec: diff --git a/go.mod b/go.mod index b59ec5c1fe..5a3353a261 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( github.com/mitchellh/hashstructure v1.1.0 github.com/oklog/run v1.1.0 github.com/prometheus-community/prom-label-proxy v0.8.0 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.1 - github.com/prometheus-operator/prometheus-operator/pkg/client v0.71.1 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2 + github.com/prometheus-operator/prometheus-operator/pkg/client v0.71.2 github.com/prometheus/alertmanager v0.26.0 github.com/prometheus/client_golang v1.18.0 github.com/prometheus/common v0.45.0 diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index 00be8a1ee1..b5e8b224c1 100644 --- a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json +++ b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/alertmanagers-crd.json b/jsonnet/prometheus-operator/alertmanagers-crd.json index 6c46ce2a3b..ba2775db50 100644 --- a/jsonnet/prometheus-operator/alertmanagers-crd.json +++ b/jsonnet/prometheus-operator/alertmanagers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "alertmanagers.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/podmonitors-crd.json b/jsonnet/prometheus-operator/podmonitors-crd.json index 181cfb83fb..f5659b5cc3 100644 --- a/jsonnet/prometheus-operator/podmonitors-crd.json +++ b/jsonnet/prometheus-operator/podmonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "podmonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/probes-crd.json b/jsonnet/prometheus-operator/probes-crd.json index 6284037385..002592d87b 100644 --- a/jsonnet/prometheus-operator/probes-crd.json +++ b/jsonnet/prometheus-operator/probes-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "probes.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusagents-crd.json b/jsonnet/prometheus-operator/prometheusagents-crd.json index 5434b71810..10ec774989 100644 --- a/jsonnet/prometheus-operator/prometheusagents-crd.json +++ b/jsonnet/prometheus-operator/prometheusagents-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "prometheusagents.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheuses-crd.json b/jsonnet/prometheus-operator/prometheuses-crd.json index fe345f2837..bf2cb724fc 100644 --- a/jsonnet/prometheus-operator/prometheuses-crd.json +++ b/jsonnet/prometheus-operator/prometheuses-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "prometheuses.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusrules-crd.json b/jsonnet/prometheus-operator/prometheusrules-crd.json index 36b4d1a026..9381d3df82 100644 --- a/jsonnet/prometheus-operator/prometheusrules-crd.json +++ b/jsonnet/prometheus-operator/prometheusrules-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/jsonnet/prometheus-operator/scrapeconfigs-crd.json index 075b07b5ff..a051fea1f3 100644 --- a/jsonnet/prometheus-operator/scrapeconfigs-crd.json +++ b/jsonnet/prometheus-operator/scrapeconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "scrapeconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/servicemonitors-crd.json b/jsonnet/prometheus-operator/servicemonitors-crd.json index bcfa656947..5fcdabcd31 100644 --- a/jsonnet/prometheus-operator/servicemonitors-crd.json +++ b/jsonnet/prometheus-operator/servicemonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "servicemonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/thanosrulers-crd.json b/jsonnet/prometheus-operator/thanosrulers-crd.json index b88ba7ed5a..4f2f2687d7 100644 --- a/jsonnet/prometheus-operator/thanosrulers-crd.json +++ b/jsonnet/prometheus-operator/thanosrulers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.13.0", - "operator.prometheus.io/version": "0.71.1" + "operator.prometheus.io/version": "0.71.2" }, "name": "thanosrulers.monitoring.coreos.com" }, diff --git a/pkg/client/go.mod b/pkg/client/go.mod index 3e1a4efd42..25f6a4ec68 100644 --- a/pkg/client/go.mod +++ b/pkg/client/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.1 require ( - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.1 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2 k8s.io/api v0.28.4 k8s.io/apiextensions-apiserver v0.28.4 k8s.io/apimachinery v0.28.4 From d9d8f7e64d440ebbe3111bbfcb2538c28a113777 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Jan 2024 16:23:01 +0000 Subject: [PATCH 3/3] [bot] vendor: revendor Signed-off-by: github-actions[bot] --- vendor/modules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index ed6c36f930..b45ab8724b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -360,13 +360,13 @@ github.com/pmezard/go-difflib/difflib # github.com/prometheus-community/prom-label-proxy v0.8.0 ## explicit; go 1.19 github.com/prometheus-community/prom-label-proxy/injectproxy -# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.1 => ./pkg/apis/monitoring +# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2 => ./pkg/apis/monitoring ## explicit; go 1.21 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1 -# github.com/prometheus-operator/prometheus-operator/pkg/client v0.71.1 => ./pkg/client +# github.com/prometheus-operator/prometheus-operator/pkg/client v0.71.2 => ./pkg/client ## explicit; go 1.21 github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1 github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1