From 4130922c0200b427e104691adc95d9802b628663 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Mon, 17 Feb 2025 15:33:51 +0100 Subject: [PATCH 1/3] test: skip DNS service discovery tests The website used for testing is unreachable for now. Signed-off-by: Simon Pasquier --- test/e2e/scrapeconfig_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/e2e/scrapeconfig_test.go b/test/e2e/scrapeconfig_test.go index b65d9b6f64b..3c61aef2dbd 100644 --- a/test/e2e/scrapeconfig_test.go +++ b/test/e2e/scrapeconfig_test.go @@ -531,6 +531,8 @@ func testScrapeConfigKubernetesNodeRole(t *testing.T) { // testScrapeConfigDNSSDConfig tests whether DNS SD based monitoring works as expected. func testScrapeConfigDNSSDConfig(t *testing.T) { + t.Skip("DNS service discovery tests are disabled until we find a replacement for node.demo.do.prometheus.io") + testCtx := framework.NewTestCtx(t) defer testCtx.Cleanup(t) ns := framework.CreateNamespace(context.Background(), t, testCtx) From 53b60e10e0095192bae8b5614c17f0eabd2bade8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lia=20Barroso?= Date: Tue, 18 Feb 2025 09:39:06 +0000 Subject: [PATCH 2/3] fix - MSTeamsV2 config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hélia Barroso --- pkg/alertmanager/amcfg_test.go | 16 ++++++++++++++++ ...steamsv2_config_for_supported_versions.golden | 1 - ...v2_config_with_webhook_config_file_set.golden | 5 +++++ pkg/alertmanager/types.go | 4 ++-- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkg/alertmanager/testdata/msteamsv2_config_with_webhook_config_file_set.golden diff --git a/pkg/alertmanager/amcfg_test.go b/pkg/alertmanager/amcfg_test.go index 338c8778af1..655a259ae95 100644 --- a/pkg/alertmanager/amcfg_test.go +++ b/pkg/alertmanager/amcfg_test.go @@ -2843,6 +2843,22 @@ func TestSanitizeConfig(t *testing.T) { }, expectErr: true, }, + { + name: "msteamsv2_config with webhook url file set", + againstVersion: versionMSteamsV2Allowed, + in: &alertmanagerConfig{ + Receivers: []*receiver{ + { + MSTeamsV2Configs: []*msTeamsV2Config{ + { + WebhookURLFile: "/var/secrets/webhook-url-file", + }, + }, + }, + }, + }, + golden: "msteamsv2_config_with_webhook_config_file_set.golden", + }, { name: "webex_config returns error for missing mandatory field", againstVersion: versionWebexAllowed, diff --git a/pkg/alertmanager/testdata/msteamsv2_config_for_supported_versions.golden b/pkg/alertmanager/testdata/msteamsv2_config_for_supported_versions.golden index cd55c244cb7..e905b05e876 100644 --- a/pkg/alertmanager/testdata/msteamsv2_config_for_supported_versions.golden +++ b/pkg/alertmanager/testdata/msteamsv2_config_for_supported_versions.golden @@ -2,5 +2,4 @@ receivers: - name: "" msteamsv2_configs: - webhook_url: http://example.com - webhook_url_file: "" templates: [] diff --git a/pkg/alertmanager/testdata/msteamsv2_config_with_webhook_config_file_set.golden b/pkg/alertmanager/testdata/msteamsv2_config_with_webhook_config_file_set.golden new file mode 100644 index 00000000000..40cf23bbe1e --- /dev/null +++ b/pkg/alertmanager/testdata/msteamsv2_config_with_webhook_config_file_set.golden @@ -0,0 +1,5 @@ +receivers: +- name: "" + msteamsv2_configs: + - webhook_url_file: /var/secrets/webhook-url-file +templates: [] diff --git a/pkg/alertmanager/types.go b/pkg/alertmanager/types.go index 8fb784b6b88..9b4b47829f8 100644 --- a/pkg/alertmanager/types.go +++ b/pkg/alertmanager/types.go @@ -431,8 +431,8 @@ type msTeamsConfig struct { type msTeamsV2Config struct { SendResolved *bool `yaml:"send_resolved,omitempty"` - WebhookURL string `yaml:"webhook_url"` - WebhookURLFile string `yaml:"webhook_url_file"` + WebhookURL string `yaml:"webhook_url,omitempty"` + WebhookURLFile string `yaml:"webhook_url_file,omitempty"` Title string `yaml:"title,omitempty"` Text string `yaml:"text,omitempty"` HTTPConfig *httpClientConfig `yaml:"http_config,omitempty"` From e8a716268fa48e66dd4be70cb9c9648d4736a659 Mon Sep 17 00:00:00 2001 From: Jayapriya Pai Date: Wed, 19 Feb 2025 12:02:51 +0530 Subject: [PATCH 3/3] chore: cut v0.80.1 Signed-off-by: Jayapriya Pai --- CHANGELOG.md | 6 +++- Documentation/platform/operator.md | 2 +- Documentation/platform/prometheus-agent.md | 2 +- Documentation/platform/rbac.md | 6 ++-- Documentation/platform/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, 76 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16c98939993..5b5d69d9e39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# 0.80.0 / 2025-02-03 +# 0.80.1 / 2025-02-19 + +* [BUGFIX] Fix msteamsv2_configs to work with either `webhook_url` or `webhook_url_file`. #7352 + +# 0.80.0 / 2025-02-04 * [CHANGE] Add more API validations to the ScrapeConfig CRD. #7231 #7220 #7215 #7238 #7244 #7255 * [FEATURE] Add `serviceName` field to the Prometheus and PrometheusAgent CRDs. #6687 diff --git a/Documentation/platform/operator.md b/Documentation/platform/operator.md index a51da4e6725..52111628784 100644 --- a/Documentation/platform/operator.md +++ b/Documentation/platform/operator.md @@ -81,7 +81,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.80.0") + Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.80.1") -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/platform/prometheus-agent.md b/Documentation/platform/prometheus-agent.md index 877f4e5a168..07f5760dbcc 100644 --- a/Documentation/platform/prometheus-agent.md +++ b/Documentation/platform/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.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator rules: - apiGroups: diff --git a/Documentation/platform/rbac.md b/Documentation/platform/rbac.md index f22928e9aea..e3912a20c1f 100644 --- a/Documentation/platform/rbac.md +++ b/Documentation/platform/rbac.md @@ -26,7 +26,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator rules: - apiGroups: @@ -207,7 +207,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator namespace: default ``` @@ -223,7 +223,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/Documentation/platform/webhook.md b/Documentation/platform/webhook.md index 62e14b61da2..f01645f91f3 100644 --- a/Documentation/platform/webhook.md +++ b/Documentation/platform/webhook.md @@ -86,7 +86,7 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 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.80.0 + app.kubernetes.io/version: 0.80.1 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.80.0 + app.kubernetes.io/version: 0.80.1 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.80.0 + image: quay.io/prometheus-operator/admission-webhook:v0.80.1 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.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/VERSION b/VERSION index b53d377d909..e72f24026fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.80.0 +0.80.1 diff --git a/bundle.yaml b/bundle.yaml index 8bca8e9c488..60e3dc14c0b 100644 --- a/bundle.yaml +++ b/bundle.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -10042,7 +10042,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -18780,7 +18780,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -19988,7 +19988,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -21163,7 +21163,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -31982,7 +31982,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -45031,7 +45031,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -45191,7 +45191,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -57704,7 +57704,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -58934,7 +58934,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -67075,7 +67075,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -67092,7 +67092,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator rules: - apiGroups: @@ -67200,7 +67200,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator namespace: default spec: @@ -67216,19 +67216,19 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.1 - --kubelet-endpoints=true - --kubelet-endpointslice=false env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.80.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.80.1 name: prometheus-operator ports: - containerPort: 8080 @@ -67262,7 +67262,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator namespace: default --- @@ -67272,7 +67272,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator namespace: default spec: diff --git a/example/admission-webhook/deployment.yaml b/example/admission-webhook/deployment.yaml index 4d6a452a713..a11a7fd7e5c 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.80.0 + app.kubernetes.io/version: 0.80.1 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.80.0 + app.kubernetes.io/version: 0.80.1 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.80.0 + image: quay.io/prometheus-operator/admission-webhook:v0.80.1 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 0eda2e0bf99..c2bbfaea1fe 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.80.0 + app.kubernetes.io/version: 0.80.1 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 bf3fb9a5241..9b736060369 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.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator-admission-webhook namespace: default diff --git a/example/admission-webhook/service-monitor.yaml b/example/admission-webhook/service-monitor.yaml index 4d0fe0827ca..0be29780622 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.80.0 + app.kubernetes.io/version: 0.80.1 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.80.0 + app.kubernetes.io/version: 0.80.1 diff --git a/example/admission-webhook/service.yaml b/example/admission-webhook/service.yaml index 855ab502632..6342a098eba 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.80.0 + app.kubernetes.io/version: 0.80.1 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 0e0ff634dca..03f1fb280c8 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "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 77cf9322423..05d2afb45f9 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 d9cbca683f2..67a24ac0317 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 5193e219d49..ecc6a8b14e6 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 f793b875a61..bf0e1998aba 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 2dd454fd0ad..8749cc1cb63 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 0a1fd220d9d..49ceaf77fb1 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 f28a9fc4e77..8644caafd43 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 401571980ba..3c7c0cd363d 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 a404bf2566e..8af61de63a6 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 ac4f5e2d389..a4a412a8f7d 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.17.1 - operator.prometheus.io/version: 0.80.0 + operator.prometheus.io/version: 0.80.1 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 34899c73750..9ed3d2f7450 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.80.0 + app.kubernetes.io/version: 0.80.1 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 7d549ae111c..fa22ae83db6 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.80.0 + app.kubernetes.io/version: 0.80.1 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 ab1e4e49498..fed559f3082 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.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator namespace: default spec: @@ -20,19 +20,19 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.80.0 + app.kubernetes.io/version: 0.80.1 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.1 - --kubelet-endpoints=true - --kubelet-endpointslice=false env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.80.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.80.1 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 e769bd7d2f0..583aa59dd16 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.80.0 + app.kubernetes.io/version: 0.80.1 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 ef912770895..e6cf72802f9 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.80.0 + app.kubernetes.io/version: 0.80.1 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.80.0 + app.kubernetes.io/version: 0.80.1 diff --git a/example/rbac/prometheus-operator/prometheus-operator-service.yaml b/example/rbac/prometheus-operator/prometheus-operator-service.yaml index 627c281bd1e..6ab3f8c0678 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.80.0 + app.kubernetes.io/version: 0.80.1 name: prometheus-operator namespace: default spec: diff --git a/go.mod b/go.mod index c2d40d21333..c27cc3cbcce 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( github.com/mitchellh/hashstructure v1.1.0 github.com/oklog/run v1.1.0 github.com/prometheus-community/prom-label-proxy v0.11.0 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.0 - github.com/prometheus-operator/prometheus-operator/pkg/client v0.80.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 + github.com/prometheus-operator/prometheus-operator/pkg/client v0.80.1 github.com/prometheus/alertmanager v0.28.0 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.61.0 diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index 671d0b9d96e..630ef66e0c4 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/alertmanagers-crd.json b/jsonnet/prometheus-operator/alertmanagers-crd.json index b83fb0078e1..e23d950c733 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "alertmanagers.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/podmonitors-crd.json b/jsonnet/prometheus-operator/podmonitors-crd.json index 6bde6dac1db..f46bbddfdd0 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "podmonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/probes-crd.json b/jsonnet/prometheus-operator/probes-crd.json index 234c198c7c6..6008cdf60eb 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "probes.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusagents-crd.json b/jsonnet/prometheus-operator/prometheusagents-crd.json index d98afb35e52..7cb2a6614d3 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "prometheusagents.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheuses-crd.json b/jsonnet/prometheus-operator/prometheuses-crd.json index f77e991e95a..0f3f1542fbf 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "prometheuses.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusrules-crd.json b/jsonnet/prometheus-operator/prometheusrules-crd.json index 5682f2ee98d..2b8cefcc998 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/jsonnet/prometheus-operator/scrapeconfigs-crd.json index 6583f67041a..afd5a8b1dc9 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "scrapeconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/servicemonitors-crd.json b/jsonnet/prometheus-operator/servicemonitors-crd.json index 7a3b033bf1a..c5bec28ac92 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "servicemonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/thanosrulers-crd.json b/jsonnet/prometheus-operator/thanosrulers-crd.json index 61f150e2f00..d77b50d0245 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.17.1", - "operator.prometheus.io/version": "0.80.0" + "operator.prometheus.io/version": "0.80.1" }, "name": "thanosrulers.monitoring.coreos.com" }, diff --git a/pkg/client/go.mod b/pkg/client/go.mod index dfb2ba2b99e..69ba3370f92 100644 --- a/pkg/client/go.mod +++ b/pkg/client/go.mod @@ -5,7 +5,7 @@ go 1.23.0 toolchain go1.23.1 require ( - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 k8s.io/api v0.32.1 k8s.io/apiextensions-apiserver v0.32.1 k8s.io/apimachinery v0.32.1