generated: run refactor
This commit is contained in:
@@ -17,6 +17,7 @@ limitations under the License.
|
||||
package garbagecollector
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
@@ -292,11 +293,11 @@ func setupWithServer(t *testing.T, result *kubeapiservertesting.TestServer, work
|
||||
|
||||
func createNamespaceOrDie(name string, c clientset.Interface, t *testing.T) *v1.Namespace {
|
||||
ns := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
|
||||
if _, err := c.CoreV1().Namespaces().Create(ns); err != nil {
|
||||
if _, err := c.CoreV1().Namespaces().Create(context.TODO(), ns); err != nil {
|
||||
t.Fatalf("failed to create namespace: %v", err)
|
||||
}
|
||||
falseVar := false
|
||||
_, err := c.CoreV1().ServiceAccounts(ns.Name).Create(&v1.ServiceAccount{
|
||||
_, err := c.CoreV1().ServiceAccounts(ns.Name).Create(context.TODO(), &v1.ServiceAccount{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "default"},
|
||||
AutomountServiceAccountToken: &falseVar,
|
||||
})
|
||||
@@ -309,7 +310,7 @@ func createNamespaceOrDie(name string, c clientset.Interface, t *testing.T) *v1.
|
||||
func deleteNamespaceOrDie(name string, c clientset.Interface, t *testing.T) {
|
||||
zero := int64(0)
|
||||
background := metav1.DeletePropagationBackground
|
||||
err := c.CoreV1().Namespaces().Delete(name, &metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
|
||||
err := c.CoreV1().Namespaces().Delete(context.TODO(), name, &metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to delete namespace %q: %v", name, err)
|
||||
}
|
||||
@@ -328,16 +329,16 @@ func TestCascadingDeletion(t *testing.T) {
|
||||
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
|
||||
podClient := clientSet.CoreV1().Pods(ns.Name)
|
||||
|
||||
toBeDeletedRC, err := rcClient.Create(newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
remainingRC, err := rcClient.Create(newOwnerRC(remainingRCName, ns.Name))
|
||||
remainingRC, err := rcClient.Create(context.TODO(), newOwnerRC(remainingRCName, ns.Name))
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
|
||||
rcs, err := rcClient.List(metav1.ListOptions{})
|
||||
rcs, err := rcClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to list replication controllers: %v", err)
|
||||
}
|
||||
@@ -347,7 +348,7 @@ func TestCascadingDeletion(t *testing.T) {
|
||||
|
||||
// this pod should be cascadingly deleted.
|
||||
pod := newPod(garbageCollectedPodName, ns.Name, []metav1.OwnerReference{{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRCName}})
|
||||
_, err = podClient.Create(pod)
|
||||
_, err = podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
@@ -357,20 +358,20 @@ func TestCascadingDeletion(t *testing.T) {
|
||||
{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRCName},
|
||||
{UID: remainingRC.ObjectMeta.UID, Name: remainingRCName},
|
||||
})
|
||||
_, err = podClient.Create(pod)
|
||||
_, err = podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
|
||||
// this pod shouldn't be cascadingly deleted, because it doesn't have an owner.
|
||||
pod = newPod(independentPodName, ns.Name, []metav1.OwnerReference{})
|
||||
_, err = podClient.Create(pod)
|
||||
_, err = podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
|
||||
// set up watch
|
||||
pods, err := podClient.List(metav1.ListOptions{})
|
||||
pods, err := podClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to list pods: %v", err)
|
||||
}
|
||||
@@ -378,7 +379,7 @@ func TestCascadingDeletion(t *testing.T) {
|
||||
t.Fatalf("Expect only 3 pods")
|
||||
}
|
||||
// delete one of the replication controller
|
||||
if err := rcClient.Delete(toBeDeletedRCName, getNonOrphanOptions()); err != nil {
|
||||
if err := rcClient.Delete(context.TODO(), toBeDeletedRCName, getNonOrphanOptions()); err != nil {
|
||||
t.Fatalf("failed to delete replication controller: %v", err)
|
||||
}
|
||||
// sometimes the deletion of the RC takes long time to be observed by
|
||||
@@ -393,10 +394,10 @@ func TestCascadingDeletion(t *testing.T) {
|
||||
t.Fatalf("expect pod %s to be garbage collected, got err= %v", garbageCollectedPodName, err)
|
||||
}
|
||||
// checks the garbage collect doesn't delete pods it shouldn't delete.
|
||||
if _, err := podClient.Get(independentPodName, metav1.GetOptions{}); err != nil {
|
||||
if _, err := podClient.Get(context.TODO(), independentPodName, metav1.GetOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := podClient.Get(oneValidOwnerPodName, metav1.GetOptions{}); err != nil {
|
||||
if _, err := podClient.Get(context.TODO(), oneValidOwnerPodName, metav1.GetOptions{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
@@ -415,13 +416,13 @@ func TestCreateWithNonExistentOwner(t *testing.T) {
|
||||
podClient := clientSet.CoreV1().Pods(ns.Name)
|
||||
|
||||
pod := newPod(garbageCollectedPodName, ns.Name, []metav1.OwnerReference{{UID: "doesn't matter", Name: toBeDeletedRCName}})
|
||||
_, err := podClient.Create(pod)
|
||||
_, err := podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
|
||||
// set up watch
|
||||
pods, err := podClient.List(metav1.ListOptions{})
|
||||
pods, err := podClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to list pods: %v", err)
|
||||
}
|
||||
@@ -442,7 +443,7 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
|
||||
rcName := "test.rc." + nameSuffix
|
||||
rc := newOwnerRC(rcName, namespace)
|
||||
rc.ObjectMeta.Finalizers = initialFinalizers
|
||||
rc, err := rcClient.Create(rc)
|
||||
rc, err := rcClient.Create(context.TODO(), rc)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
@@ -452,7 +453,7 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
|
||||
for j := 0; j < 3; j++ {
|
||||
podName := "test.pod." + nameSuffix + "-" + strconv.Itoa(j)
|
||||
pod := newPod(podName, namespace, []metav1.OwnerReference{{UID: rc.ObjectMeta.UID, Name: rc.ObjectMeta.Name}})
|
||||
createdPod, err := podClient.Create(pod)
|
||||
createdPod, err := podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
@@ -490,7 +491,7 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
|
||||
}
|
||||
}
|
||||
// delete the rc
|
||||
if err := rcClient.Delete(rc.ObjectMeta.Name, options); err != nil {
|
||||
if err := rcClient.Delete(context.TODO(), rc.ObjectMeta.Name, options); err != nil {
|
||||
t.Fatalf("failed to delete replication controller: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -498,7 +499,7 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
|
||||
func verifyRemainingObjects(t *testing.T, clientSet clientset.Interface, namespace string, rcNum, podNum int) (bool, error) {
|
||||
rcClient := clientSet.CoreV1().ReplicationControllers(namespace)
|
||||
podClient := clientSet.CoreV1().Pods(namespace)
|
||||
pods, err := podClient.List(metav1.ListOptions{})
|
||||
pods, err := podClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("Failed to list pods: %v", err)
|
||||
}
|
||||
@@ -507,7 +508,7 @@ func verifyRemainingObjects(t *testing.T, clientSet clientset.Interface, namespa
|
||||
ret = false
|
||||
t.Logf("expect %d pods, got %d pods", podNum, len(pods.Items))
|
||||
}
|
||||
rcs, err := rcClient.List(metav1.ListOptions{})
|
||||
rcs, err := rcClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("Failed to list replication controllers: %v", err)
|
||||
}
|
||||
@@ -561,7 +562,7 @@ func TestStressingCascadingDeletion(t *testing.T) {
|
||||
|
||||
// verify the remaining pods all have "orphan" in their names.
|
||||
podClient := clientSet.CoreV1().Pods(ns.Name)
|
||||
pods, err := podClient.List(metav1.ListOptions{})
|
||||
pods, err := podClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -593,7 +594,7 @@ func TestOrphaning(t *testing.T) {
|
||||
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
|
||||
// create the RC with the orphan finalizer set
|
||||
toBeDeletedRC := newOwnerRC(toBeDeletedRCName, ns.Name)
|
||||
toBeDeletedRC, err := rcClient.Create(toBeDeletedRC)
|
||||
toBeDeletedRC, err := rcClient.Create(context.TODO(), toBeDeletedRC)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
@@ -604,7 +605,7 @@ func TestOrphaning(t *testing.T) {
|
||||
for i := 0; i < podsNum; i++ {
|
||||
podName := garbageCollectedPodName + strconv.Itoa(i)
|
||||
pod := newPod(podName, ns.Name, []metav1.OwnerReference{{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRCName}})
|
||||
createdPod, err := podClient.Create(pod)
|
||||
createdPod, err := podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
@@ -626,13 +627,13 @@ func TestOrphaning(t *testing.T) {
|
||||
t.Fatalf("Failed to observe pods in GC graph for %s: %v", toBeDeletedRC.Name, err)
|
||||
}
|
||||
|
||||
err = rcClient.Delete(toBeDeletedRCName, getOrphanOptions())
|
||||
err = rcClient.Delete(context.TODO(), toBeDeletedRCName, getOrphanOptions())
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to gracefully delete the rc: %v", err)
|
||||
}
|
||||
// verify the toBeDeleteRC is deleted
|
||||
if err := wait.PollImmediate(1*time.Second, 30*time.Second, func() (bool, error) {
|
||||
rcs, err := rcClient.List(metav1.ListOptions{})
|
||||
rcs, err := rcClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -646,7 +647,7 @@ func TestOrphaning(t *testing.T) {
|
||||
}
|
||||
|
||||
// verify pods don't have the ownerPod as an owner anymore
|
||||
pods, err := podClient.List(metav1.ListOptions{})
|
||||
pods, err := podClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to list pods: %v", err)
|
||||
}
|
||||
@@ -672,11 +673,11 @@ func TestSolidOwnerDoesNotBlockWaitingOwner(t *testing.T) {
|
||||
podClient := clientSet.CoreV1().Pods(ns.Name)
|
||||
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
|
||||
// create the RC with the orphan finalizer set
|
||||
toBeDeletedRC, err := rcClient.Create(newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
remainingRC, err := rcClient.Create(newOwnerRC(remainingRCName, ns.Name))
|
||||
remainingRC, err := rcClient.Create(context.TODO(), newOwnerRC(remainingRCName, ns.Name))
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
@@ -685,18 +686,18 @@ func TestSolidOwnerDoesNotBlockWaitingOwner(t *testing.T) {
|
||||
{UID: toBeDeletedRC.ObjectMeta.UID, Name: toBeDeletedRC.Name, BlockOwnerDeletion: &trueVar},
|
||||
{UID: remainingRC.ObjectMeta.UID, Name: remainingRC.Name},
|
||||
})
|
||||
_, err = podClient.Create(pod)
|
||||
_, err = podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
|
||||
err = rcClient.Delete(toBeDeletedRCName, getForegroundOptions())
|
||||
err = rcClient.Delete(context.TODO(), toBeDeletedRCName, getForegroundOptions())
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to delete the rc: %v", err)
|
||||
}
|
||||
// verify the toBeDeleteRC is deleted
|
||||
if err := wait.PollImmediate(1*time.Second, 30*time.Second, func() (bool, error) {
|
||||
_, err := rcClient.Get(toBeDeletedRC.Name, metav1.GetOptions{})
|
||||
_, err := rcClient.Get(context.TODO(), toBeDeletedRC.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
if apierrors.IsNotFound(err) {
|
||||
return true, nil
|
||||
@@ -709,7 +710,7 @@ func TestSolidOwnerDoesNotBlockWaitingOwner(t *testing.T) {
|
||||
}
|
||||
|
||||
// verify pods don't have the toBeDeleteRC as an owner anymore
|
||||
pod, err = podClient.Get("pod", metav1.GetOptions{})
|
||||
pod, err = podClient.Get(context.TODO(), "pod", metav1.GetOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to list pods: %v", err)
|
||||
}
|
||||
@@ -732,7 +733,7 @@ func TestNonBlockingOwnerRefDoesNotBlock(t *testing.T) {
|
||||
podClient := clientSet.CoreV1().Pods(ns.Name)
|
||||
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
|
||||
// create the RC with the orphan finalizer set
|
||||
toBeDeletedRC, err := rcClient.Create(newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
@@ -749,22 +750,22 @@ func TestNonBlockingOwnerRefDoesNotBlock(t *testing.T) {
|
||||
})
|
||||
// adding finalizer that no controller handles, so that the pod won't be deleted
|
||||
pod2.ObjectMeta.Finalizers = []string{"x/y"}
|
||||
_, err = podClient.Create(pod1)
|
||||
_, err = podClient.Create(context.TODO(), pod1)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
_, err = podClient.Create(pod2)
|
||||
_, err = podClient.Create(context.TODO(), pod2)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
|
||||
err = rcClient.Delete(toBeDeletedRCName, getForegroundOptions())
|
||||
err = rcClient.Delete(context.TODO(), toBeDeletedRCName, getForegroundOptions())
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to delete the rc: %v", err)
|
||||
}
|
||||
// verify the toBeDeleteRC is deleted
|
||||
if err := wait.PollImmediate(1*time.Second, 30*time.Second, func() (bool, error) {
|
||||
_, err := rcClient.Get(toBeDeletedRC.Name, metav1.GetOptions{})
|
||||
_, err := rcClient.Get(context.TODO(), toBeDeletedRC.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
if apierrors.IsNotFound(err) {
|
||||
return true, nil
|
||||
@@ -777,7 +778,7 @@ func TestNonBlockingOwnerRefDoesNotBlock(t *testing.T) {
|
||||
}
|
||||
|
||||
// verify pods are still there
|
||||
pods, err := podClient.List(metav1.ListOptions{})
|
||||
pods, err := podClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to list pods: %v", err)
|
||||
}
|
||||
@@ -798,14 +799,14 @@ func TestDoubleDeletionWithFinalizer(t *testing.T) {
|
||||
podClient := clientSet.CoreV1().Pods(ns.Name)
|
||||
pod := newPod("lucy", ns.Name, nil)
|
||||
pod.ObjectMeta.Finalizers = []string{"x/y"}
|
||||
if _, err := podClient.Create(pod); err != nil {
|
||||
if _, err := podClient.Create(context.TODO(), pod); err != nil {
|
||||
t.Fatalf("Failed to create pod: %v", err)
|
||||
}
|
||||
if err := podClient.Delete(pod.Name, getForegroundOptions()); err != nil {
|
||||
if err := podClient.Delete(context.TODO(), pod.Name, getForegroundOptions()); err != nil {
|
||||
t.Fatalf("Failed to delete pod: %v", err)
|
||||
}
|
||||
if err := wait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
|
||||
returnedPod, err := podClient.Get(pod.Name, metav1.GetOptions{})
|
||||
returnedPod, err := podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -819,11 +820,11 @@ func TestDoubleDeletionWithFinalizer(t *testing.T) {
|
||||
}
|
||||
|
||||
// step 2: deletes the pod one more time and checks if there's only the custom finalizer left
|
||||
if err := podClient.Delete(pod.Name, getForegroundOptions()); err != nil {
|
||||
if err := podClient.Delete(context.TODO(), pod.Name, getForegroundOptions()); err != nil {
|
||||
t.Fatalf("Failed to delete pod: %v", err)
|
||||
}
|
||||
if err := wait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
|
||||
returnedPod, err := podClient.Get(pod.Name, metav1.GetOptions{})
|
||||
returnedPod, err := podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -838,11 +839,11 @@ func TestDoubleDeletionWithFinalizer(t *testing.T) {
|
||||
|
||||
// step 3: removes the custom finalizer and checks if the pod was removed
|
||||
patch := []byte(`[{"op":"remove","path":"/metadata/finalizers"}]`)
|
||||
if _, err := podClient.Patch(pod.Name, types.JSONPatchType, patch); err != nil {
|
||||
if _, err := podClient.Patch(context.TODO(), pod.Name, types.JSONPatchType, patch); err != nil {
|
||||
t.Fatalf("Failed to update pod: %v", err)
|
||||
}
|
||||
if err := wait.Poll(1*time.Second, 10*time.Second, func() (bool, error) {
|
||||
_, err := podClient.Get(pod.Name, metav1.GetOptions{})
|
||||
_, err := podClient.Get(context.TODO(), pod.Name, metav1.GetOptions{})
|
||||
return apierrors.IsNotFound(err), nil
|
||||
}); err != nil {
|
||||
t.Fatalf("Failed waiting for pod %q to be deleted", pod.Name)
|
||||
@@ -860,7 +861,7 @@ func TestBlockingOwnerRefDoesBlock(t *testing.T) {
|
||||
podClient := clientSet.CoreV1().Pods(ns.Name)
|
||||
rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
|
||||
// create the RC with the orphan finalizer set
|
||||
toBeDeletedRC, err := rcClient.Create(newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
toBeDeletedRC, err := rcClient.Create(context.TODO(), newOwnerRC(toBeDeletedRCName, ns.Name))
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create replication controller: %v", err)
|
||||
}
|
||||
@@ -870,7 +871,7 @@ func TestBlockingOwnerRefDoesBlock(t *testing.T) {
|
||||
})
|
||||
// adding finalizer that no controller handles, so that the pod won't be deleted
|
||||
pod.ObjectMeta.Finalizers = []string{"x/y"}
|
||||
_, err = podClient.Create(pod)
|
||||
_, err = podClient.Create(context.TODO(), pod)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Pod: %v", err)
|
||||
}
|
||||
@@ -889,19 +890,19 @@ func TestBlockingOwnerRefDoesBlock(t *testing.T) {
|
||||
t.Fatalf("failed to wait for garbage collector to be synced")
|
||||
}
|
||||
|
||||
err = rcClient.Delete(toBeDeletedRCName, getForegroundOptions())
|
||||
err = rcClient.Delete(context.TODO(), toBeDeletedRCName, getForegroundOptions())
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to delete the rc: %v", err)
|
||||
}
|
||||
time.Sleep(15 * time.Second)
|
||||
// verify the toBeDeleteRC is NOT deleted
|
||||
_, err = rcClient.Get(toBeDeletedRC.Name, metav1.GetOptions{})
|
||||
_, err = rcClient.Get(context.TODO(), toBeDeletedRC.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
t.Errorf("unexpected error: %v", err)
|
||||
}
|
||||
|
||||
// verify pods are still there
|
||||
pods, err := podClient.List(metav1.ListOptions{})
|
||||
pods, err := podClient.List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to list pods: %v", err)
|
||||
}
|
||||
@@ -994,14 +995,14 @@ func TestMixedRelationships(t *testing.T) {
|
||||
// Create a core dependent resource.
|
||||
coreDependent := newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("dependent"))
|
||||
link(t, customOwner, coreDependent)
|
||||
coreDependent, err = configMapClient.Create(coreDependent)
|
||||
coreDependent, err = configMapClient.Create(context.TODO(), coreDependent)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create dependent: %v", err)
|
||||
}
|
||||
t.Logf("created core dependent %q", coreDependent.GetName())
|
||||
|
||||
// Create a core owner resource.
|
||||
coreOwner, err := configMapClient.Create(newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("owner")))
|
||||
coreOwner, err := configMapClient.Create(context.TODO(), newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("owner")))
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create owner: %v", err)
|
||||
}
|
||||
@@ -1044,14 +1045,14 @@ func TestMixedRelationships(t *testing.T) {
|
||||
}
|
||||
|
||||
// Delete the core owner.
|
||||
err = configMapClient.Delete(coreOwner.GetName(), &metav1.DeleteOptions{PropagationPolicy: &foreground})
|
||||
err = configMapClient.Delete(context.TODO(), coreOwner.GetName(), &metav1.DeleteOptions{PropagationPolicy: &foreground})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to delete owner resource %q: %v", coreOwner.GetName(), err)
|
||||
}
|
||||
|
||||
// Ensure the owner is deleted.
|
||||
if err := wait.Poll(1*time.Second, 60*time.Second, func() (bool, error) {
|
||||
_, err := configMapClient.Get(coreOwner.GetName(), metav1.GetOptions{})
|
||||
_, err := configMapClient.Get(context.TODO(), coreOwner.GetName(), metav1.GetOptions{})
|
||||
return apierrors.IsNotFound(err), nil
|
||||
}); err != nil {
|
||||
t.Fatalf("failed waiting for owner resource %q to be deleted", coreOwner.GetName())
|
||||
@@ -1107,7 +1108,7 @@ func testCRDDeletion(t *testing.T, ctx *testContext, ns *v1.Namespace, definitio
|
||||
// Create a core dependent resource.
|
||||
dependent := newConfigMap(ns.Name, names.SimpleNameGenerator.GenerateName("dependent"))
|
||||
link(t, owner, dependent)
|
||||
dependent, err = configMapClient.Create(dependent)
|
||||
dependent, err = configMapClient.Create(context.TODO(), dependent)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create dependent: %v", err)
|
||||
}
|
||||
@@ -1130,7 +1131,7 @@ func testCRDDeletion(t *testing.T, ctx *testContext, ns *v1.Namespace, definitio
|
||||
|
||||
// Ensure the dependent is deleted.
|
||||
if err := wait.Poll(1*time.Second, 60*time.Second, func() (bool, error) {
|
||||
_, err := configMapClient.Get(dependent.GetName(), metav1.GetOptions{})
|
||||
_, err := configMapClient.Get(context.TODO(), dependent.GetName(), metav1.GetOptions{})
|
||||
return apierrors.IsNotFound(err), nil
|
||||
}); err != nil {
|
||||
t.Fatalf("failed waiting for dependent %q (owned by %q) to be deleted", dependent.GetName(), owner.GetName())
|
||||
|
Reference in New Issue
Block a user