github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

fixed checker pod issue

Browse Source
This commit is contained in:
markturansky
2015-06-05 10:06:40 -04:00
parent b9d7b27bd0
commit 57d8b30b3e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/persistent_volumes.go
View File

@@ -78,7 +78,7 @@ var _ = Describe("[Skipped] persistentVolumes", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// allow the binder a chance to catch up. should not be more than 20s. // allow the binder a chance to catch up. should not be more than 20s.
waitForPersistentVolumePhase(api.VolumeBound, c, pv.Name, 1 * time.Second, 30 * time.Second) waitForPersistentVolumePhase(api.VolumeBound, c, pv.Name, 1*time.Second, 30*time.Second)
pv, err = c.PersistentVolumes().Get(pv.Name) pv, err = c.PersistentVolumes().Get(pv.Name)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -91,7 +91,7 @@ var _ = Describe("[Skipped] persistentVolumes", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// allow the recycler a chance to catch up. it has to perform NFS scrub, which can be slow in e2e. // allow the recycler a chance to catch up. it has to perform NFS scrub, which can be slow in e2e.
waitForPersistentVolumePhase(api.VolumeAvailable, c, pv.Name, 5 * time.Second, 300 * time.Second) waitForPersistentVolumePhase(api.VolumeAvailable, c, pv.Name, 5*time.Second, 300*time.Second)
pv, err = c.PersistentVolumes().Get(pv.Name) pv, err = c.PersistentVolumes().Get(pv.Name)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -101,9 +101,9 @@ var _ = Describe("[Skipped] persistentVolumes", func() {
// The NFS Server pod we're using contains an index.html file // The NFS Server pod we're using contains an index.html file
// Verify the file was really scrubbed from the volume // Verify the file was really scrubbed from the volume
checkpod := makeCheckPod(ns, serverIP) podTemplate := makeCheckPod(ns, serverIP)
checkpod, err = c.Pods(checkpod.Namespace).Get(checkpod.Name) checkpod, err := c.Pods(ns).Create(podTemplate)
Expect(err).NotTo(HaveOccurred()) expectNoError(err, "Failed to create checker pod: %v", err)
err = waitForPodSuccessInNamespace(c, checkpod.Name, checkpod.Spec.Containers[0].Name, checkpod.Namespace) err = waitForPodSuccessInNamespace(c, checkpod.Name, checkpod.Spec.Containers[0].Name, checkpod.Namespace)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
@@ -138,8 +138,8 @@ func makePersistentVolume(serverIP string) *api.PersistentVolume {
func makePersistentVolumeClaim(ns string) *api.PersistentVolumeClaim { func makePersistentVolumeClaim(ns string) *api.PersistentVolumeClaim {
return &api.PersistentVolumeClaim{ return &api.PersistentVolumeClaim{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
GenerateName: "pvc-", GenerateName: "pvc-",
Namespace: ns, Namespace: ns,
}, },
Spec: api.PersistentVolumeClaimSpec{ Spec: api.PersistentVolumeClaimSpec{
AccessModes: []api.PersistentVolumeAccessMode{ AccessModes: []api.PersistentVolumeAccessMode{
@@ -166,7 +166,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod {
}, },
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
GenerateName: "checker-", GenerateName: "checker-",
Namespace: ns, Namespace: ns,
}, },
Spec: api.PodSpec{ Spec: api.PodSpec{
Containers: []api.Container{ Containers: []api.Container{