From 17cd30adec00c8ffb49af5d3b7d8c584f9de6b3e Mon Sep 17 00:00:00 2001 From: LaurenceLiZhixin <382673304@qq.com> Date: Sun, 14 Mar 2021 15:33:32 +0800 Subject: [PATCH] fix crd name --- integrate_test.sh | 2 +- registry/kubernetes/registry.go | 2 +- registry/kubernetes/registry_test.go | 2 +- remoting/kubernetes/client.go | 2 +- remoting/kubernetes/client_test.go | 2 +- remoting/kubernetes/registry_controller.go | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integrate_test.sh b/integrate_test.sh index 95fcd0947..e1bbc8c11 100644 --- a/integrate_test.sh +++ b/integrate_test.sh @@ -35,7 +35,7 @@ echo "travis pull request repo param -> $1" # #start etcd registry insecure listen in [:]:2379 -# docker run -d --network host k8sCRD.gcr.io/etcd:3.3.10 etcd +# docker run -d --network host k8s.gcr.io/etcd:3.3.10 etcd # echo "etcdv3 listen in [:]2379" # #start consul registry insecure listen in [:]:8500 diff --git a/registry/kubernetes/registry.go b/registry/kubernetes/registry.go index 4df0c4ae1..c4a0352cf 100644 --- a/registry/kubernetes/registry.go +++ b/registry/kubernetes/registry.go @@ -27,7 +27,7 @@ import ( import ( "github.com/apache/dubbo-getty" perrors "github.com/pkg/errors" - v1 "k8sCRD.io/api/core/v1" + v1 "k8s.io/api/core/v1" ) import ( diff --git a/registry/kubernetes/registry_test.go b/registry/kubernetes/registry_test.go index 132fadcf3..a816b035c 100644 --- a/registry/kubernetes/registry_test.go +++ b/registry/kubernetes/registry_test.go @@ -28,7 +28,7 @@ import ( import ( "github.com/stretchr/testify/assert" - v1 "k8sCRD.io/api/core/v1" + v1 "k8s.io/api/core/v1" ) import ( diff --git a/remoting/kubernetes/client.go b/remoting/kubernetes/client.go index 7bfdec68e..ce6bcccea 100644 --- a/remoting/kubernetes/client.go +++ b/remoting/kubernetes/client.go @@ -25,9 +25,9 @@ import ( import ( perrors "github.com/pkg/errors" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" - v1 "k8sCRD.io/api/core/v1" ) import ( diff --git a/remoting/kubernetes/client_test.go b/remoting/kubernetes/client_test.go index d7effd15b..9cc421225 100644 --- a/remoting/kubernetes/client_test.go +++ b/remoting/kubernetes/client_test.go @@ -28,7 +28,7 @@ import ( ) import ( - v1 "k8sCRD.io/api/core/v1" + v1 "k8s.io/api/core/v1" ) // tests dataset diff --git a/remoting/kubernetes/registry_controller.go b/remoting/kubernetes/registry_controller.go index 3a0ee96a8..f66163d3c 100644 --- a/remoting/kubernetes/registry_controller.go +++ b/remoting/kubernetes/registry_controller.go @@ -31,19 +31,19 @@ import ( import ( perrors "github.com/pkg/errors" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/informers" + informerscorev1 "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - v1 "k8sCRD.io/api/core/v1" - metav1 "k8sCRD.io/apimachinery/pkg/apis/meta/v1" - informerscorev1 "k8sCRD.io/client-go/informers/core/v1" ) import ( -- GitLab