From 89a5fa58a473a7f5c479462e69882920823413b6 Mon Sep 17 00:00:00 2001 From: Eric Greer Date: Thu, 21 Feb 2019 18:12:42 -0800 Subject: [PATCH] removig unecessary package after squashing and patching to current master --- pkg/model/components/etcdmanager/model.go | 1 - protokube/pkg/protokube/etcd_manifest.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index 2f7f49511f..a9a8c480bb 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -26,7 +26,6 @@ import ( "github.com/golang/glog" v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/yaml" scheme "k8s.io/client-go/kubernetes/scheme" diff --git a/protokube/pkg/protokube/etcd_manifest.go b/protokube/pkg/protokube/etcd_manifest.go index ab4c9acbc3..7aeb9db026 100644 --- a/protokube/pkg/protokube/etcd_manifest.go +++ b/protokube/pkg/protokube/etcd_manifest.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "k8s.io/apimachinery/pkg/api/resource" v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/kops/pkg/kubemanifest" "k8s.io/kops/util/pkg/exec"