From f82cc79112e48b4bea50294de111bac53ecc7d07 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 19 Mar 2021 12:13:14 -0700 Subject: [PATCH] update imports for this release branch Signed-off-by: Brian Downs --- pkg/cluster/cluster.go | 2 +- pkg/cluster/storage.go | 2 +- pkg/daemons/control/deps/deps.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index af2ef8369d..74efba12f6 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -5,12 +5,12 @@ import ( "net/url" "strings" - "github.com/k3s-io/kine/pkg/endpoint" "github.com/pkg/errors" "github.com/rancher/k3s/pkg/clientaccess" "github.com/rancher/k3s/pkg/cluster/managed" "github.com/rancher/k3s/pkg/daemons/config" "github.com/rancher/k3s/pkg/etcd" + "github.com/rancher/kine/pkg/endpoint" "github.com/sirupsen/logrus" ) diff --git a/pkg/cluster/storage.go b/pkg/cluster/storage.go index e6c74b90cb..ae2364bf45 100644 --- a/pkg/cluster/storage.go +++ b/pkg/cluster/storage.go @@ -4,8 +4,8 @@ import ( "bytes" "context" - "github.com/k3s-io/kine/pkg/client" "github.com/rancher/k3s/pkg/bootstrap" + "github.com/rancher/kine/pkg/client" "github.com/sirupsen/logrus" ) diff --git a/pkg/daemons/control/deps/deps.go b/pkg/daemons/control/deps/deps.go index 15ad7c90f7..a6b6ef6e53 100644 --- a/pkg/daemons/control/deps/deps.go +++ b/pkg/daemons/control/deps/deps.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" apiserverconfigv1 "k8s.io/apiserver/pkg/apis/config/v1" - "k8s.io/kubernetes/pkg/controlplane" + "k8s.io/kubernetes/pkg/master" ) const ( @@ -313,7 +313,7 @@ func genServerCerts(config *config.Control, runtime *config.ControlRuntime) erro return err } - _, apiServerServiceIP, err := controlplane.ServiceIPRange(*config.ServiceIPRange) + _, apiServerServiceIP, err := master.ServiceIPRange(*config.ServiceIPRange) if err != nil { return err }