Skip to content

Commit

Permalink
update deps for kube sdk 0.31 (#40)
Browse files Browse the repository at this point in the history
# Description
Updating sdk 0.31

## Checklist
(For exoscale contributors)

* [x] Changelog updated (under *Unreleased* block)
* [x] Integration tests OK

---------

Co-authored-by: Philipp Sauter <philipp.sauter@exoscale.ch>
  • Loading branch information
remyrd and sauterp authored Aug 28, 2024
1 parent a99cba2 commit ac39bdf
Show file tree
Hide file tree
Showing 412 changed files with 46,169 additions and 13,496 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## Unreleased

### Improvements

* Kubernetes SDK v0.31 #40
* GO 1.23.0 #40

## 0.29.6

### Improvements
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ EXTRA_ARGS := -parallel 3 -count=1 -failfast
# Dependencies

# Requires: https://github.com/exoscale/go.mk
GO_MK_REF := v2.0.0
GO_MK_REF := v2.0.3

# make go.mk a dependency for all targets
.EXTRA_PREREQS = go.mk
Expand Down
12 changes: 6 additions & 6 deletions driver/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
if req.GetCapacityRange() != nil {
requiredBytes := req.GetCapacityRange().RequiredBytes
if requiredBytes%GiB != 0 {
msg := fmt.Sprintf("requested size in bytes cannot be exactly converted to GiB: %d", requiredBytes)
msg := "requested size in bytes cannot be exactly converted to GiB: %d"

klog.Error(msg)
klog.Errorf(msg, requiredBytes)

return nil, fmt.Errorf(msg)
return nil, fmt.Errorf(msg, requiredBytes)
}

sizeInGiB = convertBytesToGiB(requiredBytes)
Expand Down Expand Up @@ -716,11 +716,11 @@ func (d *controllerService) ControllerExpandVolume(ctx context.Context, req *csi
}

if newSizeInBytes%GiB != 0 {
msg := fmt.Sprintf("requested size in bytes cannot be exactly converted to GiB: %d", newSizeInBytes)
msg := "requested size in bytes cannot be exactly converted to GiB: %d"

klog.Error(msg)
klog.Errorf(msg, newSizeInBytes)

return nil, fmt.Errorf(msg)
return nil, fmt.Errorf(msg, newSizeInBytes)
}

sizeInGiB := convertBytesToGiB(newSizeInBytes)
Expand Down
53 changes: 28 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,75 +1,78 @@
module github.com/exoscale/exoscale-csi-driver

go 1.22

toolchain go1.22.2
go 1.23.0

require (
github.com/container-storage-interface/spec v1.8.0
github.com/exoscale/egoscale/v3 v3.1.0
github.com/golang/protobuf v1.5.3
github.com/stretchr/testify v1.8.4
golang.org/x/sys v0.20.0
github.com/exoscale/egoscale/v3 v3.1.1
github.com/golang/protobuf v1.5.4
github.com/stretchr/testify v1.9.0
golang.org/x/sys v0.21.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
k8s.io/client-go v0.28.2
k8s.io/klog/v2 v2.100.1
k8s.io/mount-utils v0.28.3
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
google.golang.org/protobuf v1.34.2
k8s.io/client-go v0.31.0
k8s.io/klog/v2 v2.130.1
k8s.io/mount-utils v0.31.0
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
)

require (
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/diskfs/go-diskfs v1.4.0 // indirect
github.com/elliotwutingfeng/asciiset v0.0.0-20230602022725-51bbb787efab // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.9.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/opencontainers/runc v1.1.13 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pkg/xattr v0.4.9 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.18.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
gopkg.in/djherbis/times.v1 v1.3.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apimachinery v0.28.2 // indirect
k8s.io/apimachinery v0.31.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit ac39bdf

Please sign in to comment.