Skip to content

Commit 3a3c53c

Browse files
authored
Merge pull request #421 from rancher/renovate/main-github.com-prometheus-operator-prometheus-operator-pkg-apis-monitoring-0.x
chore(deps): update module github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring to v0.78.1 (main)
2 parents 16b1837 + d6498a9 commit 3a3c53c

File tree

4 files changed

+116
-119
lines changed

4 files changed

+116
-119
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ generate: ## Run code generation logic.
6060
validate: validate-lint generate validate-dirty ## Run validation checks.
6161

6262
validate-lint: $(GOLANGCI)
63-
$(GOLANGCI) run
63+
$(GOLANGCI) run --timeout=2m
6464

6565
validate-dirty:
6666
ifdef DIRTY

go.mod

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
module github.com/rancher/cis-operator
22

3-
go 1.22.0
3+
go 1.23
44

5-
toolchain go1.22.9
5+
toolchain go1.23.3
6+
7+
replace (
8+
// sigs.k8s.io/structured-merge-diff/v4 v4.4.2 breaks make gen.
9+
// https://github.com/kubernetes-sigs/structured-merge-diff/issues/268
10+
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
11+
)
612

713
require (
814
github.com/blang/semver v3.5.1+incompatible
9-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2
10-
github.com/prometheus-operator/prometheus-operator/pkg/client v0.71.2
15+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1
16+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.78.1
1117
github.com/prometheus/client_golang v1.20.5
1218
github.com/rancher/kubernetes-provider-detector v0.1.5
1319
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813
@@ -16,93 +22,90 @@ require (
1622
github.com/robfig/cron v1.2.0
1723
github.com/sirupsen/logrus v1.9.3
1824
github.com/urfave/cli v1.22.16
19-
golang.org/x/crypto/x509roots/fallback v0.0.0-20231030152948-74c2ba9521f1
25+
golang.org/x/crypto/x509roots/fallback v0.0.0-20241107225453-6018723c7405
2026
k8s.io/api v0.31.2
2127
k8s.io/apiextensions-apiserver v0.31.2
2228
k8s.io/apimachinery v0.31.2
2329
k8s.io/client-go v0.31.2
2430
)
2531

26-
require (
27-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
28-
github.com/google/gnostic-models v0.6.8 // indirect
29-
github.com/klauspost/compress v1.17.9 // indirect
30-
github.com/sagikazarmark/locafero v0.4.0 // indirect
31-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
32-
github.com/sourcegraph/conc v0.3.0 // indirect
33-
github.com/x448/float16 v0.8.4 // indirect
34-
go.uber.org/multierr v1.11.0 // indirect
35-
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
36-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
37-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
38-
)
39-
4032
require (
4133
github.com/aquasecurity/kube-bench v0.9.1 // indirect
42-
github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/securityhub v1.53.3 // indirect
44-
github.com/aws/smithy-go v1.21.0 // indirect
34+
github.com/aws/aws-sdk-go-v2 v1.32.4 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/securityhub v1.54.6 // indirect
36+
github.com/aws/smithy-go v1.22.0 // indirect
4537
github.com/beorn7/perks v1.0.1 // indirect
4638
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4739
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
4840
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
49-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
41+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
5042
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
51-
github.com/fsnotify/fsnotify v1.7.0 // indirect
43+
github.com/fsnotify/fsnotify v1.8.0 // indirect
44+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5245
github.com/ghodss/yaml v1.0.0 // indirect
5346
github.com/go-logr/logr v1.4.2 // indirect
5447
github.com/go-openapi/jsonpointer v0.21.0 // indirect
55-
github.com/go-openapi/jsonreference v0.20.2 // indirect
48+
github.com/go-openapi/jsonreference v0.21.0 // indirect
5649
github.com/go-openapi/swag v0.23.0 // indirect
5750
github.com/gogo/protobuf v1.3.2 // indirect
58-
github.com/golang/glog v1.2.2 // indirect
51+
github.com/golang/glog v1.2.3 // indirect
5952
github.com/golang/protobuf v1.5.4 // indirect
53+
github.com/google/gnostic-models v0.6.8 // indirect
6054
github.com/google/go-cmp v0.6.0 // indirect
6155
github.com/google/gofuzz v1.2.0 // indirect
6256
github.com/google/uuid v1.6.0 // indirect
6357
github.com/hashicorp/hcl v1.0.0 // indirect
64-
github.com/imdario/mergo v0.3.13 // indirect
58+
github.com/imdario/mergo v0.3.16 // indirect
6559
github.com/josharian/intern v1.0.0 // indirect
6660
github.com/json-iterator/go v1.1.12 // indirect
61+
github.com/klauspost/compress v1.17.11 // indirect
6762
github.com/magiconair/properties v1.8.7 // indirect
6863
github.com/mailru/easyjson v0.7.7 // indirect
6964
github.com/mitchellh/mapstructure v1.5.0 // indirect
7065
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7166
github.com/modern-go/reflect2 v1.0.2 // indirect
7267
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7368
github.com/onsi/ginkgo v1.16.5 // indirect
74-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
69+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
7570
github.com/pkg/errors v0.9.1 // indirect
7671
github.com/prometheus/client_model v0.6.1 // indirect
77-
github.com/prometheus/common v0.55.0 // indirect
72+
github.com/prometheus/common v0.60.1 // indirect
7873
github.com/prometheus/procfs v0.15.1 // indirect
7974
github.com/russross/blackfriday/v2 v2.1.0 // indirect
75+
github.com/sagikazarmark/locafero v0.6.0 // indirect
76+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
77+
github.com/sourcegraph/conc v0.3.0 // indirect
8078
github.com/spf13/afero v1.11.0 // indirect
81-
github.com/spf13/cast v1.6.0 // indirect
79+
github.com/spf13/cast v1.7.0 // indirect
8280
github.com/spf13/pflag v1.0.5 // indirect
8381
github.com/spf13/viper v1.19.0 // indirect
8482
github.com/subosito/gotenv v1.6.0 // indirect
85-
golang.org/x/mod v0.20.0 // indirect
86-
golang.org/x/net v0.28.0 // indirect
87-
golang.org/x/oauth2 v0.21.0 // indirect
88-
golang.org/x/sync v0.8.0 // indirect
89-
golang.org/x/sys v0.23.0 // indirect
90-
golang.org/x/term v0.23.0 // indirect
91-
golang.org/x/text v0.17.0 // indirect
92-
golang.org/x/time v0.5.0 // indirect
93-
golang.org/x/tools v0.24.0 // indirect
94-
google.golang.org/protobuf v1.34.2 // indirect
83+
github.com/x448/float16 v0.8.4 // indirect
84+
go.uber.org/multierr v1.11.0 // indirect
85+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
86+
golang.org/x/mod v0.22.0 // indirect
87+
golang.org/x/net v0.31.0 // indirect
88+
golang.org/x/oauth2 v0.24.0 // indirect
89+
golang.org/x/sync v0.9.0 // indirect
90+
golang.org/x/sys v0.27.0 // indirect
91+
golang.org/x/term v0.26.0 // indirect
92+
golang.org/x/text v0.20.0 // indirect
93+
golang.org/x/time v0.8.0 // indirect
94+
golang.org/x/tools v0.27.0 // indirect
95+
google.golang.org/protobuf v1.35.1 // indirect
96+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9597
gopkg.in/inf.v0 v0.9.1 // indirect
9698
gopkg.in/ini.v1 v1.67.0 // indirect
9799
gopkg.in/yaml.v2 v2.4.0 // indirect
98100
gopkg.in/yaml.v3 v3.0.1 // indirect
99101
k8s.io/code-generator v0.31.2 // indirect
100102
k8s.io/gengo v0.0.0-20240826214909-a7b603a56eb7 // indirect
103+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
101104
k8s.io/klog/v2 v2.130.1 // indirect
102-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
103-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
104-
sigs.k8s.io/controller-runtime v0.19.0 // indirect
105-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
106-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
105+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
106+
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
107+
sigs.k8s.io/controller-runtime v0.19.1 // indirect
108+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
109+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
107110
sigs.k8s.io/yaml v1.4.0 // indirect
108111
)

0 commit comments

Comments
 (0)