github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

test: bump CSI container versions for mock testing

Browse Source 
These are the latest stable releases. We should test with those.
The newer external-provisioner no longer needs (and doesn't support)
the --provisioner parameter.
This commit is contained in:
Patrick Ohly 2021-02-04 17:19:27 +01:00
parent 26744ac58d
commit d27c541b45
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/storage/utils/deployment.go
View File

@ -41,7 +41,6 @@ import (
// that follow these conventions: // that follow these conventions:
// - driver and provisioner names are identical // - driver and provisioner names are identical
// - the driver binary accepts a --drivername parameter // - the driver binary accepts a --drivername parameter
// - the provisioner binary accepts a --provisioner parameter
// - the paths inside the container are either fixed // - the paths inside the container are either fixed
// and don't need to be patch (for example, --csi-address=/csi/csi.sock is // and don't need to be patch (for example, --csi-address=/csi/csi.sock is
// okay) or are specified directly in a parameter (for example, // okay) or are specified directly in a parameter (for example,
@ -86,10 +85,6 @@ func PatchCSIDeployment(f *framework.Framework, o PatchCSIOptions, object interf
switch container.Name { switch container.Name {
case o.DriverContainerName: case o.DriverContainerName:
container.Args = append(container.Args, o.DriverContainerArguments...) container.Args = append(container.Args, o.DriverContainerArguments...)
case o.ProvisionerContainerName:
// Driver name is expected to be the same
// as the provisioner here.
container.Args = append(container.Args, "--provisioner="+o.NewDriverName)
} }
} }
} }

6
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
View File

@ -15,13 +15,15 @@ spec:
serviceAccountName: csi-mock serviceAccountName: csi-mock
containers: containers:
- name: csi-provisioner - name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0 image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
# Topology support is needed for the pod rescheduling test # Topology support is needed for the pod rescheduling test
# ("storage capacity" in csi_mock_volume.go). # ("storage capacity" in csi_mock_volume.go).
- "--feature-gates=Topology=true" - "--feature-gates=Topology=true"
- "-v=5" - "-v=5"
# Needed for fsGroup support.
- "--default-fstype=ext4"
env: env:
- name: ADDRESS - name: ADDRESS
value: /csi/csi.sock value: /csi/csi.sock
@ -29,7 +31,7 @@ spec:
- mountPath: /csi - mountPath: /csi
name: socket-dir name: socket-dir
- name: driver-registrar - name: driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0 image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
args: args:
- --v=5 - --v=5
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock