Skip to content

Commit 25f6e9c

Browse files
authored
feat: remove SBS migration tool (#74)
1 parent da008b4 commit 25f6e9c

File tree

8 files changed

+2
-658
lines changed

8 files changed

+2
-658
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ ARG TAG
1515
ARG COMMIT_SHA
1616
ARG BUILD_DATE
1717
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
18-
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 sbs-migration ./cmd/sbs-migration
1918

2019
FROM alpine:3.15
2120
RUN apk update && apk add --no-cache e2fsprogs e2fsprogs-extra xfsprogs xfsprogs-extra cryptsetup ca-certificates blkid && update-ca-certificates
2221
WORKDIR /
2322
COPY --from=builder /go/src/github.com/scaleway/scaleway-csi/scaleway-csi .
24-
COPY --from=builder /go/src/github.com/scaleway/scaleway-csi/sbs-migration .
2523
ENTRYPOINT ["/scaleway-csi"]

README.md

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
# Scaleway Block Volume CSI driver
22

3-
> [!CAUTION]
4-
> ⚠️ **Please read this first before doing anything else!** ⚠️
5-
>
6-
> You are currently on a branch which corresponds to the `v0.3` release of the Scaleway CSI.
7-
>
8-
> This release is **NOT** compatible with the `v0.2` and `v0.1` releases as it introduces
9-
> a major **breaking change**: it now uses the **new Scaleway Block Storage (SBS) API** instead of the Instance API to manage block volumes and
10-
> snapshots.
11-
>
12-
> If you are currently using the `v0.2.x` or `v0.1.x` versions of the Scaleway CSI:
13-
> please make sure you migrate your volumes using the [sbs-migration](./cmd/sbs-migration/)
14-
> tool. Your volumes will automatically be migrated if you use the Helm Chart.
15-
163
The [Scaleway Block Volume](https://www.scaleway.com/en/block-storage/)
174
Container Storage Interface (CSI) driver is an implementation of the
185
[CSI interface](https://github.com/container-storage-interface/spec/blob/master/spec.md)
@@ -27,29 +14,6 @@ to provide a way to manage Scaleway Block Volumes through a container orchestrat
2714
| v0.2.x ||||
2815
| v0.3.x ||||
2916

30-
## Scaleway Storage API Compatibility Matrix
31-
32-
Scaleway currently offers two APIs to manage Block Volumes and Snapshots:
33-
34-
- [Instance API](https://www.scaleway.com/en/developers/api/instance/)
35-
- [Scaleway Block Storage API](https://www.scaleway.com/en/developers/api/block/)
36-
37-
A Block Volume or Snapshot currently managed by the *Instance API* **cannot** be managed by the
38-
*Scaleway Block Storage API* and vice versa.
39-
40-
In the future, all Block Volumes and Snapshots will be managed by the *Scaleway Block Storage API*.
41-
42-
In order to use newer versions of the CSI (v0.3+), it is needed to migrate Block Volumes and Snapshots
43-
from the *Instance API* to the *Scaleway Block Storage API* using the [sbs-migration](./cmd/sbs-migration/) tool.
44-
Your volumes will automatically be migrated if you use the Helm Chart.
45-
46-
| Scaleway CSI Driver \ Scaleway Storage API compatibility | Instance API | Scaleway Block Storage API |
47-
| -------------------------------------------------------- | ------------ | -------------------------- |
48-
| master branch |||
49-
| v0.1.x |||
50-
| v0.2.x |||
51-
| v0.3.x |||
52-
5317
## Features
5418

5519
Here is a list of features implemented by the Scaleway CSI driver.

cmd/sbs-migration/README.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

cmd/sbs-migration/main.go

Lines changed: 0 additions & 60 deletions
This file was deleted.

go.mod

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/scaleway/scaleway-csi
33
go 1.22.2
44

55
require (
6-
github.com/avast/retry-go/v4 v4.6.0
76
github.com/container-storage-interface/spec v1.9.0
87
github.com/golang/protobuf v1.5.4
98
github.com/google/uuid v1.6.0
@@ -14,55 +13,28 @@ require (
1413
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26
1514
golang.org/x/crypto v0.22.0
1615
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
17-
golang.org/x/sync v0.7.0
1816
golang.org/x/sys v0.19.0
1917
google.golang.org/grpc v1.63.2
2018
google.golang.org/protobuf v1.33.0
21-
k8s.io/apimachinery v0.30.0
22-
k8s.io/client-go v0.30.0
2319
k8s.io/klog/v2 v2.120.1
2420
k8s.io/mount-utils v0.30.0
2521
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
2622
oya.to/namedlocker v1.0.0
2723
)
2824

2925
require (
30-
github.com/davecgh/go-spew v1.1.1 // indirect
31-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3226
github.com/go-logr/logr v1.4.1 // indirect
33-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
34-
github.com/go-openapi/jsonreference v0.20.2 // indirect
35-
github.com/go-openapi/swag v0.22.3 // indirect
3627
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
37-
github.com/gogo/protobuf v1.3.2 // indirect
38-
github.com/google/gnostic-models v0.6.8 // indirect
3928
github.com/google/go-cmp v0.6.0 // indirect
40-
github.com/google/gofuzz v1.2.0 // indirect
4129
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
42-
github.com/imdario/mergo v0.3.6 // indirect
43-
github.com/josharian/intern v1.0.0 // indirect
44-
github.com/json-iterator/go v1.1.12 // indirect
4530
github.com/kr/fs v0.1.0 // indirect
46-
github.com/mailru/easyjson v0.7.7 // indirect
31+
github.com/kr/text v0.2.0 // indirect
4732
github.com/moby/sys/mountinfo v0.6.2 // indirect
48-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
49-
github.com/modern-go/reflect2 v1.0.2 // indirect
50-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51-
github.com/spf13/pflag v1.0.5 // indirect
33+
github.com/stretchr/testify v1.9.0 // indirect
5234
golang.org/x/net v0.24.0 // indirect
53-
golang.org/x/oauth2 v0.17.0 // indirect
54-
golang.org/x/term v0.19.0 // indirect
5535
golang.org/x/text v0.14.0 // indirect
56-
golang.org/x/time v0.3.0 // indirect
5736
golang.org/x/tools v0.20.0 // indirect
58-
google.golang.org/appengine v1.6.8 // indirect
5937
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
60-
gopkg.in/inf.v0 v0.9.1 // indirect
6138
gopkg.in/yaml.v2 v2.4.0 // indirect
6239
gopkg.in/yaml.v3 v3.0.1 // indirect
63-
k8s.io/api v0.30.0 // indirect
64-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
65-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
66-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
67-
sigs.k8s.io/yaml v1.3.0 // indirect
6840
)

0 commit comments

Comments
 (0)