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
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
unit-test:
strategy:
matrix:
go-version: [1.17.x]
go-version: [1.20.x]
platform: [ubuntu-latest]
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -24,7 +24,7 @@ jobs:
build-test:
strategy:
matrix:
go-version: [1.17.x]
go-version: [1.20.x]
platform: [ubuntu-latest]
arch: [386, amd64, arm, arm64]
runs-on: ${{ matrix.platform }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17-alpine as builder
FROM golang:1.20-alpine as builder

RUN apk update && apk add --no-cache git ca-certificates && update-ca-certificates

Expand All @@ -17,7 +17,7 @@ ARG COMMIT_SHA
ARG BUILD_DATE
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -ldflags "-w -s -X github.com/scaleway/scaleway-csi/driver.driverVersion=${TAG} -X github.com/scaleway/scaleway-csi/driver.buildDate=${BUILD_DATE} -X github.com/scaleway/scaleway-csi/driver.gitCommit=${COMMIT_SHA} " -o scaleway-csi ./cmd/scaleway-csi

FROM alpine:3.16
FROM alpine:3.18
RUN apk update && apk add --no-cache e2fsprogs e2fsprogs-extra xfsprogs xfsprogs-extra cryptsetup ca-certificates && update-ca-certificates
WORKDIR /
COPY --from=builder /go/src/github.com/scaleway/scaleway-csi/scaleway-csi .
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/scaleway-csi-v0.2.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
hostNetwork: true
containers:
- name: scaleway-csi-plugin
image: scaleway/scaleway-csi:v0.1.7
image: scaleway/scaleway-csi:v0.2.0
args :
- "--endpoint=$(CSI_ENDPOINT)"
- "--v=4"
Expand Down
4 changes: 2 additions & 2 deletions driver/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ func (d *controllerService) ControllerUnpublishVolume(ctx context.Context, req *
// ValidateVolumeCapabilities check if a pre-provisioned volume has all the capabilities
// that the CO wants. This RPC call SHALL return confirmed only if all the
// volume capabilities specified in the request are supported.
//This operation MUST be idempotent.
// This operation MUST be idempotent.
func (d *controllerService) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
klog.V(4).Infof("ValidateVolumeCapabilities called with %s", stripSecretFromReq(*req))
volumeID, volumeZone, err := getVolumeIDAndZone(req.GetVolumeId())
Expand Down Expand Up @@ -620,7 +620,7 @@ func (d *controllerService) CreateSnapshot(ctx context.Context, req *csi.CreateS
}

snapshotResp, err := d.scaleway.CreateSnapshot(&instance.CreateSnapshotRequest{
VolumeID: sourceVolumeID,
VolumeID: &sourceVolumeID,
Name: name,
Zone: sourceVolumeZone,
})
Expand Down
2 changes: 1 addition & 1 deletion driver/sanity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func (s *fakeHelper) CreateSnapshot(req *instance.CreateSnapshotRequest, opts ..
req.Zone = s.defaultZone
}

volume, ok := s.volumesMap[req.VolumeID]
volume, ok := s.volumesMap[*req.VolumeID]
if !ok {
return nil, &scw.ResourceNotFoundError{}
}
Expand Down
33 changes: 18 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
module github.com/scaleway/scaleway-csi

go 1.17
go 1.20

require (
github.com/container-storage-interface/spec v1.6.0
github.com/golang/protobuf v1.5.2
github.com/container-storage-interface/spec v1.8.0
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.0
github.com/kubernetes-csi/csi-test/v5 v5.0.0
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9
golang.org/x/sys v0.5.0
google.golang.org/grpc v1.48.0
k8s.io/klog/v2 v2.70.1
k8s.io/mount-utils v0.24.3
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17
golang.org/x/sys v0.9.0
google.golang.org/grpc v1.56.1
k8s.io/klog/v2 v2.100.1
k8s.io/mount-utils v0.27.3
k8s.io/utils v0.0.0-20230505201702-9f6742963106
)

require (
github.com/go-logr/logr v1.2.0 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/onsi/ginkgo/v2 v2.1.4 // indirect
github.com/onsi/gomega v1.20.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/text v0.7.0 // indirect
google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4 // indirect
google.golang.org/protobuf v1.28.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading