Skip to content

Commit

Permalink
deref all calls to metav1.NewDeleteOptions that are passed to clients.
Browse files Browse the repository at this point in the history
This is gross but because NewDeleteOptions is used by various parts of
storage that still pass around pointers, the return type can't be
changed without significant refactoring within the apiserver. I think
this would be good to cleanup, but I want to minimize apiserver side
changes as much as possible in the client signature refactor.
  • Loading branch information
mikedanese committed Mar 5, 2020
1 parent c58e69e commit aaf855c
Show file tree
Hide file tree
Showing 33 changed files with 76 additions and 76 deletions.
2 changes: 1 addition & 1 deletion pkg/controller/podgc/gc_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewPodGC(kubeClient clientset.Interface, podInformer coreinformers.PodInfor
nodeQueue: workqueue.NewNamedDelayingQueue("orphaned_pods_nodes"),
deletePod: func(namespace, name string) error {
klog.Infof("PodGC is force deleting Pod: %v/%v", namespace, name)
return kubeClient.CoreV1().Pods(namespace).Delete(context.TODO(), name, metav1.NewDeleteOptions(0))
return kubeClient.CoreV1().Pods(namespace).Delete(context.TODO(), name, *metav1.NewDeleteOptions(0))
},
}

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/apimachinery/etcd_failure.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func checkExistingRCRecovers(f *framework.Framework) {
return false, nil
}
for _, pod := range pods.Items {
err = podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err, "failed to delete pod %s in namespace: %s", pod.Name, f.Namespace.Name)
}
framework.Logf("apiserver has recovered")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/apimachinery/generated_clientset.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ var _ = SIGDescribe("Generated clientset", func() {

ginkgo.By("deleting the pod gracefully")
gracePeriod := int64(31)
if err := podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(gracePeriod)); err != nil {
if err := podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(gracePeriod)); err != nil {
framework.Failf("Failed to delete pod: %v", err)
}

Expand Down
36 changes: 18 additions & 18 deletions test/e2e/apimachinery/resource_quota.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -712,7 +712,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -751,7 +751,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -808,7 +808,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -838,7 +838,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -938,7 +938,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:ScopeSelectors]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -968,7 +968,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:ScopeSelectors]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -1028,7 +1028,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:ScopeSelectors]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -1067,7 +1067,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:ScopeSelectors]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), podName, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -1114,7 +1114,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -1159,7 +1159,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
framework.ExpectError(err)

ginkgo.By("Deleting first pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -1209,9 +1209,9 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting both pods")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod2.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod2.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
})

Expand Down Expand Up @@ -1258,9 +1258,9 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting both pods")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod2.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod2.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -1299,7 +1299,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
})

Expand Down Expand Up @@ -1333,7 +1333,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down Expand Up @@ -1391,7 +1391,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
framework.ExpectNoError(err)

ginkgo.By("Deleting the pod")
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Ensuring resource quota status released the pod usage")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/apps/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ var _ = SIGDescribe("StatefulSet", func() {
}

ginkgo.By("Removing pod with conflicting port in namespace " + f.Namespace.Name)
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

