Skip to content

Commit 19d4da9

Browse files
authored
Merge branch 'main' into updatechainsaw
2 parents 3a825ac + 0734347 commit 19d4da9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ require (
7474
github.com/bytedance/sonic v1.11.6 // indirect
7575
github.com/bytedance/sonic/loader v0.1.1 // indirect
7676
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
77-
github.com/cert-manager/cert-manager v1.16.2
77+
github.com/cert-manager/cert-manager v1.16.3
7878
github.com/cloudwego/base64x v0.1.4 // indirect
7979
github.com/cloudwego/iasm v0.2.0 // indirect
8080
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4
103103
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
104104
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
105105
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
106-
github.com/cert-manager/cert-manager v1.16.2 h1:c9UU2E+8XWGruyvC/mdpc1wuLddtgmNr8foKdP7a8Jg=
107-
github.com/cert-manager/cert-manager v1.16.2/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0=
106+
github.com/cert-manager/cert-manager v1.16.3 h1:seEF5eidFaeduaCuM85PFEuzH/1X/HOV5Y8zDQrHgpc=
107+
github.com/cert-manager/cert-manager v1.16.3/go.mod h1:6JQ/GAZ6dH+erqS1BbaqorPy8idJzCtWFUmJQBTjo6Q=
108108
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
109109
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
110110
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

pkg/featuregate/featuregate.go

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ var (
4444
"operator.sidecarcontainers.native",
4545
featuregate.StageAlpha,
4646
featuregate.WithRegisterDescription("controls whether the operator supports sidecar containers as init containers. Should only be enabled on k8s v1.29+"),
47+
featuregate.WithRegisterFromVersion("v0.111.0"),
4748
)
4849
// PrometheusOperatorIsAvailable is the feature gate that enables features associated to the Prometheus Operator.
4950
PrometheusOperatorIsAvailable = featuregate.GlobalRegistry().MustRegister(

0 commit comments

Comments
 (0)