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

e2e: node: devices: improve the node reboot test

Browse Source 
The recently added e2e device plugins test to cover node reboot
works fine if runs every time on CI environment (e.g CI) but
doesn't handle correctly partial setup when run repeatedly on
the same instance (developer setup).

To accomodate both flows, we extend the error management, checking
more error conditions in the flow.

Signed-off-by: Francesco Romani <fromani@redhat.com>
This commit is contained in:
Francesco Romani 2023-06-21 19:20:05 +02:00
parent b926aba268
commit 5cf50105a2
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/e2e_node/device_plugin_test.go
View File

@ -38,7 +38,6 @@ import (
k8stypes "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
"k8s.io/klog/v2"
kubeletdevicepluginv1beta1 "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
admissionapi "k8s.io/pod-security-admission/api"
@ -569,30 +568,40 @@ func testDevicePluginNodeReboot(f *framework.Framework, pluginSockDir string) {
return nil
}, f.Timeouts.SystemDaemonsetStartup, f.Timeouts.Poll).Should(gomega.Succeed())
ginkgo.By("Setting up the directory and file for controlling registration")
ginkgo.By("Setting up the directory for controlling registration")
triggerPathDir = filepath.Join(devicePluginDir, "sample")
if _, err := os.Stat(triggerPathDir); errors.Is(err, os.ErrNotExist) {
err := os.Mkdir(triggerPathDir, os.ModePerm)
if err != nil {
klog.Errorf("Directory creation %s failed: %v ", triggerPathDir, err)
panic(err)
}
klog.InfoS("Directory created successfully")
triggerPathFile = filepath.Join(triggerPathDir, "registration")
if _, err := os.Stat(triggerPathFile); errors.Is(err, os.ErrNotExist) {
_, err = os.Create(triggerPathFile)
if err != nil {
klog.Errorf("File creation %s failed: %v ", triggerPathFile, err)
panic(err)
if _, err := os.Stat(triggerPathDir); err != nil {
if errors.Is(err, os.ErrNotExist) {
if err := os.Mkdir(triggerPathDir, os.ModePerm); err != nil {
framework.Fail(fmt.Sprintf("registration control directory %q creation failed: %v ", triggerPathDir, err))
}
framework.Logf("registration control directory created successfully")
} else {
framework.Fail(fmt.Sprintf("unexpected error checking %q: %v", triggerPathDir, err))
}
} else {
framework.Logf("registration control directory %q already present", triggerPathDir)
}
ginkgo.By("Setting up the file trigger for controlling registration")
triggerPathFile = filepath.Join(triggerPathDir, "registration")
if _, err := os.Stat(triggerPathFile); err != nil {
if errors.Is(err, os.ErrNotExist) {
if _, err = os.Create(triggerPathFile); err != nil {
framework.Fail(fmt.Sprintf("registration control file %q creation failed: %v", triggerPathFile, err))
}
framework.Logf("registration control file created successfully")
} else {
framework.Fail(fmt.Sprintf("unexpected error creating %q: %v", triggerPathFile, err))
}
} else {
framework.Logf("registration control file %q already present", triggerPathFile)
}
ginkgo.By("Scheduling a sample device plugin pod")
data, err := e2etestfiles.Read(SampleDevicePluginControlRegistrationDSYAML)
if err != nil {
framework.Fail(err.Error())
framework.Fail(fmt.Sprintf("error reading test data %q: %v", SampleDevicePluginControlRegistrationDSYAML, err))
}
ds := readDaemonSetV1OrDie(data)