From 5f63cdcf890c818059d5732f57ff2c782db05ae0 Mon Sep 17 00:00:00 2001 From: Andrew Pilloud Date: Wed, 22 Feb 2017 18:32:42 -0800 Subject: [PATCH] Use canonical import path for apimachinery Signed-off-by: Andrew Pilloud --- server/container_list.go | 2 +- server/sandbox_list.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/container_list.go b/server/container_list.go index 7669c4bf..fee3219d 100644 --- a/server/container_list.go +++ b/server/container_list.go @@ -4,8 +4,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/kubernetes-incubator/cri-o/oci" "golang.org/x/net/context" + "k8s.io/apimachinery/pkg/fields" pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" - "k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/fields" ) // filterContainer returns whether passed container matches filtering criteria diff --git a/server/sandbox_list.go b/server/sandbox_list.go index 7ec0141f..51ec1d25 100644 --- a/server/sandbox_list.go +++ b/server/sandbox_list.go @@ -4,8 +4,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/kubernetes-incubator/cri-o/oci" "golang.org/x/net/context" + "k8s.io/apimachinery/pkg/fields" pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" - "k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/fields" ) // filterSandbox returns whether passed container matches filtering criteria