Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ require (
golang.org/x/oauth2 v0.25.0 // indirect
golang.org/x/term v0.28.0 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is strange that these 3 indirect requires are not in the block below. Maybe we can take the chance to fix this too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's doesn't match the issue, We can fix it individually

google.golang.org/grpc v1.69.2
k8s.io/api v0.32.2
k8s.io/apimachinery v0.32.2
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
k8s.io/apiserver v0.32.0
k8s.io/client-go v1.5.2
k8s.io/client-go v0.32.3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The client-go version is overridden by L84, so this change theoretically shouldn't do anything

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@msau42 is there a reason to keep L84 around or could we remove that ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The client-go version is overridden by L84, so this change theoretically shouldn't do anything

I think it's better to remove replace in go.mod if not necessary? Actually, I found this issue on CSI AIO testing. And this could affect users relying on this repository.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the replace on L84

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should just remove all the replace statements. We only need them if we import k8s.io/kubernetes (which is not supported). But we have never imported that from git history of go.mod.

k8s.io/component-base v0.32.0
k8s.io/csi-translation-lib v0.32.2
k8s.io/klog/v2 v2.130.1
Expand Down Expand Up @@ -74,17 +74,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace k8s.io/api => k8s.io/api v0.32.0

replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.0

replace k8s.io/apiserver => k8s.io/apiserver v0.32.0

replace k8s.io/client-go => k8s.io/client-go v0.32.0

replace k8s.io/component-base => k8s.io/component-base v0.32.0

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2

replace k8s.io/kms => k8s.io/kms v0.32.0
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,14 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
k8s.io/apiserver v0.32.0 h1:VJ89ZvQZ8p1sLeiWdRJpRD6oLozNZD2+qVSLi+ft5Qs=
k8s.io/apiserver v0.32.0/go.mod h1:HFh+dM1/BE/Hm4bS4nTXHVfN6Z6tFIZPi649n83b4Ag=
k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU=
k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM=
k8s.io/csi-translation-lib v0.32.2 h1:aLzAyaoJUc5rgtLi8Xd4No1tet6UpvUsGIgRoGnPSSE=
Expand Down
2 changes: 1 addition & 1 deletion vendor/k8s.io/api/resource/v1alpha3/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions vendor/k8s.io/api/resource/v1alpha3/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/api/resource/v1beta1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions vendor/k8s.io/api/resource/v1beta1/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 6 additions & 13 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ gopkg.in/inf.v0
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.32.2 => k8s.io/api v0.32.0
# k8s.io/api v0.32.3
## explicit; go 1.23.0
k8s.io/api/admissionregistration/v1
k8s.io/api/admissionregistration/v1alpha1
Expand Down Expand Up @@ -386,7 +386,7 @@ k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
k8s.io/api/storagemigration/v1alpha1
# k8s.io/apimachinery v0.32.2 => k8s.io/apimachinery v0.32.0
# k8s.io/apimachinery v0.32.3
## explicit; go 1.23.0
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
Expand Down Expand Up @@ -441,10 +441,10 @@ k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/apiserver v0.32.0 => k8s.io/apiserver v0.32.0
# k8s.io/apiserver v0.32.0
## explicit; go 1.23.0
k8s.io/apiserver/pkg/util/feature
# k8s.io/client-go v1.5.2 => k8s.io/client-go v0.32.0
# k8s.io/client-go v0.32.3
## explicit; go 1.23.0
k8s.io/client-go/applyconfigurations
k8s.io/client-go/applyconfigurations/admissionregistration/v1
Expand Down Expand Up @@ -771,7 +771,7 @@ k8s.io/client-go/util/homedir
k8s.io/client-go/util/keyutil
k8s.io/client-go/util/watchlist
k8s.io/client-go/util/workqueue
# k8s.io/component-base v0.32.0 => k8s.io/component-base v0.32.0
# k8s.io/component-base v0.32.0
## explicit; go 1.23.0
k8s.io/component-base/cli/flag
k8s.io/component-base/featuregate
Expand All @@ -789,7 +789,7 @@ k8s.io/component-base/metrics/prometheus/feature
k8s.io/component-base/metrics/prometheus/workqueue
k8s.io/component-base/metrics/prometheusextension
k8s.io/component-base/version
# k8s.io/csi-translation-lib v0.32.2 => k8s.io/csi-translation-lib v0.32.2
# k8s.io/csi-translation-lib v0.32.2
## explicit; go 1.23.0
k8s.io/csi-translation-lib
k8s.io/csi-translation-lib/plugins
Expand Down Expand Up @@ -842,10 +842,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
# k8s.io/api => k8s.io/api v0.32.0
# k8s.io/apimachinery => k8s.io/apimachinery v0.32.0
# k8s.io/apiserver => k8s.io/apiserver v0.32.0
# k8s.io/client-go => k8s.io/client-go v0.32.0
# k8s.io/component-base => k8s.io/component-base v0.32.0
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
# k8s.io/kms => k8s.io/kms v0.32.0