github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

add import-alias for k8s.io/api/coordination/v1beta1

Browse Source
This commit is contained in:
Aaron Crickenberger 2019-06-20 11:40:12 -07:00
parent ee6e6179da
commit f3fd3cff8e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.import-aliases
View File

@ -13,5 +13,6 @@
"k8s.io/api/batch/v1": "batchv1", "k8s.io/api/batch/v1": "batchv1",
"k8s.io/api/batch/v1beta1": "batchv1beta1", "k8s.io/api/batch/v1beta1": "batchv1beta1",
"k8s.io/api/certificates/v1beta1": "certificatesv1beta1", "k8s.io/api/certificates/v1beta1": "certificatesv1beta1",
"k8s.io/api/coordination/v1": "coordinationv1" "k8s.io/api/coordination/v1": "coordinationv1",
"k8s.io/api/coordination/v1beta1": "coordinationv1beta1"
} }

8
test/e2e/common/node_lease.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "time"
coordv1beta1 "k8s.io/api/coordination/v1beta1" coordinationv1beta1 "k8s.io/api/coordination/v1beta1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -51,7 +51,7 @@ var _ = framework.KubeDescribe("NodeLease", func() {
leaseClient := f.ClientSet.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease) leaseClient := f.ClientSet.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease)
var ( var (
err error err error
lease *coordv1beta1.Lease lease *coordinationv1beta1.Lease
) )
ginkgo.By("check that lease for this Kubelet exists in the kube-node-lease namespace") ginkgo.By("check that lease for this Kubelet exists in the kube-node-lease namespace")
gomega.Eventually(func() error { gomega.Eventually(func() error {
@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("NodeLease", func() {
ginkgo.By("wait until there is node lease") ginkgo.By("wait until there is node lease")
var err error var err error
var lease *coordv1beta1.Lease var lease *coordinationv1beta1.Lease
gomega.Eventually(func() error { gomega.Eventually(func() error {
lease, err = f.ClientSet.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease).Get(nodeName, metav1.GetOptions{}) lease, err = f.ClientSet.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease).Get(nodeName, metav1.GetOptions{})
if err != nil { if err != nil {
@ -170,7 +170,7 @@ func getHeartbeatTimeAndStatus(clientSet clientset.Interface, nodeName string) (
return heartbeatTime, node.Status 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 // expect values for HolderIdentity, LeaseDurationSeconds, and RenewTime
if lease.Spec.HolderIdentity == nil { if lease.Spec.HolderIdentity == nil {
return fmt.Errorf("Spec.HolderIdentity should not be nil") return fmt.Errorf("Spec.HolderIdentity should not be nil")