ginkgo.By("Waiting when stateful pod " + statefulPodName + " will be recreated in namespace " + f.Namespace.Name + " and will be in running state")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/autoscaling/cluster_size_autoscaling.go
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ func drainNode(f *framework.Framework, node *v1.Node) {
pods, err := f.ClientSet.CoreV1().Pods(metav1.NamespaceAll).List(context.TODO(), podOpts)
framework.ExpectNoError(err)
for _, pod := range pods.Items {
err = f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/common/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (cc *ConformanceContainer) Create() {
}

func (cc *ConformanceContainer) Delete() error {
return cc.PodClient.Delete(context.TODO(), cc.podName, metav1.NewDeleteOptions(0))
return cc.PodClient.Delete(context.TODO(), cc.podName, *metav1.NewDeleteOptions(0))
}

func (cc *ConformanceContainer) IsReady() (bool, error) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/common/container_probe.go
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ func RunLivenessTest(f *framework.Framework, pod *v1.Pod, expectNumRestarts int,
// At the end of the test, clean up by removing the pod.
defer func() {
ginkgo.By("deleting the pod")
podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
}()
ginkgo.By(fmt.Sprintf("Creating pod %s in namespace %s", pod.Name, ns))
podClient.Create(pod)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/common/lifecycle_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
}, postStartWaitTimeout, podCheckInterval).Should(gomega.BeNil())
}
ginkgo.By("delete the pod with lifecycle hook")
podClient.DeleteSync(podWithHook.Name, metav1.NewDeleteOptions(15), framework.DefaultPodDeletionTimeout)
podClient.DeleteSync(podWithHook.Name, *metav1.NewDeleteOptions(15), framework.DefaultPodDeletionTimeout)
if podWithHook.Spec.Containers[0].Lifecycle.PreStop != nil {
ginkgo.By("check prestop hook")
gomega.Eventually(func() error {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/common/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ var _ = framework.KubeDescribe("Pods", func() {
framework.ExpectNoError(err, "failed to GET scheduled pod")

ginkgo.By("deleting the pod gracefully")
err = podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(30))
err = podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(30))
framework.ExpectNoError(err, "failed to delete pod")

ginkgo.By("verifying the kubelet observed the termination notice")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/network/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ func (config *NetworkingTestConfig) createNetProxyPods(podName string, selector
// DeleteNetProxyPod deletes the first endpoint pod and waits for it being removed.
func (config *NetworkingTestConfig) DeleteNetProxyPod() {
pod := config.EndpointPods[0]
config.getPodClient().Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
config.getPodClient().Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
config.EndpointPods = config.EndpointPods[1:]
// wait for pod being deleted.
err := e2epod.WaitForPodToDisappear(config.f.ClientSet, config.Namespace, pod.Name, labels.Everything(), time.Second, wait.ForeverTestTimeout)
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/network/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ var _ = SIGDescribe("DNS", func() {
framework.Logf("Created pod %v", testAgnhostPod)
defer func() {
framework.Logf("Deleting pod %s...", testAgnhostPod.Name)
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), testAgnhostPod.Name, metav1.NewDeleteOptions(0)); err != nil {
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), testAgnhostPod.Name, *metav1.NewDeleteOptions(0)); err != nil {
framework.Failf("ginkgo.Failed to delete pod %s: %v", testAgnhostPod.Name, err)
}
}()
Expand Down Expand Up @@ -478,7 +478,7 @@ var _ = SIGDescribe("DNS", func() {
framework.Logf("Created pod %v", testServerPod)
defer func() {
framework.Logf("Deleting pod %s...", testServerPod.Name)
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), testServerPod.Name, metav1.NewDeleteOptions(0)); err != nil {
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), testServerPod.Name, *metav1.NewDeleteOptions(0)); err != nil {
framework.Failf("ginkgo.Failed to delete pod %s: %v", testServerPod.Name, err)
}
}()
Expand Down Expand Up @@ -510,7 +510,7 @@ var _ = SIGDescribe("DNS", func() {
framework.Logf("Created pod %v", testUtilsPod)
defer func() {
framework.Logf("Deleting pod %s...", testUtilsPod.Name)
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), testUtilsPod.Name, metav1.NewDeleteOptions(0)); err != nil {
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), testUtilsPod.Name, *metav1.NewDeleteOptions(0)); err != nil {
framework.Failf("ginkgo.Failed to delete pod %s: %v", testUtilsPod.Name, err)
}
}()
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/network/dns_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {

func (t *dnsTestCommon) deleteUtilPod() {
podClient := t.c.CoreV1().Pods(t.f.Namespace.Name)
if err := podClient.Delete(context.TODO(), t.utilPod.Name, metav1.NewDeleteOptions(0)); err != nil {
if err := podClient.Delete(context.TODO(), t.utilPod.Name, *metav1.NewDeleteOptions(0)); err != nil {
framework.Logf("Delete of pod %v/%v failed: %v",
t.utilPod.Namespace, t.utilPod.Name, err)
}
Expand All @@ -273,7 +273,7 @@ func (t *dnsTestCommon) deleteCoreDNSPods() {
podClient := t.c.CoreV1().Pods(metav1.NamespaceSystem)

for _, pod := range pods.Items {
err = podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err = podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err, "failed to delete pod: %s", pod.Name)
}
}
Expand Down Expand Up @@ -382,7 +382,7 @@ func (t *dnsTestCommon) createDNSServerWithPtrRecord(namespace string, isIPv6 bo

func (t *dnsTestCommon) deleteDNSServerPod() {
podClient := t.c.CoreV1().Pods(t.f.Namespace.Name)
if err := podClient.Delete(context.TODO(), t.dnsServerPod.Name, metav1.NewDeleteOptions(0)); err != nil {
if err := podClient.Delete(context.TODO(), t.dnsServerPod.Name, *metav1.NewDeleteOptions(0)); err != nil {
framework.Logf("Delete of pod %v/%v failed: %v",
t.utilPod.Namespace, t.dnsServerPod.Name, err)
}
Expand Down Expand Up @@ -577,7 +577,7 @@ func validateDNSResults(f *framework.Framework, pod *v1.Pod, fileNames []string)
defer func() {
ginkgo.By("deleting the pod")
defer ginkgo.GinkgoRecover()
podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
}()
if _, err := podClient.Create(context.TODO(), pod, metav1.CreateOptions{}); err != nil {
framework.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
Expand Down Expand Up @@ -605,7 +605,7 @@ func validateTargetedProbeOutput(f *framework.Framework, pod *v1.Pod, fileNames
defer func() {
ginkgo.By("deleting the pod")
defer ginkgo.GinkgoRecover()
podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
}()
if _, err := podClient.Create(context.TODO(), pod, metav1.CreateOptions{}); err != nil {
framework.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/dual_stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ var _ = SIGDescribe("[Feature:IPv6DualStackAlphaFeature] [LinuxOnly]", func() {
framework.ExpectEqual(isIPv4(p.Status.PodIPs[0].IP) != isIPv4(p.Status.PodIPs[1].IP), true)

ginkgo.By("deleting the pod")
err = podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(30))
err = podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(30))
framework.ExpectNoError(err, "failed to delete pod")
})

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/node/pre_stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ var _ = SIGDescribe("PreStop", func() {
framework.ExpectNoError(err, "failed to GET scheduled pod")

ginkgo.By("deleting the pod gracefully")
err = podClient.Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(gracefulTerminationPeriodSeconds))
err = podClient.Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(gracefulTerminationPeriodSeconds))
framework.ExpectNoError(err, "failed to delete pod")

//wait up to graceful termination period seconds
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/limit_range.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ var _ = SIGDescribe("LimitRange", func() {
framework.ExpectError(err)

ginkgo.By("Deleting a LimitRange")
err = f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).Delete(context.TODO(), limitRange.Name, metav1.NewDeleteOptions(30))
err = f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).Delete(context.TODO(), limitRange.Name, *metav1.NewDeleteOptions(30))
framework.ExpectNoError(err)

ginkgo.By("Verifying the LimitRange was deleted")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/predicates.go
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ func runPodAndGetNodeName(f *framework.Framework, conf pausePodConfig) string {
pod := runPausePod(f, conf)

ginkgo.By("Explicitly delete pod here to free the resource it takes.")
err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, metav1.NewDeleteOptions(0))
err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(context.TODO(), pod.Name, *metav1.NewDeleteOptions(0))
framework.ExpectNoError(err)

return pod.Spec.NodeName
Expand Down
Loading

0 comments on commit aaf855c

Please sign in to comment.