From c405e6ea1b63f3246016cb28cd99c0668a482de9 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Sat, 11 Jul 2020 09:24:19 -0700 Subject: [PATCH] Remove references to rancher/types --- cloudprovider/aws/aws.go | 2 +- cloudprovider/azure/azure.go | 2 +- cloudprovider/cloudprovider.go | 2 +- cloudprovider/custom/custom.go | 2 +- cloudprovider/openstack/openstack.go | 2 +- cloudprovider/vsphere/vsphere.go | 2 +- cluster/addons.go | 4 ++-- cluster/cluster.go | 2 +- cluster/defaults.go | 2 +- cluster/encryption.go | 2 +- cluster/file-deployer.go | 2 +- cluster/hosts.go | 2 +- cluster/local.go | 2 +- cluster/network.go | 2 +- cluster/plan.go | 2 +- cluster/reconcile.go | 2 +- cluster/remove.go | 2 +- cluster/state.go | 2 +- cmd/cert.go | 2 +- cmd/common.go | 2 +- cmd/config.go | 2 +- cmd/encryption.go | 2 +- cmd/etcd.go | 2 +- cmd/remove.go | 2 +- cmd/up.go | 2 +- docker/docker.go | 2 +- docker/docker_test.go | 2 +- hosts/dialer.go | 5 +++-- hosts/hosts.go | 2 +- main.go | 1 + metadata/metadata.go | 4 ++-- pki/deploy.go | 2 +- pki/pki.go | 2 +- pki/pki_test.go | 2 +- pki/services.go | 2 +- pki/services_test.go | 7 ++++--- pki/util.go | 2 +- services/controlplane.go | 2 +- services/etcd.go | 2 +- services/kubeapi.go | 2 +- services/kubecontroller.go | 2 +- services/kubelet.go | 2 +- services/kubeproxy.go | 2 +- services/node_util.go | 4 ++-- services/proxy.go | 2 +- services/scheduler.go | 2 +- services/services.go | 2 +- services/workerplane.go | 2 +- templates/templates.go | 2 +- 49 files changed, 57 insertions(+), 54 deletions(-) diff --git a/cloudprovider/aws/aws.go b/cloudprovider/aws/aws.go index 78510857..3fda9c6e 100644 --- a/cloudprovider/aws/aws.go +++ b/cloudprovider/aws/aws.go @@ -6,7 +6,7 @@ import ( "github.com/go-ini/ini" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) const ( diff --git a/cloudprovider/azure/azure.go b/cloudprovider/azure/azure.go index 314b2618..8bfb3b7f 100644 --- a/cloudprovider/azure/azure.go +++ b/cloudprovider/azure/azure.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) const ( diff --git a/cloudprovider/cloudprovider.go b/cloudprovider/cloudprovider.go index c0731123..b0011057 100644 --- a/cloudprovider/cloudprovider.go +++ b/cloudprovider/cloudprovider.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/rke/cloudprovider/custom" "github.com/rancher/rke/cloudprovider/openstack" "github.com/rancher/rke/cloudprovider/vsphere" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) type CloudProvider interface { diff --git a/cloudprovider/custom/custom.go b/cloudprovider/custom/custom.go index 5999b84a..d5fd8995 100644 --- a/cloudprovider/custom/custom.go +++ b/cloudprovider/custom/custom.go @@ -1,6 +1,6 @@ package custom -import "github.com/rancher/types/apis/management.cattle.io/v3" +import v3 "github.com/rancher/rke/types" type CloudProvider struct { Name string diff --git a/cloudprovider/openstack/openstack.go b/cloudprovider/openstack/openstack.go index 29ab5579..50b45073 100644 --- a/cloudprovider/openstack/openstack.go +++ b/cloudprovider/openstack/openstack.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/go-ini/ini" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) const ( diff --git a/cloudprovider/vsphere/vsphere.go b/cloudprovider/vsphere/vsphere.go index afc37d1a..32469bcf 100644 --- a/cloudprovider/vsphere/vsphere.go +++ b/cloudprovider/vsphere/vsphere.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/rancher/rke/templates" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) const ( diff --git a/cluster/addons.go b/cluster/addons.go index a3806bdd..932df4a9 100644 --- a/cluster/addons.go +++ b/cluster/addons.go @@ -18,9 +18,9 @@ import ( "github.com/rancher/rke/log" "github.com/rancher/rke/services" "github.com/rancher/rke/templates" + v3 "github.com/rancher/rke/types" + "github.com/rancher/rke/types/kdm" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" - "github.com/rancher/types/kdm" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" appsv1 "k8s.io/api/apps/v1" diff --git a/cluster/cluster.go b/cluster/cluster.go index f6c7d4aa..ae6232dd 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -22,8 +22,8 @@ import ( "github.com/rancher/rke/pki" "github.com/rancher/rke/pki/cert" "github.com/rancher/rke/services" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "gopkg.in/yaml.v2" diff --git a/cluster/defaults.go b/cluster/defaults.go index 4b394600..b9c65e9e 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -15,8 +15,8 @@ import ( "github.com/rancher/rke/metadata" "github.com/rancher/rke/services" "github.com/rancher/rke/templates" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cluster/encryption.go b/cluster/encryption.go index 305dafb7..cdc06e75 100644 --- a/cluster/encryption.go +++ b/cluster/encryption.go @@ -17,8 +17,8 @@ import ( "github.com/rancher/rke/log" "github.com/rancher/rke/services" "github.com/rancher/rke/templates" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/cluster/file-deployer.go b/cluster/file-deployer.go index 9cc6356d..2d5aa9b6 100644 --- a/cluster/file-deployer.go +++ b/cluster/file-deployer.go @@ -9,7 +9,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" ) diff --git a/cluster/hosts.go b/cluster/hosts.go index 6a59c716..a111492e 100644 --- a/cluster/hosts.go +++ b/cluster/hosts.go @@ -10,8 +10,8 @@ import ( "github.com/rancher/rke/log" "github.com/rancher/rke/pki" "github.com/rancher/rke/services" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1" diff --git a/cluster/local.go b/cluster/local.go index 88f83278..c6eaf742 100644 --- a/cluster/local.go +++ b/cluster/local.go @@ -3,7 +3,7 @@ package cluster import ( "github.com/rancher/rke/metadata" "github.com/rancher/rke/services" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) func GetLocalRKEConfig() *v3.RancherKubernetesEngineConfig { diff --git a/cluster/network.go b/cluster/network.go index 17e542cc..b9b6e8ce 100644 --- a/cluster/network.go +++ b/cluster/network.go @@ -14,8 +14,8 @@ import ( "github.com/rancher/rke/log" "github.com/rancher/rke/pki" "github.com/rancher/rke/templates" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" appsv1 "k8s.io/api/apps/v1" diff --git a/cluster/plan.go b/cluster/plan.go index 0b4a5138..a5ce3979 100644 --- a/cluster/plan.go +++ b/cluster/plan.go @@ -18,8 +18,8 @@ import ( "github.com/rancher/rke/metadata" "github.com/rancher/rke/pki" "github.com/rancher/rke/services" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" ) diff --git a/cluster/reconcile.go b/cluster/reconcile.go index 597f97be..b08b1526 100644 --- a/cluster/reconcile.go +++ b/cluster/reconcile.go @@ -12,7 +12,7 @@ import ( "github.com/rancher/rke/pki" "github.com/rancher/rke/pki/cert" "github.com/rancher/rke/services" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "k8s.io/client-go/kubernetes" ) diff --git a/cluster/remove.go b/cluster/remove.go index 6189ed75..ef2e777c 100644 --- a/cluster/remove.go +++ b/cluster/remove.go @@ -8,8 +8,8 @@ import ( "github.com/rancher/rke/log" "github.com/rancher/rke/pki" "github.com/rancher/rke/services" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "golang.org/x/sync/errgroup" ) diff --git a/cluster/state.go b/cluster/state.go index 45dc9f94..e0c62f1b 100644 --- a/cluster/state.go +++ b/cluster/state.go @@ -17,7 +17,7 @@ import ( "github.com/rancher/rke/k8s" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" v1 "k8s.io/api/core/v1" diff --git a/cmd/cert.go b/cmd/cert.go index b583dcce..6de3abf5 100644 --- a/cmd/cert.go +++ b/cmd/cert.go @@ -12,7 +12,7 @@ import ( "github.com/rancher/rke/pki" "github.com/rancher/rke/pki/cert" "github.com/rancher/rke/services" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/common.go b/cmd/common.go index dc7ca8bf..b2b28542 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/config.go b/cmd/config.go index ab93b385..7a64532c 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -15,7 +15,7 @@ import ( "github.com/rancher/rke/cluster" "github.com/rancher/rke/pki" "github.com/rancher/rke/services" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "github.com/urfave/cli" "gopkg.in/yaml.v2" diff --git a/cmd/encryption.go b/cmd/encryption.go index e07d4d0a..62d60172 100644 --- a/cmd/encryption.go +++ b/cmd/encryption.go @@ -8,7 +8,7 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/etcd.go b/cmd/etcd.go index c20af2ac..e5267490 100644 --- a/cmd/etcd.go +++ b/cmd/etcd.go @@ -12,7 +12,7 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/remove.go b/cmd/remove.go index 077ca8d4..41697ba7 100644 --- a/cmd/remove.go +++ b/cmd/remove.go @@ -12,7 +12,7 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/up.go b/cmd/up.go index a388b87f..2f4983ca 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -14,7 +14,7 @@ import ( "github.com/rancher/rke/log" "github.com/rancher/rke/pki" "github.com/rancher/rke/pki/cert" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/urfave/cli" ) diff --git a/docker/docker.go b/docker/docker.go index d07f2c3d..ec877b4d 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -21,7 +21,7 @@ import ( "github.com/docker/docker/pkg/stdcopy" "github.com/rancher/rke/log" "github.com/rancher/rke/metadata" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/docker/docker_test.go b/docker/docker_test.go index 66b9fa35..038b4210 100644 --- a/docker/docker_test.go +++ b/docker/docker_test.go @@ -3,7 +3,7 @@ package docker import ( "testing" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/stretchr/testify/assert" ) diff --git a/hosts/dialer.go b/hosts/dialer.go index 289fc2df..114628b8 100644 --- a/hosts/dialer.go +++ b/hosts/dialer.go @@ -2,13 +2,14 @@ package hosts import ( "fmt" - "k8s.io/client-go/transport" "net" "net/http" "strings" "time" - "github.com/rancher/types/apis/management.cattle.io/v3" + "k8s.io/client-go/transport" + + v3 "github.com/rancher/rke/types" "golang.org/x/crypto/ssh" ) diff --git a/hosts/hosts.go b/hosts/hosts.go index 7f259518..b753220b 100644 --- a/hosts/hosts.go +++ b/hosts/hosts.go @@ -14,7 +14,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/k8s" "github.com/rancher/rke/log" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" ) diff --git a/main.go b/main.go index 71b6f3f1..d8aeabd8 100644 --- a/main.go +++ b/main.go @@ -1,3 +1,4 @@ +//go:generate go run ./vendor/k8s.io/gengo/examples/deepcopy-gen --go-header-file ./scripts/boilerplate.go.txt --input-dirs ./types --input-dirs ./types/kdm --output-file-base zz_generated_deepcopy //go:generate go run ./codegen/codegen.go //go:generate go run ./vendor/github.com/go-bindata/go-bindata/go-bindata -o ./data/bindata.go -ignore bindata.go -pkg data -modtime 1557785965 -mode 0644 ./data/ package main diff --git a/metadata/metadata.go b/metadata/metadata.go index 8924398f..51bbeeb0 100644 --- a/metadata/metadata.go +++ b/metadata/metadata.go @@ -15,8 +15,8 @@ import ( mVersion "github.com/mcuadros/go-version" "github.com/rancher/rke/data" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" - "github.com/rancher/types/kdm" + v3 "github.com/rancher/rke/types" + "github.com/rancher/rke/types/kdm" ) const ( diff --git a/pki/deploy.go b/pki/deploy.go index d1515fc4..fd9ed084 100644 --- a/pki/deploy.go +++ b/pki/deploy.go @@ -15,7 +15,7 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" "github.com/rancher/rke/pki/cert" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" ) diff --git a/pki/pki.go b/pki/pki.go index 98a76cae..ff9eb9bb 100644 --- a/pki/pki.go +++ b/pki/pki.go @@ -14,7 +14,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) type CertificatePKI struct { diff --git a/pki/pki_test.go b/pki/pki_test.go index 51c22fac..d8637cc9 100644 --- a/pki/pki_test.go +++ b/pki/pki_test.go @@ -7,7 +7,7 @@ import ( "net" "testing" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) const ( diff --git a/pki/services.go b/pki/services.go index c2e21e82..d0e8f1b7 100644 --- a/pki/services.go +++ b/pki/services.go @@ -11,7 +11,7 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" "github.com/rancher/rke/pki/cert" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" ) diff --git a/pki/services_test.go b/pki/services_test.go index f1fd18e8..180b9302 100644 --- a/pki/services_test.go +++ b/pki/services_test.go @@ -2,11 +2,12 @@ package pki import ( "context" - "github.com/rancher/rke/hosts" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" - "github.com/stretchr/testify/assert" "reflect" "testing" + + "github.com/rancher/rke/hosts" + v3 "github.com/rancher/rke/types" + "github.com/stretchr/testify/assert" ) func TestDeleteUnusedCerts(t *testing.T) { diff --git a/pki/util.go b/pki/util.go index 955f88d5..3055fcf7 100644 --- a/pki/util.go +++ b/pki/util.go @@ -21,7 +21,7 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/pki/cert" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" ) diff --git a/services/controlplane.go b/services/controlplane.go index 884bb43c..4f61ea61 100644 --- a/services/controlplane.go +++ b/services/controlplane.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/rke/k8s" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "k8s.io/client-go/kubernetes" diff --git a/services/etcd.go b/services/etcd.go index e6492691..44d4db45 100644 --- a/services/etcd.go +++ b/services/etcd.go @@ -16,8 +16,8 @@ import ( "github.com/rancher/rke/log" "github.com/rancher/rke/pki" "github.com/rancher/rke/pki/cert" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" ) diff --git a/services/kubeapi.go b/services/kubeapi.go index cfc359b4..2cdbb7c5 100644 --- a/services/kubeapi.go +++ b/services/kubeapi.go @@ -7,7 +7,7 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" ) diff --git a/services/kubecontroller.go b/services/kubecontroller.go index ded04ffd..fbed02e7 100644 --- a/services/kubecontroller.go +++ b/services/kubecontroller.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) func runKubeController(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, controllerProcess v3.Process, alpineImage string) error { diff --git a/services/kubelet.go b/services/kubelet.go index 736c4414..0c2d707a 100644 --- a/services/kubelet.go +++ b/services/kubelet.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" "github.com/rancher/rke/pki" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) func runKubelet(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeletProcess v3.Process, certMap map[string]pki.CertificatePKI, alpineImage string) error { diff --git a/services/kubeproxy.go b/services/kubeproxy.go index 58a78a9e..d0f11aa6 100644 --- a/services/kubeproxy.go +++ b/services/kubeproxy.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) func runKubeproxy(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeProxyProcess v3.Process, alpineImage string) error { diff --git a/services/node_util.go b/services/node_util.go index 872f49bf..e6b73ddc 100644 --- a/services/node_util.go +++ b/services/node_util.go @@ -9,9 +9,9 @@ import ( "github.com/rancher/rke/hosts" "github.com/rancher/rke/k8s" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" "github.com/sirupsen/logrus" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" k8sutil "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes" "k8s.io/kubectl/pkg/drain" diff --git a/services/proxy.go b/services/proxy.go index 75d735f1..7c5cec21 100644 --- a/services/proxy.go +++ b/services/proxy.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) const ( diff --git a/services/scheduler.go b/services/scheduler.go index 7b6186fb..b48b9cb0 100644 --- a/services/scheduler.go +++ b/services/scheduler.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/rke/types" ) func runScheduler(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, schedulerProcess v3.Process, alpineImage string) error { diff --git a/services/services.go b/services/services.go index 2451dafa..2ea517bf 100644 --- a/services/services.go +++ b/services/services.go @@ -9,8 +9,8 @@ import ( "github.com/rancher/rke/docker" "github.com/rancher/rke/hosts" "github.com/rancher/rke/log" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" ) diff --git a/services/workerplane.go b/services/workerplane.go index 9001667d..8fb6db10 100644 --- a/services/workerplane.go +++ b/services/workerplane.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/rke/k8s" "github.com/rancher/rke/log" "github.com/rancher/rke/pki" + v3 "github.com/rancher/rke/types" "github.com/rancher/rke/util" - v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/templates/templates.go b/templates/templates.go index 57176599..c765aa36 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -12,7 +12,7 @@ import ( "github.com/ghodss/yaml" "github.com/rancher/norman/types/convert" "github.com/rancher/rke/metadata" - "github.com/rancher/types/kdm" + "github.com/rancher/rke/types/kdm" "github.com/sirupsen/logrus" )