mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 05:57:25 +00:00
Enable CSI e2e tests for volume expansion
This commit is contained in:
parent
73f31afd5d
commit
81572e5254
@ -50,6 +50,7 @@ var csiTestSuites = []func() testsuites.TestSuite{
|
||||
testsuites.InitSnapshottableTestSuite,
|
||||
testsuites.InitMultiVolumeTestSuite,
|
||||
testsuites.InitDisruptiveTestSuite,
|
||||
testsuites.InitVolumeExpandTestSuite,
|
||||
}
|
||||
|
||||
// This executes testSuites for csi volumes.
|
||||
|
@ -41,7 +41,7 @@ import (
|
||||
"strconv"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
"k8s.io/api/core/v1"
|
||||
v1 "k8s.io/api/core/v1"
|
||||
storagev1 "k8s.io/api/storage/v1"
|
||||
storagev1beta1 "k8s.io/api/storage/v1beta1"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
@ -87,17 +87,25 @@ var _ testsuites.SnapshottableTestDriver = &hostpathCSIDriver{}
|
||||
|
||||
// InitHostPathCSIDriver returns hostpathCSIDriver that implements TestDriver interface
|
||||
func InitHostPathCSIDriver() testsuites.TestDriver {
|
||||
capabilities := map[testsuites.Capability]bool{
|
||||
testsuites.CapPersistence: true,
|
||||
testsuites.CapSnapshotDataSource: true,
|
||||
testsuites.CapMultiPODs: true,
|
||||
testsuites.CapBlock: true,
|
||||
testsuites.CapPVCDataSource: true,
|
||||
testsuites.CapControllerExpansion: true,
|
||||
}
|
||||
return initHostPathCSIDriver("csi-hostpath",
|
||||
map[testsuites.Capability]bool{testsuites.CapPersistence: true, testsuites.CapSnapshotDataSource: true,
|
||||
testsuites.CapMultiPODs: true, testsuites.CapBlock: true,
|
||||
testsuites.CapPVCDataSource: true},
|
||||
capabilities,
|
||||
"test/e2e/testing-manifests/storage-csi/driver-registrar/rbac.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/external-provisioner/rbac.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/external-snapshotter/rbac.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/external-resizer/rbac.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml",
|
||||
"test/e2e/testing-manifests/storage-csi/hostpath/hostpath/e2e-test-rbac.yaml",
|
||||
)
|
||||
|
@ -221,7 +221,6 @@ var (
|
||||
DefaultFsDynamicPVAllowExpansion = TestPattern{
|
||||
Name: "Dynamic PV (default fs)(allowExpansion)",
|
||||
VolType: DynamicPV,
|
||||
BindingMode: storagev1.VolumeBindingWaitForFirstConsumer,
|
||||
AllowExpansion: true,
|
||||
}
|
||||
// BlockVolModeDynamicPVAllowExpansion is TestPattern for "Dynamic PV (block volmode)(allowExpansion)"
|
||||
@ -229,7 +228,6 @@ var (
|
||||
Name: "Dynamic PV (block volmode)(allowExpansion)",
|
||||
VolType: DynamicPV,
|
||||
VolMode: v1.PersistentVolumeBlock,
|
||||
BindingMode: storagev1.VolumeBindingWaitForFirstConsumer,
|
||||
AllowExpansion: true,
|
||||
}
|
||||
)
|
||||
|
@ -0,0 +1,48 @@
|
||||
kind: Service
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: csi-hostpath-resizer
|
||||
labels:
|
||||
app: csi-hostpath-resizer
|
||||
spec:
|
||||
selector:
|
||||
app: csi-hostpath-resizer
|
||||
ports:
|
||||
- name: dummy
|
||||
port: 12345
|
||||
|
||||
---
|
||||
kind: StatefulSet
|
||||
apiVersion: apps/v1
|
||||
metadata:
|
||||
name: csi-hostpath-resizer
|
||||
spec:
|
||||
serviceName: "csi-hostpath-resizer"
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: csi-hostpath-resizer
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: csi-hostpath-resizer
|
||||
spec:
|
||||
serviceAccountName: csi-resizer
|
||||
containers:
|
||||
- name: csi-resizer
|
||||
image: quay.io/k8scsi/csi-resizer:v0.2.0
|
||||
args:
|
||||
- "--v=5"
|
||||
- "--csi-address=$(ADDRESS)"
|
||||
env:
|
||||
- name: ADDRESS
|
||||
value: /csi/csi.sock
|
||||
imagePullPolicy: Always
|
||||
volumeMounts:
|
||||
- mountPath: /csi
|
||||
name: socket-dir
|
||||
volumes:
|
||||
- hostPath:
|
||||
path: /var/lib/kubelet/plugins/csi-hostpath
|
||||
type: DirectoryOrCreate
|
||||
name: socket-dir
|
@ -33,7 +33,7 @@ spec:
|
||||
- mountPath: /registration
|
||||
name: registration-dir
|
||||
- name: hostpath
|
||||
image: quay.io/k8scsi/hostpathplugin:v1.2.0-rc4
|
||||
image: quay.io/k8scsi/hostpathplugin:v1.2.0-rc5
|
||||
args:
|
||||
- "--v=5"
|
||||
- "--endpoint=$(CSI_ENDPOINT)"
|
||||
|
@ -16,6 +16,9 @@ subjects:
|
||||
- kind: ServiceAccount
|
||||
name: csi-snapshotter
|
||||
namespace: default
|
||||
- kind: ServiceAccount
|
||||
name: csi-resizer
|
||||
namespace: default
|
||||
roleRef:
|
||||
kind: ClusterRole
|
||||
name: e2e-test-privileged-psp
|
||||
|
Loading…
Reference in New Issue
Block a user