Merge pull request kubeedge#5760 from wbc6080/change-api-refer

Migrate the kubeedge api to staging and modify the method to refer api

cloud/cmd/cloudcore/app/options/options.go

@@ -23,8 +23,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	cliflag "k8s.io/component-base/cli/flag"
 
+	config "github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/kubeedge/common/constants"
-	config "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/kubeedge/pkg/util/validation"
 )
 

cloud/cmd/cloudcore/app/server.go

@@ -34,6 +34,8 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/yaml"
 
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1/validation"
 	"github.com/kubeedge/beehive/pkg/core"
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/cloud/cmd/cloudcore/app/options"
@@ -53,8 +55,6 @@ import (
 	"github.com/kubeedge/kubeedge/cloud/pkg/synccontroller"
 	"github.com/kubeedge/kubeedge/cloud/pkg/taskmanager"
 	"github.com/kubeedge/kubeedge/common/constants"
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1/validation"
 	"github.com/kubeedge/kubeedge/pkg/features"
 	"github.com/kubeedge/kubeedge/pkg/util"
 	"github.com/kubeedge/kubeedge/pkg/util/flag"

cloud/cmd/iptablesmanager/app/server.go

@@ -29,10 +29,10 @@ import (
 	"k8s.io/component-base/term"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/kubeedge/cloud/cmd/iptablesmanager/app/options"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudstream/iptables"
 	"github.com/kubeedge/kubeedge/common/constants"
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/kubeedge/pkg/util/flag"
 	"github.com/kubeedge/kubeedge/pkg/version/verflag"
 )

cloud/pkg/admissioncontroller/admission.go

@@ -20,10 +20,10 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/api/apis/devices/v1beta1"
+	v1 "github.com/kubeedge/api/apis/rules/v1"
+	"github.com/kubeedge/api/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/cloud/cmd/admission/app/options"
-	"github.com/kubeedge/kubeedge/pkg/apis/devices/v1beta1"
-	v1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
-	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 )
 
 const (
@@ -191,8 +191,8 @@ func (ac *AdmissionController) registerWebhooks(opt *options.AdmissionOptions, c
 				SideEffects:             &noneSideEffect,
 				AdmissionReviewVersions: []string{"v1"},
 			},
-			// Device Model Validating Webhook
-			{
+			{ // Device Model Validating Webhook
+
 				Name: ValidateDeviceModelWebhookName,
 				Rules: []admissionregistrationv1.RuleWithOperations{{
 					Operations: []admissionregistrationv1.OperationType{

cloud/pkg/admissioncontroller/admit_device.go

@@ -8,7 +8,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
-	devicesv1beta1 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1beta1"
+	devicesv1beta1 "github.com/kubeedge/api/apis/devices/v1beta1"
 )
 
 func admitDevice(review admissionv1.AdmissionReview) *admissionv1.AdmissionResponse {

cloud/pkg/admissioncontroller/admit_devicemodel.go

@@ -8,7 +8,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
-	devicesv1beta1 "github.com/kubeedge/kubeedge/pkg/apis/devices/v1beta1"
+	devicesv1beta1 "github.com/kubeedge/api/apis/devices/v1beta1"
 )
 
 func admitDeviceModel(review admissionv1.AdmissionReview) *admissionv1.AdmissionResponse {

cloud/pkg/admissioncontroller/admit_nodeupgradejob.go

@@ -29,7 +29,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
-	"github.com/kubeedge/kubeedge/pkg/apis/operations/v1alpha1"
+	"github.com/kubeedge/api/apis/operations/v1alpha1"
 )
 
 func serveNodeUpgradeJob(w http.ResponseWriter, r *http.Request) {

cloud/pkg/admissioncontroller/admit_rule.go

@@ -7,7 +7,7 @@ import (
 	admissionv1 "k8s.io/api/admission/v1"
 	"k8s.io/klog/v2"
 
-	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/api/apis/rules/v1"
 )
 
 var (

cloud/pkg/admissioncontroller/admit_ruleendpoint.go

@@ -8,7 +8,7 @@ import (
 	admissionv1 "k8s.io/api/admission/v1"
 	"k8s.io/klog/v2"
 
-	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/api/apis/rules/v1"
 )
 
 func admitRuleEndpoint(review admissionv1.AdmissionReview) *admissionv1.AdmissionResponse {

cloud/pkg/admissioncontroller/admit_ruleendpoint_test.go

@@ -8,7 +8,7 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	rulesv1 "github.com/kubeedge/kubeedge/pkg/apis/rules/v1"
+	rulesv1 "github.com/kubeedge/api/apis/rules/v1"
 )
 
 func Test_admitRuleEndpoint(t *testing.T) {

cloud/pkg/cloudhub/cloudhub.go

@@ -9,6 +9,7 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
 
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/beehive/pkg/core"
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/authorization"
@@ -22,7 +23,6 @@ import (
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/informers"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 )
 
 var DoneTLSTunnelCerts = make(chan bool, 1)

cloud/pkg/cloudhub/common/testing/test_framework.go

@@ -33,12 +33,12 @@ import (
 	core "k8s.io/client-go/testing"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/api/apis/reliablesyncs/v1alpha1"
+	"github.com/kubeedge/api/client/clientset/versioned/fake"
 	beehivemodel "github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/messagelayer"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
-	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
-	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/fake"
 )
 
 var (

cloud/pkg/cloudhub/config/config.go

@@ -5,7 +5,7 @@ import (
 
 	"k8s.io/klog/v2"
 
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/kubeedge/pkg/security/certs"
 )
 

cloud/pkg/cloudhub/dispatcher/message_dispatcher.go

@@ -26,6 +26,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/api/apis/reliablesyncs/v1alpha1"
+	reliableclient "github.com/kubeedge/api/client/clientset/versioned"
+	synclisters "github.com/kubeedge/api/client/listers/reliablesyncs/v1alpha1"
 	beehivecontext "github.com/kubeedge/beehive/pkg/core/context"
 	beehivemodel "github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common"
@@ -38,9 +41,6 @@ import (
 	taskutil "github.com/kubeedge/kubeedge/cloud/pkg/taskmanager/util"
 	commonconst "github.com/kubeedge/kubeedge/common/constants"
 	v2 "github.com/kubeedge/kubeedge/edge/pkg/metamanager/dao/v2"
-	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
-	reliableclient "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
-	synclisters "github.com/kubeedge/kubeedge/pkg/client/listers/reliablesyncs/v1alpha1"
 	"github.com/kubeedge/kubeedge/pkg/metaserver"
 	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 )

cloud/pkg/cloudhub/dispatcher/message_dispatcher_test.go

@@ -25,14 +25,14 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/api/apis/reliablesyncs/v1alpha1"
+	"github.com/kubeedge/api/client/clientset/versioned/fake"
+	syncinformer "github.com/kubeedge/api/client/informers/externalversions"
+	synclisters "github.com/kubeedge/api/client/listers/reliablesyncs/v1alpha1"
 	beehivemodel "github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common"
 	tf "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/testing"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/session"
-	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
-	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/fake"
-	syncinformer "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions"
-	synclisters "github.com/kubeedge/kubeedge/pkg/client/listers/reliablesyncs/v1alpha1"
 	mockcon "github.com/kubeedge/viaduct/pkg/conn/testing"
 )
 

cloud/pkg/cloudhub/handler/message_handler.go

@@ -23,13 +23,13 @@ import (
 	"github.com/avast/retry-go"
 	"k8s.io/klog/v2"
 
+	reliableclient "github.com/kubeedge/api/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/authorization"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/dispatcher"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/session"
 	"github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/controller"
-	reliableclient "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 	"github.com/kubeedge/viaduct/pkg/conn"
 	"github.com/kubeedge/viaduct/pkg/mux"
 )

cloud/pkg/cloudhub/servers/httpserver/nodetask/upgrade.go

@@ -24,12 +24,12 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/klog/v2"
 
+	api "github.com/kubeedge/api/apis/fsm/v1alpha1"
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	beehiveModel "github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/taskmanager/util"
 	commontypes "github.com/kubeedge/kubeedge/common/types"
-	api "github.com/kubeedge/kubeedge/pkg/apis/fsm/v1alpha1"
 )
 
 const (

cloud/pkg/cloudhub/session/node_session.go

@@ -28,6 +28,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/api/apis/reliablesyncs/v1alpha1"
+	reliableclient "github.com/kubeedge/api/client/clientset/versioned"
 	beehivemodel "github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/model"
@@ -36,8 +38,6 @@ import (
 	edgeconst "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/constants"
 	"github.com/kubeedge/kubeedge/cloud/pkg/synccontroller"
 	v2 "github.com/kubeedge/kubeedge/edge/pkg/metamanager/dao/v2"
-	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
-	reliableclient "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
 	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 	"github.com/kubeedge/viaduct/pkg/conn"
 )

cloud/pkg/cloudhub/session/node_session_test.go

@@ -25,12 +25,12 @@ import (
 	"github.com/golang/mock/gomock"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/api/apis/reliablesyncs/v1alpha1"
+	reliableclient "github.com/kubeedge/api/client/clientset/versioned"
+	"github.com/kubeedge/api/client/clientset/versioned/fake"
 	beehivemodel "github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common"
 	tf "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/testing"
-	"github.com/kubeedge/kubeedge/pkg/apis/reliablesyncs/v1alpha1"
-	reliableclient "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
-	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/fake"
 	mockcon "github.com/kubeedge/viaduct/pkg/conn/testing"
 )
 

cloud/pkg/cloudhub/session/session_manager_test.go

@@ -21,9 +21,9 @@ import (
 
 	"github.com/golang/mock/gomock"
 
+	"github.com/kubeedge/api/client/clientset/versioned/fake"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common"
 	tf "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/common/testing"
-	"github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/fake"
 	mockcon "github.com/kubeedge/viaduct/pkg/conn/testing"
 )
 

cloud/pkg/cloudstream/cloudstream.go

@@ -17,11 +17,11 @@ limitations under the License.
 package cloudstream
 
 import (
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/beehive/pkg/core"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudhub"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudstream/config"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 )
 
 type cloudStream struct {

cloud/pkg/cloudstream/cloudstream_test.go

@@ -21,10 +21,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/beehive/pkg/core"
 	"github.com/kubeedge/kubeedge/cloud/pkg/cloudstream/config"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 )
 
 func TestNewCloudStream(t *testing.T) {

cloud/pkg/cloudstream/config/config.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/klog/v2"
 
-	"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
+	"github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 )
 
 var Config Configure

cloud/pkg/cloudstream/iptables/iptables.go

@@ -20,9 +20,9 @@ import (
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	utilexec "k8s.io/utils/exec"
 
+	cloudcoreConfig "github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/common/constants"
-	cloudcoreConfig "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 )
 
 type Manager struct {

cloud/pkg/common/client/client.go

@@ -29,8 +29,8 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
-	cloudcoreConfig "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
-	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	cloudcoreConfig "github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
+	crdClientset "github.com/kubeedge/api/client/clientset/versioned"
 )
 
 var (

cloud/pkg/common/client/impersonation.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
 
-	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
+	crdClientset "github.com/kubeedge/api/client/clientset/versioned"
 )
 
 func newForK8sConfigOrDie(c *rest.Config, enableImpersonation bool) *kubernetes.Clientset {

cloud/pkg/common/informers/fake_informer_manager.go

@@ -31,9 +31,9 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	crdClientset "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned"
-	kubeedgefake "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/fake"
-	crdinformers "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions"
+	crdClientset "github.com/kubeedge/api/client/clientset/versioned"
+	kubeedgefake "github.com/kubeedge/api/client/clientset/versioned/fake"
+	crdinformers "github.com/kubeedge/api/client/informers/externalversions"
 )
 
 type fakeManager struct {

cloud/pkg/common/informers/informer_manager.go

@@ -33,11 +33,11 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
+	edgescheme "github.com/kubeedge/api/client/clientset/versioned/scheme"
+	edgeinformers "github.com/kubeedge/api/client/informers/externalversions"
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/client"
 	"github.com/kubeedge/kubeedge/common/constants"
-	edgescheme "github.com/kubeedge/kubeedge/pkg/client/clientset/versioned/scheme"
-	edgeinformers "github.com/kubeedge/kubeedge/pkg/client/informers/externalversions"
 )
 
 var (

cloud/pkg/common/monitor/monitor.go

@@ -27,8 +27,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"k8s.io/klog/v2"
 
+	config "github.com/kubeedge/api/apis/componentconfig/cloudcore/v1alpha1"
 	beehivecontext "github.com/kubeedge/beehive/pkg/core/context"
-	config "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1"
 )
 
 const (

cloud/pkg/controllermanager/controllermanager.go

@@ -13,11 +13,11 @@ import (
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
+	appsv1alpha1 "github.com/kubeedge/api/apis/apps/v1alpha1"
 	"github.com/kubeedge/kubeedge/cloud/pkg/controllermanager/edgeapplication"
 	"github.com/kubeedge/kubeedge/cloud/pkg/controllermanager/edgeapplication/overridemanager"
 	"github.com/kubeedge/kubeedge/cloud/pkg/controllermanager/edgeapplication/statusmanager"
 	"github.com/kubeedge/kubeedge/cloud/pkg/controllermanager/nodegroup"
-	appsv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/apps/v1alpha1"
 )
 
 var appsScheme = runtime.NewScheme()