From f3fd3cff8e59b05ee891cb1af7660f83b6f25347 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 20 Jun 2019 11:40:12 -0700 Subject: [PATCH] add import-alias for k8s.io/api/coordination/v1beta1 --- hack/.import-aliases | 3 ++- test/e2e/common/node_lease.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index 52cfe89f319..9b5cfbc11f4 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -13,5 +13,6 @@ "k8s.io/api/batch/v1": "batchv1", "k8s.io/api/batch/v1beta1": "batchv1beta1", "k8s.io/api/certificates/v1beta1": "certificatesv1beta1", - "k8s.io/api/coordination/v1": "coordinationv1" + "k8s.io/api/coordination/v1": "coordinationv1", + "k8s.io/api/coordination/v1beta1": "coordinationv1beta1" } \ No newline at end of file diff --git a/test/e2e/common/node_lease.go b/test/e2e/common/node_lease.go index b05a9b5e499..831876ce6c6 100644 --- a/test/e2e/common/node_lease.go +++ b/test/e2e/common/node_lease.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - coordv1beta1 "k8s.io/api/coordination/v1beta1" + coordinationv1beta1 "k8s.io/api/coordination/v1beta1" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -51,7 +51,7 @@ var _ = framework.KubeDescribe("NodeLease", func() { leaseClient := f.ClientSet.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease) var ( err error - lease *coordv1beta1.Lease + lease *coordinationv1beta1.Lease ) ginkgo.By("check that lease for this Kubelet exists in the kube-node-lease namespace") gomega.Eventually(func() error { @@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("NodeLease", func() { ginkgo.By("wait until there is node lease") var err error - var lease *coordv1beta1.Lease + var lease *coordinationv1beta1.Lease gomega.Eventually(func() error { lease, err = f.ClientSet.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease).Get(nodeName, metav1.GetOptions{}) if err != nil { @@ -170,7 +170,7 @@ func getHeartbeatTimeAndStatus(clientSet clientset.Interface, nodeName string) ( return heartbeatTime, node.Status } -func expectLease(lease *coordv1beta1.Lease, nodeName string) error { +func expectLease(lease *coordinationv1beta1.Lease, nodeName string) error { // expect values for HolderIdentity, LeaseDurationSeconds, and RenewTime if lease.Spec.HolderIdentity == nil { return fmt.Errorf("Spec.HolderIdentity should not be nil")