Skip to content

Commit ec8925b

Browse files
llDrLovellDrLove
authored
CON-12569 Update CSI (#639)
1 parent b03bf18 commit ec8925b

File tree

453 files changed

+33805
-26699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+33805
-26699
lines changed

‎.github/workflows/delete.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
run: |
1616
BRANCH=$(echo -n ${BRANCH} | tr -c '[:alnum:]._-' '-')
1717
TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${DOCKER_USER}'", "password": "'${DOCKER_PASS}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
18-
images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.33" "${BRANCH}-tests-1.32" "${BRANCH}-tests-1.31" "${BRANCH}-tests-1.30" "${BRANCH}-builder")
18+
images=("${BRANCH}-latest" "${BRANCH}-runtime" "${BRANCH}-tools" "${BRANCH}-tests-1.34" "${BRANCH}-tests-1.33" "${BRANCH}-tests-1.32" "${BRANCH}-tests-1.31" "${BRANCH}-builder")
1919
for i in ${images[*]}; do curl --fail -sS -X DELETE -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/digitalocean/k8s-e2e-test-runner/tags/$i/; done
2020
curl --fail -sS -X DELETE -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/digitalocean/do-csi-plugin-dev/tags/${BRANCH}/

‎.github/workflows/test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
strategy:
9494
fail-fast: false
9595
matrix:
96-
kube-release: ['1.33', '1.32', '1.31', '1.30']
96+
kube-release: ['1.34', '1.33', '1.32', '1.31']
9797

9898
steps:
9999
- name: checkout

‎Makefile‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ifneq ($(VERSION),)
2929
else
3030
VERSION ?= $(shell cat VERSION)
3131
endif
32-
KUBERNETES_VERSION ?= 1.32.0
32+
KUBERNETES_VERSION ?= 1.34.1
3333
DOCKER_REPO ?= digitalocean/do-csi-plugin
3434
CANONICAL_RUNNER_IMAGE = digitalocean/k8s-e2e-test-runner
3535
RUNNER_IMAGE ?= $(CANONICAL_RUNNER_IMAGE)
@@ -130,14 +130,14 @@ runner-build:
130130
@echo "pulling cache images"
131131
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder || true
132132
@docker pull $(CANONICAL_RUNNER_IMAGE):builder || true
133+
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 || true
134+
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.34 || true
133135
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 || true
134136
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.33 || true
135137
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32 || true
136138
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.32 || true
137139
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31 || true
138140
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.31 || true
139-
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30 || true
140-
@docker pull $(CANONICAL_RUNNER_IMAGE):tests-1.30 || true
141141
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools || true
142142
@docker pull $(CANONICAL_RUNNER_IMAGE):tools || true
143143
@docker pull $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime || true
@@ -151,10 +151,20 @@ runner-build:
151151
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
152152
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder -f test/e2e/Dockerfile test/e2e
153153

154+
@echo "building target tests-1.34"
155+
@docker build --target tests-1.34 \
156+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
157+
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
158+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 \
159+
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.34 \
160+
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 -f test/e2e/Dockerfile test/e2e
161+
154162
@echo "building target tests-1.33"
155163
@docker build --target tests-1.33 \
156164
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
157165
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
166+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 \
167+
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.34 \
158168
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 \
159169
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.33 \
160170
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 -f test/e2e/Dockerfile test/e2e
@@ -163,6 +173,8 @@ runner-build:
163173
@docker build --target tests-1.32 \
164174
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
165175
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
176+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 \
177+
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.34 \
166178
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 \
167179
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.33 \
168180
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32 \
@@ -173,6 +185,8 @@ runner-build:
173185
@docker build --target tests-1.31 \
174186
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
175187
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
188+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 \
189+
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.34 \
176190
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 \
177191
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.33 \
178192
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32 \
@@ -181,32 +195,18 @@ runner-build:
181195
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.31 \
182196
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31 -f test/e2e/Dockerfile test/e2e
183197

184-
@echo "building target tests-1.30"
185-
@docker build --target tests-1.30 \
186-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
187-
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
188-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 \
189-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.33 \
190-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32 \
191-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.32 \
192-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31 \
193-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.31 \
194-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30 \
195-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.30 \
196-
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30 -f test/e2e/Dockerfile test/e2e
197-
198198
@echo "building target tools"
199199
@docker build --target tools \
200200
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
201201
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
202+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 \
203+
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.34 \
202204
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 \
203205
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.33 \
204206
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32 \
205207
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.32 \
206208
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31 \
207209
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.31 \
208-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30 \
209-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.30 \
210210
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
211211
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
212212
-t $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools -f test/e2e/Dockerfile test/e2e
@@ -215,14 +215,14 @@ runner-build:
215215
@docker build --target runtime \
216216
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
217217
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
218+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 \
219+
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.34 \
218220
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 \
219221
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.33 \
220222
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32 \
221223
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.32 \
222224
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31 \
223225
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.31 \
224-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30 \
225-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.30 \
226226
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
227227
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
228228
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -233,14 +233,14 @@ runner-build:
233233
@docker build \
234234
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder \
235235
--cache-from $(CANONICAL_RUNNER_IMAGE):builder \
236+
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34 \
237+
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.34 \
236238
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33 \
237239
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.33 \
238240
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32 \
239241
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.32 \
240242
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31 \
241243
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.31 \
242-
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30 \
243-
--cache-from $(CANONICAL_RUNNER_IMAGE):tests-1.30 \
244244
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools \
245245
--cache-from $(CANONICAL_RUNNER_IMAGE):tools \
246246
--cache-from $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime \
@@ -251,10 +251,10 @@ runner-build:
251251

252252
runner-push: runner-build
253253
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)builder
254+
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.34
254255
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.33
255256
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.32
256257
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.31
257-
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tests-1.30
258258
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)tools
259259
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)runtime
260260
@docker push $(RUNNER_IMAGE):$(RUNNER_IMAGE_TAG_PREFIX)latest

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ The following table describes the required DigitalOcean CSI driver version per s
117117
| 1.31 | v4.12.0+ |
118118
| 1.32 | v4.13.0+ |
119119
| 1.33 | v4.14.0+ |
120+
| 1.34 | v4.15.0+ |
120121
---
121122
**Note:**
122123

