github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update e2e tests to include CSI

pull/58/head
Renaud Gaubert 2018-11-16 23:56:34 +01:00
parent 229418f261
commit 1a3fbf1f13
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/util/pluginwatcher/BUILD
View File

@ -29,7 +29,6 @@ go_test(
embed = [":go_default_library"], embed = [":go_default_library"],
deps = [ deps = [
"//pkg/kubelet/apis/pluginregistration/v1:go_default_library", "//pkg/kubelet/apis/pluginregistration/v1:go_default_library",
"//vendor/github.com/fsnotify/fsnotify:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library",
"//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog:go_default_library",
], ],

2
test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
View File

@ -60,7 +60,7 @@ spec:
volumes: volumes:
- name: registration-dir - name: registration-dir
hostPath: hostPath:
path: /var/lib/kubelet/plugins/ path: /var/lib/kubelet/plugins_registry/
type: Directory type: Directory
- name: kubelet-dir - name: kubelet-dir
hostPath: hostPath:

2
test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml
View File

@ -65,6 +65,6 @@ spec:
type: DirectoryOrCreate type: DirectoryOrCreate
name: mountpoint-dir name: mountpoint-dir
- hostPath: - hostPath:
path: /var/lib/kubelet/plugins path: /var/lib/kubelet/plugins_registry
type: Directory type: Directory
name: registration-dir name: registration-dir

2
test/e2e_node/device_plugin.go
View File

@ -53,7 +53,7 @@ var _ = framework.KubeDescribe("Device Plugin [Feature:DevicePlugin][NodeFeature
var _ = framework.KubeDescribe("Device Plugin [Feature:DevicePluginProbe][NodeFeature:DevicePluginProbe][Serial]", func() { var _ = framework.KubeDescribe("Device Plugin [Feature:DevicePluginProbe][NodeFeature:DevicePluginProbe][Serial]", func() {
f := framework.NewDefaultFramework("device-plugin-errors") f := framework.NewDefaultFramework("device-plugin-errors")
testDevicePlugin(f, true, "/var/lib/kubelet/plugins/") testDevicePlugin(f, true, "/var/lib/kubelet/plugins_registry")
}) })
func testDevicePlugin(f *framework.Framework, enablePluginWatcher bool, pluginSockDir string) { func testDevicePlugin(f *framework.Framework, enablePluginWatcher bool, pluginSockDir string) {