diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 9f38279160df..fdd022acfa7e 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -338,6 +338,7 @@ const ( // owner: @vladimirvivien // alpha: v1.11 + // beta: v1.14 // // Enables CSI to use raw block storage volumes CSIBlockVolume utilfeature.Feature = "CSIBlockVolume" @@ -476,7 +477,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS VolumeSubpathEnvExpansion: {Default: false, PreRelease: utilfeature.Alpha}, KubeletPluginsWatcher: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.16 ResourceQuotaScopeSelectors: {Default: true, PreRelease: utilfeature.Beta}, - CSIBlockVolume: {Default: false, PreRelease: utilfeature.Alpha}, + CSIBlockVolume: {Default: true, PreRelease: utilfeature.Beta}, RuntimeClass: {Default: false, PreRelease: utilfeature.Alpha}, NodeLease: {Default: true, PreRelease: utilfeature.Beta}, SCTPSupport: {Default: false, PreRelease: utilfeature.Alpha}, diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index 119818f50941..324b4f19cf06 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -83,7 +83,8 @@ var _ testsuites.SnapshottableTestDriver = &hostpathCSIDriver{} // InitHostPathCSIDriver returns hostpathCSIDriver that implements TestDriver interface func InitHostPathCSIDriver() testsuites.TestDriver { return initHostPathCSIDriver("csi-hostpath", - map[testsuites.Capability]bool{testsuites.CapPersistence: true, testsuites.CapDataSource: true, testsuites.CapMultiPODs: true}, + map[testsuites.Capability]bool{testsuites.CapPersistence: true, testsuites.CapDataSource: true, + testsuites.CapMultiPODs: true, testsuites.CapBlock: true}, "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", diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml index 8b01fe981cba..303860e8bfcb 100644 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml +++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml @@ -33,7 +33,7 @@ spec: - mountPath: /registration name: registration-dir - name: hostpath - image: quay.io/k8scsi/hostpathplugin:v1.0.1 + image: quay.io/k8scsi/hostpathplugin:v1.1.0-rc1 args: - "--v=5" - "--endpoint=$(CSI_ENDPOINT)" @@ -55,6 +55,9 @@ spec: - mountPath: /var/lib/kubelet/pods mountPropagation: Bidirectional name: mountpoint-dir + - mountPath: /var/lib/kubelet/plugins + mountPropagation: Bidirectional + name: plugins-dir volumes: - hostPath: path: /var/lib/kubelet/plugins/csi-hostpath @@ -68,3 +71,7 @@ spec: path: /var/lib/kubelet/plugins_registry type: Directory name: registration-dir + - hostPath: + path: /var/lib/kubelet/plugins + type: Directory + name: plugins-dir