Skip to content

Commit 9942790

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request csi-addons#238 from red-hat-storage/sync_us--main
Syncing latest changes from upstream main for kubernetes-csi-addons
2 parents 38be3f0 + b9361a3 commit 9942790

File tree

33 files changed

+416
-64
lines changed

33 files changed

+416
-64
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
1919
go.uber.org/zap v1.27.0
2020
google.golang.org/grpc v1.68.0
21-
google.golang.org/protobuf v1.35.1
21+
google.golang.org/protobuf v1.35.2
2222
k8s.io/api v0.31.2
2323
k8s.io/apimachinery v0.31.2
2424
k8s.io/client-go v0.31.2

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:
180180
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
181181
google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
182182
google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
183-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
184-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
183+
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
184+
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
185185
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
186186
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
187187
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎internal/proto/encryptionkeyrotation.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/proto/networkfence.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/proto/reclaimspace.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/proto/replication.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/proto/volumegroup.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.8
66
require (
77
github.com/operator-framework/operator-sdk v1.37.0
88
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
9-
google.golang.org/protobuf v1.35.1
9+
google.golang.org/protobuf v1.35.2
1010
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240102165319-7f316f1309b1
1111
sigs.k8s.io/controller-tools v0.16.5
1212
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0

‎tools/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -738,8 +738,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
738738
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
739739
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
740740
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
741-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
742-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
741+
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
742+
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
743743
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
744744
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
745745
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎tools/vendor/google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo/main.go

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/compiler/protogen/protogen.go

+41-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb

6 Bytes
Binary file not shown.

‎tools/vendor/google.golang.org/protobuf/internal/editionssupport/editions.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/internal/filedesc/desc.go

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/internal/filedesc/editions.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/internal/genid/go_features_gen.go

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/internal/version/version.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/reflect/protodesc/desc.go

+9-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/vendor/google.golang.org/protobuf/reflect/protodesc/editions.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)