Update Prometheus Operator (#259)

Update the Prometheus Operator API package to v0.70.0. This version has matching k8s.io/controller-runtime dependencies. * Fixup metric interval datatype. Signed-off-by: SuperQ <[email protected]>
zilliztech · Feb 8, 2025 · 265fe28 · 265fe28
1 parent 3c10355
commit 265fe28
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 201 deletions.
diff --git a/apis/milvus.io/v1beta1/components_types.go b/apis/milvus.io/v1beta1/components_types.go
@@ -1,6 +1,7 @@
 package v1beta1
 
 import (
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -164,7 +165,7 @@ type MilvusComponents struct {
 
 	// MetricInterval the interval of podmonitor metric scraping in string
 	// +kubebuilder:validation:Optional
-	MetricInterval string `json:"metricInterval"`
+	MetricInterval monitoringv1.Duration `json:"metricInterval"`
 
 	// ToolImage specify tool image to merge milvus config to original one in image, default uses same image as milvus-operator
 	// +kubebuilder:validation:Optional

diff --git a/go.mod b/go.mod
@@ -11,14 +11,14 @@ require (
 	github.com/apache/pulsar-client-go v0.9.0
 	github.com/coreos/go-semver v0.3.1
 	github.com/davecgh/go-spew v1.1.1
-	github.com/go-logr/logr v1.2.4
+	github.com/go-logr/logr v1.3.0
 	github.com/minio/madmin-go v1.3.14
 	github.com/minio/minio-go/v7 v7.0.56
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/prashantv/gostub v1.1.0
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.51.2
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.70.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/common v0.62.0
 	github.com/segmentio/kafka-go v0.4.39
@@ -209,15 +209,15 @@ require (
 	gotest.tools/v3 v3.5.1 // indirect
 	k8s.io/apiserver v0.28.9 // indirect
 	k8s.io/component-base v0.28.9 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/kubectl v0.28.9 // indirect
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
+	k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
 	oras.land/oras-go v1.2.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
 replace github.com/apache/pulsar-client-go => github.com/milvus-io/pulsar-client-go v0.6.10