‎deploy/kubernetes/releases/csi-digitalocean-dev/driver.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ spec:
111111
serviceAccount: csi-do-controller-sa
112112
containers:
113113
- name: csi-provisioner
114-
image: registry.k8s.io/sig-storage/csi-provisioner:v5.2.0
114+
image: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0
115115
args:
116116
- "--csi-address=$(ADDRESS)"
117117
- "--default-fstype=ext4"
@@ -124,7 +124,7 @@ spec:
124124
- name: socket-dir
125125
mountPath: /var/lib/csi/sockets/pluginproxy/
126126
- name: csi-attacher
127-
image: registry.k8s.io/sig-storage/csi-attacher:v4.8.1
127+
image: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
128128
args:
129129
- "--csi-address=$(ADDRESS)"
130130
- "--v=5"
@@ -138,7 +138,7 @@ spec:
138138
- name: socket-dir
139139
mountPath: /var/lib/csi/sockets/pluginproxy/
140140
- name: csi-snapshotter
141-
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
141+
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0
142142
args:
143143
- "--csi-address=$(ADDRESS)"
144144
- "--v=5"
@@ -150,7 +150,7 @@ spec:
150150
- name: socket-dir
151151
mountPath: /var/lib/csi/sockets/pluginproxy/
152152
- name: csi-resizer
153-
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
153+
image: registry.k8s.io/sig-storage/csi-resizer:v2.0.0
154154
args:
155155
- "--csi-address=$(ADDRESS)"
156156
- "--timeout=30s"
@@ -397,7 +397,7 @@ spec:
397397
mountPath: /etc/udev/rules.d/
398398
containers:
399399
- name: csi-node-driver-registrar
400-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
400+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0
401401
args:
402402
- "--v=5"
403403
- "--csi-address=$(ADDRESS)"

‎driver/controller.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,14 @@ func (d *Driver) GetCapacity(ctx context.Context, req *csi.GetCapacityRequest) (
629629
return nil, status.Error(codes.Unimplemented, "")
630630
}
631631

632+
// GetSnapshot returns the snapshot of the controller service
633+
func (d *Driver) GetSnapshot(_ context.Context, _ *csi.GetSnapshotRequest) (*csi.GetSnapshotResponse, error) {
634+
d.log.WithFields(logrus.Fields{
635+
"method": "get_snapshot",
636+
}).Warn("get snapshot is not implemented")
637+
return nil, status.Error(codes.Unimplemented, "")
638+
}
639+
632640
// ControllerGetCapabilities returns the capabilities of the controller service.
633641
func (d *Driver) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
634642
newCap := func(cap csi.ControllerServiceCapability_RPC_Type) *csi.ControllerServiceCapability {
@@ -956,6 +964,11 @@ func (d *Driver) ControllerGetVolume(ctx context.Context, req *csi.ControllerGet
956964
return nil, status.Error(codes.Unimplemented, "")
957965
}
958966

967+
// ControllerModifyVolume modify a specific volume.
968+
func (d *Driver) ControllerModifyVolume(_ context.Context, _ *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) {
969+
return nil, status.Error(codes.Unimplemented, "")
970+
}
971+
959972
// extractStorage extracts the storage size in bytes from the given capacity
960973
// range. If the capacity range is not satisfied it returns the default volume
961974
// size. If the capacity range is above supported sizes, it returns an

‎driver/driver.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ var (
5858
// csi.ControllerServer
5959
// csi.NodeServer
6060
type Driver struct {
61+
csi.UnimplementedControllerServer
62+
csi.UnimplementedIdentityServer
63+
csi.UnimplementedNodeServer
64+
6165
name string
6266
// publishInfoVolumeName is used to pass the volume name from
6367
// `ControllerPublishVolume` to `NodeStageVolume or `NodePublishVolume`

‎driver/driver_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,10 @@ func (f *fakeSnapshotsDriver) List(context.Context, *godo.ListOptions) ([]godo.S
405405
panic("not implemented")
406406
}
407407

408+
func (f *fakeSnapshotsDriver) ListVolumeSnapshotByRegion(context.Context, string, *godo.ListOptions) ([]godo.Snapshot, *godo.Response, error) {
409+
panic("not implemented")
410+
}
411+
408412
func (f *fakeSnapshotsDriver) ListVolume(ctx context.Context, opts *godo.ListOptions) ([]godo.Snapshot, *godo.Response, error) {
409413
if opts == nil {
410414
opts = &godo.ListOptions{}

0 commit comments

Comments
 (0)