diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index b9e39b87f54..ea5218f8915 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -54,7 +54,7 @@ import ( cloudprovider "k8s.io/cloud-provider" netutils "k8s.io/utils/net" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/ptr" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/test/e2e/framework" @@ -1939,7 +1939,7 @@ var _ = common.SIGDescribe("Services", func() { }, } webserverPod0.Labels = jig.Labels - webserverPod0.Spec.TerminationGracePeriodSeconds = utilpointer.Int64(gracePeriod) + webserverPod0.Spec.TerminationGracePeriodSeconds = ptr.To(gracePeriod) e2epod.SetNodeSelection(&webserverPod0.Spec, e2epod.NodeSelection{Name: node0.Name}) _, err = cs.CoreV1().Pods(ns).Create(ctx, webserverPod0, metav1.CreateOptions{}) @@ -2058,7 +2058,7 @@ var _ = common.SIGDescribe("Services", func() { }, } webserverPod0.Labels = jig.Labels - webserverPod0.Spec.TerminationGracePeriodSeconds = utilpointer.Int64(gracePeriod) + webserverPod0.Spec.TerminationGracePeriodSeconds = ptr.To(gracePeriod) e2epod.SetNodeSelection(&webserverPod0.Spec, e2epod.NodeSelection{Name: node0.Name}) _, err = cs.CoreV1().Pods(ns).Create(ctx, webserverPod0, metav1.CreateOptions{}) @@ -2722,7 +2722,7 @@ var _ = common.SIGDescribe("Services", func() { ginkgo.By("Creating 1 webserver pod to be part of the TCP service") webserverPod0 := e2epod.NewAgnhostPod(ns, "echo-hostname-0", nil, nil, nil, "netexec", "--http-port", strconv.Itoa(servicePort), "--delay-shutdown", "100") webserverPod0.Labels = jig.Labels - webserverPod0.Spec.TerminationGracePeriodSeconds = utilpointer.Int64(100) + webserverPod0.Spec.TerminationGracePeriodSeconds = ptr.To[int64](100) e2epod.SetNodeSelection(&webserverPod0.Spec, e2epod.NodeSelection{Name: node0.Name}) _, err = cs.CoreV1().Pods(ns).Create(ctx, webserverPod0, metav1.CreateOptions{}) @@ -2814,7 +2814,7 @@ var _ = common.SIGDescribe("Services", func() { ginkgo.By("Creating 1 webserver pod to be part of the TCP service") webserverPod0 := e2epod.NewAgnhostPod(ns, "echo-hostname-0", nil, nil, nil, "netexec", "--http-port", strconv.Itoa(servicePort), "--delay-shutdown", "100") webserverPod0.Labels = jig.Labels - webserverPod0.Spec.TerminationGracePeriodSeconds = utilpointer.Int64(100) + webserverPod0.Spec.TerminationGracePeriodSeconds = ptr.To[int64](100) e2epod.SetNodeSelection(&webserverPod0.Spec, e2epod.NodeSelection{Name: node0.Name}) _, err = cs.CoreV1().Pods(ns).Create(ctx, webserverPod0, metav1.CreateOptions{}) @@ -2889,7 +2889,7 @@ var _ = common.SIGDescribe("Services", func() { ginkgo.By("Creating 1 webserver pod to be part of the TCP service") webserverPod0 := e2epod.NewAgnhostPod(ns, "echo-hostname-0", nil, nil, nil, "netexec", "--http-port", strconv.Itoa(servicePort), "--delay-shutdown", "100") webserverPod0.Labels = jig.Labels - webserverPod0.Spec.TerminationGracePeriodSeconds = utilpointer.Int64(100) + webserverPod0.Spec.TerminationGracePeriodSeconds = ptr.To[int64](100) e2epod.SetNodeSelection(&webserverPod0.Spec, e2epod.NodeSelection{Name: node0.Name}) _, err = cs.CoreV1().Pods(ns).Create(ctx, webserverPod0, metav1.CreateOptions{}) @@ -2966,7 +2966,7 @@ var _ = common.SIGDescribe("Services", func() { ginkgo.By("Creating 1 webserver pod to be part of the TCP service") webserverPod0 := e2epod.NewAgnhostPod(ns, "echo-hostname-0", nil, nil, nil, "netexec", "--http-port", strconv.Itoa(servicePort), "--delay-shutdown", "100") webserverPod0.Labels = jig.Labels - webserverPod0.Spec.TerminationGracePeriodSeconds = utilpointer.Int64(100) + webserverPod0.Spec.TerminationGracePeriodSeconds = ptr.To[int64](100) e2epod.SetNodeSelection(&webserverPod0.Spec, e2epod.NodeSelection{Name: node0.Name}) _, err = cs.CoreV1().Pods(ns).Create(ctx, webserverPod0, metav1.CreateOptions{}) @@ -3042,7 +3042,7 @@ var _ = common.SIGDescribe("Services", func() { ginkgo.By("Creating 1 webserver pod to be part of the TCP service") webserverPod0 := e2epod.NewAgnhostPod(ns, "echo-hostname-0", nil, nil, nil, "netexec", "--http-port", strconv.Itoa(servicePort), "--delay-shutdown", "100") webserverPod0.Labels = jig.Labels - webserverPod0.Spec.TerminationGracePeriodSeconds = utilpointer.Int64(100) + webserverPod0.Spec.TerminationGracePeriodSeconds = ptr.To[int64](100) e2epod.SetNodeSelection(&webserverPod0.Spec, e2epod.NodeSelection{Name: node0.Name}) _, err = cs.CoreV1().Pods(ns).Create(ctx, webserverPod0, metav1.CreateOptions{}) @@ -3347,7 +3347,7 @@ var _ = common.SIGDescribe("Services", func() { Port: int32(80), TargetPort: intstr.FromInt32(80), }}, - LoadBalancerClass: utilpointer.String("example.com/internal-vip"), + LoadBalancerClass: ptr.To("example.com/internal-vip"), }, } _, err = cs.CoreV1().Services(ns).Create(ctx, &testService, metav1.CreateOptions{})