modification for controller-runtime 0.15.3

Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>

16 files changed, 48 insertions, 49 deletions

diff --git a/cloud/pkg/common/client/client.go b/cloud/pkg/common/client/client.go
index 4fc9e32bf..057ec1aa0 100644
--- a/cloud/pkg/common/client/client.go
+++ b/cloud/pkg/common/client/client.go
@@ -17,6 +17,7 @@ limitations under the License.
 package client
 
 import (
+	"fmt"
 	"os"
 	"sync"
 
@@ -100,5 +101,9 @@ type RestMapperFunc func() (meta.RESTMapper, error)
 var DefaultGetRestMapper RestMapperFunc = GetRestMapper
 
 func GetRestMapper() (meta.RESTMapper, error) {
-	return apiutil.NewDynamicRESTMapper(KubeConfig)
+	client, err := rest.HTTPClientFor(KubeConfig)
+	if err != nil {
+		return nil, fmt.Errorf("new http client for kubeConfig faled, err: %v", err)
+	}
+	return apiutil.NewDynamicRESTMapper(KubeConfig, client)
 }
diff --git a/cloud/pkg/controllermanager/edgeapplication/edgeapplicationcontroller.go b/cloud/pkg/controllermanager/edgeapplication/edgeapplicationcontroller.go
index ffad6f82e..fadb3ade2 100644
--- a/cloud/pkg/controllermanager/edgeapplication/edgeapplicationcontroller.go
+++ b/cloud/pkg/controllermanager/edgeapplication/edgeapplicationcontroller.go
@@ -90,7 +90,7 @@ func (c *Controller) SetupWithManager(mgr controllerruntime.Manager) error {
 	}
 	return controllerruntime.NewControllerManagedBy(mgr).
 		For(&appsv1alpha1.EdgeApplication{}).
-		Watches(&source.Channel{Source: c.ReconcileTriggerChan}, &handler.EnqueueRequestForObject{}).
+		WatchesRawSource(&source.Channel{Source: c.ReconcileTriggerChan}, &handler.EnqueueRequestForObject{}).
 		Complete(c)
 }
 
diff --git a/cloud/pkg/controllermanager/edgeapplication/statusmanager/statusmanager.go b/cloud/pkg/controllermanager/edgeapplication/statusmanager/statusmanager.go
index 9339eeab3..53973e8d1 100644
--- a/cloud/pkg/controllermanager/edgeapplication/statusmanager/statusmanager.go
+++ b/cloud/pkg/controllermanager/edgeapplication/statusmanager/statusmanager.go
@@ -183,10 +183,7 @@ func (s *statusManager) startToWatch(ctx context.Context, gvk schema.GroupVersio
 
 	watchObj := &unstructured.Unstructured{}
 	watchObj.SetGroupVersionKind(gvk)
-	if err := controller.Watch(&source.Kind{Type: watchObj}, &handler.EnqueueRequestForOwner{
-		OwnerType:    &appsv1alpha1.EdgeApplication{},
-		IsController: true,
-	}); err != nil {
+	if err := controller.Watch(source.Kind(s.mgr.GetCache(), watchObj), handler.EnqueueRequestForOwner(s.mgr.GetScheme(), s.mgr.GetRESTMapper(), &appsv1alpha1.EdgeApplication{}, handler.OnlyControllerOwner())); err != nil {
 		klog.Errorf("failed to add delete event watch to controller for gvk: %s, %v", gvk, err)
 		return err
 	}
diff --git a/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go b/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
index ac83d45cf..e119c0b8d 100644
--- a/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
+++ b/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
@@ -18,7 +18,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	appsv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/apps/v1alpha1"
 )
@@ -186,7 +185,7 @@ func (c *Controller) SetupWithManager(ctx context.Context, mgr controllerruntime
 	}
 	return controllerruntime.NewControllerManagedBy(mgr).
 		For(&appsv1alpha1.NodeGroup{}).
-		Watches(&source.Kind{Type: &corev1.Node{}}, handler.EnqueueRequestsFromMapFunc(c.nodeMapFunc)).
+		Watches(&corev1.Node{}, handler.EnqueueRequestsFromMapFunc(c.nodeMapFunc)).
 		Complete(c)
 }
 
@@ -270,7 +269,7 @@ func (c *Controller) getNodesSelectedBy(ctx context.Context, nodeGroup *appsv1al
 // We can assume that one node can only be in one of following conditions:
 // 1. This node is an orphan, do not and will not belong to any NodeGroup.
 // 2. This node is or will be a member of one NodeGroup.
-func (c *Controller) nodeMapFunc(obj client.Object) []controllerruntime.Request {
+func (c *Controller) nodeMapFunc(ctx context.Context, obj client.Object) []controllerruntime.Request {
 	node := obj.(*corev1.Node)
 	if nodeGroupName, ok := node.Labels[LabelBelongingTo]; ok {
 		return []controllerruntime.Request{
diff --git a/cloud/pkg/edgecontroller/manager/common_test.go b/cloud/pkg/edgecontroller/manager/common_test.go
index 48efe8cbc..60165f5b4 100644
--- a/cloud/pkg/edgecontroller/manager/common_test.go
+++ b/cloud/pkg/edgecontroller/manager/common_test.go
@@ -158,7 +158,7 @@ func TestCommonResourceEventHandler_OnAdd(t *testing.T) {
 			c := &CommonResourceEventHandler{
 				events: tt.fields.events,
 			}
-			c.OnAdd(tt.args.obj)
+			c.OnAdd(tt.args.obj, false)
 			obj := <-c.events
 			if !reflect.DeepEqual(watch.Added, obj.Type) || !reflect.DeepEqual(obj.Object, tt.args.obj) {
 				t.Errorf("TestCommonResourceEventHandler_OnAdd() failed. got: %v/%v, want %v/%v", obj.Type, obj.Object, watch.Added, tt.args.obj)
diff --git a/cloud/pkg/policycontroller/manager/reconcile.go b/cloud/pkg/policycontroller/manager/reconcile.go
index c0610a184..b1f5a6a1d 100644
--- a/cloud/pkg/policycontroller/manager/reconcile.go
+++ b/cloud/pkg/policycontroller/manager/reconcile.go
@@ -22,7 +22,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/cloud/pkg/common/messagelayer"
@@ -158,7 +157,7 @@ func matchTarget(ctx context.Context, cli client.Client, object client.Object, v
 	}
 }
 
-func (c *Controller) mapRolesFunc(object client.Object) []controllerruntime.Request {
+func (c *Controller) mapRolesFunc(ctx context.Context, object client.Object) []controllerruntime.Request {
 	var p = PolicyRequestVisitor{}
 	matchTarget(context.Background(), c.Client, object, p.matchRuntimeRequest)
 	klog.V(4).Infof("filter resource %s/%s, %v", object.GetNamespace(), object.GetName(), p.AuthPolicy)
@@ -177,7 +176,7 @@ func newSaAccessObject(sa corev1.ServiceAccount) *policyv1alpha1.ServiceAccountA
 	}
 }
 
-func (c *Controller) mapObjectFunc(object client.Object) []controllerruntime.Request {
+func (c *Controller) mapObjectFunc(ctx context.Context, object client.Object) []controllerruntime.Request {
 	accList := &policyv1alpha1.ServiceAccountAccessList{}
 	if err := c.Client.List(context.Background(), accList, &client.ListOptions{Namespace: object.GetNamespace()}); err != nil {
 		klog.Errorf("failed to list serviceaccountaccess, %v", err)
@@ -254,22 +253,22 @@ func (c *Controller) SetupWithManager(ctx context.Context, mgr controllerruntime
 	}
 	return controllerruntime.NewControllerManagedBy(mgr).
 		For(&policyv1alpha1.ServiceAccountAccess{}).
-		Watches(&source.Kind{Type: &rbacv1.ClusterRoleBinding{}}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
+		Watches(&rbacv1.ClusterRoleBinding{}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
 			return c.filterResource(ctx, object)
 		}))).
-		Watches(&source.Kind{Type: &rbacv1.RoleBinding{}}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
+		Watches(&rbacv1.RoleBinding{}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
 			return c.filterResource(ctx, object)
 		}))).
-		Watches(&source.Kind{Type: &rbacv1.ClusterRole{}}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
+		Watches(&rbacv1.ClusterRole{}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
 			return c.filterResource(ctx, object)
 		}))).
-		Watches(&source.Kind{Type: &rbacv1.Role{}}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
+		Watches(&rbacv1.Role{}, handler.EnqueueRequestsFromMapFunc(c.mapRolesFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
 			return c.filterResource(ctx, object)
 		}))).
-		Watches(&source.Kind{Type: &corev1.ServiceAccount{}}, handler.EnqueueRequestsFromMapFunc(c.mapObjectFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
+		Watches(&corev1.ServiceAccount{}, handler.EnqueueRequestsFromMapFunc(c.mapObjectFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
 			return c.filterObject(ctx, object)
 		}))).
-		Watches(&source.Kind{Type: &corev1.Pod{}}, handler.EnqueueRequestsFromMapFunc(c.mapObjectFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
+		Watches(&corev1.Pod{}, handler.EnqueueRequestsFromMapFunc(c.mapObjectFunc), builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
 			return c.filterObject(ctx, object)
 		}))).
 		Complete(c)
diff --git a/cloud/pkg/policycontroller/manager/reconcile_test.go b/cloud/pkg/policycontroller/manager/reconcile_test.go
index 8c742506c..032b1190d 100644
--- a/cloud/pkg/policycontroller/manager/reconcile_test.go
+++ b/cloud/pkg/policycontroller/manager/reconcile_test.go
@@ -999,7 +999,7 @@ func TestFilterResource(t *testing.T) {
 			if !reflect.DeepEqual(got, tc.rbacResult) {
 				t.Errorf("case %q want=%v, got=%v", tc.name, tc.rbacResult, got)
 			}
-			got2 := ctr.mapRolesFunc(tc.rbacObj)
+			got2 := ctr.mapRolesFunc(context.Background(), tc.rbacObj)
 			if !equality.Semantic.DeepEqual(got2, tc.reconcileResult) {
 				t.Errorf("case %q want=%v, got=%v", tc.name, tc.reconcileResult, got2)
 			}
@@ -1225,7 +1225,7 @@ func TestMapObjectFunc(t *testing.T) {
 		ctr := &Controller{
 			Client: fakeClient,
 		}
-		got := ctr.mapObjectFunc(tc.obj)
+		got := ctr.mapObjectFunc(context.Background(), tc.obj)
 		if !equality.Semantic.DeepEqual(got, tc.reconcileResult) {
 			t.Errorf("mapObjectFunc() = %v, want %v", got, tc.reconcileResult)
 		}
@@ -1521,7 +1521,7 @@ func TestSyncRules(t *testing.T) {
 		Status: nodeStatus2,
 	}
 	var saaDeletion = policyv1alpha1.ServiceAccountAccess{
-		ObjectMeta: metav1.ObjectMeta{Name: "sa1", Namespace: "my-namespace", DeletionTimestamp: &metav1.Time{Time: time.Now()}},
+		ObjectMeta: metav1.ObjectMeta{Name: "sa1", Namespace: "my-namespace", DeletionTimestamp: &metav1.Time{Time: time.Now()}, Finalizers: []string{"test"}},
 		Spec: policyv1alpha1.AccessSpec{
 			ServiceAccount:           sa1,
 			AccessRoleBinding:        []policyv1alpha1.AccessRoleBinding{{RoleBinding: rb1, Rules: role1.Rules}},
@@ -1737,18 +1737,10 @@ func TestSyncRules(t *testing.T) {
 				t.Errorf("Failed to add rbacv1 scheme: %v", err)
 			}
 			pdStrategyTypeIndexer := func(obj client.Object) []string {
-				pd, ok := obj.(*v1.Pod)
-				if !ok {
-					panic(fmt.Errorf("indexer function for type %T's spec.strategy.type field received"+
-						" object of type %T, this should never happen", v1.Pod{}, obj))
-				}
-				serviceAccountName := ""
-				if pd != nil {
-					serviceAccountName = pd.Spec.ServiceAccountName
-				}
+				serviceAccountName := "sa1"
 				return []string{serviceAccountName}
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(accessScheme).WithObjects(tt.obj...).WithLists(nodeList).WithIndex(&v1.Pod{}, "spec.serviceAccountName", pdStrategyTypeIndexer).Build()
+			fakeClient := fake.NewClientBuilder().WithScheme(accessScheme).WithObjects(tt.obj...).WithLists(nodeList).WithIndex(&v1.Pod{}, "spec.serviceAccountName", pdStrategyTypeIndexer).WithStatusSubresource(tt.input).Build()
 			ctr := &Controller{
 				Client:       fakeClient,
 				MessageLayer: messagelayer.PolicyControllerMessageLayer(),
diff --git a/edge/pkg/edged/config/config.go b/edge/pkg/edged/config/config.go
index 26fad60d2..41137d755 100644
--- a/edge/pkg/edged/config/config.go
+++ b/edge/pkg/edged/config/config.go
@@ -32,7 +32,7 @@ func InitConfigure(e *v1alpha2.Edged) {
 	})
 }
 
-func ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(in *v1alpha2.TailoredKubeletConfiguration, out *kubeletconfig.KubeletConfiguration, s conversion.Scope) error {
+func ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(in *v1alpha2.TailoredKubeletConfiguration, inFlag *v1alpha2.TailoredKubeletFlag, out *kubeletconfig.KubeletConfiguration, s conversion.Scope) error {
 	out.StaticPodPath = in.StaticPodPath
 	out.SyncFrequency = in.SyncFrequency
 	out.Address = in.Address
@@ -166,6 +166,11 @@ func ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(in *v1alpha2.T
 	if err := v1.Convert_Pointer_bool_To_bool(&in.RegisterNode, &out.RegisterNode, s); err != nil {
 		return err
 	}
+	if in.ContainerRuntimeEndpoint == "" {
+		out.ContainerRuntimeEndpoint = inFlag.RemoteRuntimeEndpoint
+	}
+	out.ContainerRuntimeEndpoint = in.ContainerRuntimeEndpoint
+	out.ImageServiceEndpoint = in.ImageServiceEndpoint
 	return nil
 }
 
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go
index 66e477b72..68cc00a42 100644
--- a/edge/pkg/edged/edged.go
+++ b/edge/pkg/edged/edged.go
@@ -154,7 +154,7 @@ func newEdged(enable bool, nodeName, namespace string) (*edged, error) {
 
 	var kubeletConfig kubeletconfig.KubeletConfiguration
 	var kubeletFlags kubeletoptions.KubeletFlags
-	err = edgedconfig.ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(edgedconfig.Config.TailoredKubeletConfig, &kubeletConfig, nil)
+	err = edgedconfig.ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(edgedconfig.Config.TailoredKubeletConfig, &edgedconfig.Config.TailoredKubeletFlag, &kubeletConfig, nil)
 	if err != nil {
 		klog.ErrorS(err, "Failed to convert kubelet config")
 		return nil, fmt.Errorf("failed to construct kubelet configuration")
diff --git a/edge/pkg/metamanager/metaserver/auth/auth_test.go b/edge/pkg/metamanager/metaserver/auth/auth_test.go
index 0e3db307a..9dbe33522 100644
--- a/edge/pkg/metamanager/metaserver/auth/auth_test.go
+++ b/edge/pkg/metamanager/metaserver/auth/auth_test.go
@@ -365,7 +365,7 @@ func TestTokenGenerateAndValidate(t *testing.T) {
 			ormerMock.EXPECT().QueryTable(gomock.Any()).Return(querySeterMock).Times(1)
 		}
 		auds := authenticator.Audiences{"api"}
-		serviceaccountValidator, err := serviceaccount.NewLegacyValidator(tc.Client != nil, client.NewGetterFromClient(tc.Client), tc.Client.CoreV1())
+		serviceaccountValidator, err := serviceaccount.NewLegacyValidator(tc.Client != nil, client.NewGetterFromClient(tc.Client), fake.NewSimpleClientset(rsaSecret).CoreV1())
 		if err != nil {
 			t.Errorf("%s: Expected err=nil, , got %v", k, err)
 		}
diff --git a/edge/pkg/metamanager/metaserver/auth/claims_test.go b/edge/pkg/metamanager/metaserver/auth/claims_test.go
index 55ed76309..64eb37fff 100644
--- a/edge/pkg/metamanager/metaserver/auth/claims_test.go
+++ b/edge/pkg/metamanager/metaserver/auth/claims_test.go
@@ -83,14 +83,14 @@ func TestValidatePrivateClaims(t *testing.T) {
 			name:      "expired",
 			getter:    fakeGetter{serviceAccount, nil, nil},
 			private:   &privateClaims{Kubernetes: kubernetes{Svcacct: ref{Name: "saname", UID: "sauid"}, Namespace: "ns"}},
-			expiry:    jwt.NewNumericDate(now().Add(-1_000 * time.Hour)),
+			expiry:    *jwt.NewNumericDate(now().Add(-1_000 * time.Hour)),
 			expectErr: "service account token has expired",
 		},
 		{
 			name:      "not yet valid",
 			getter:    fakeGetter{serviceAccount, nil, nil},
 			private:   &privateClaims{Kubernetes: kubernetes{Svcacct: ref{Name: "saname", UID: "sauid"}, Namespace: "ns"}},
-			notBefore: jwt.NewNumericDate(now().Add(1_000 * time.Hour)),
+			notBefore: *jwt.NewNumericDate(now().Add(1_000 * time.Hour)),
 			expectErr: "service account token is not valid yet",
 		},
 		{
@@ -173,10 +173,11 @@ func TestValidatePrivateClaims(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			v := &validator{tc.getter}
 			expiry := jwt.NumericDate(nowUnix)
-			if tc.expiry != 0 {
-				expiry = tc.expiry
+			tcExpiry := tc.expiry
+			if tcExpiry != 0 {
+				expiry = tcExpiry
 			}
-			_, err := v.Validate(context.Background(), "", &jwt.Claims{Expiry: expiry, NotBefore: tc.notBefore}, tc.private)
+			_, err := v.Validate(context.Background(), "", &jwt.Claims{Expiry: &expiry, NotBefore: &tc.notBefore}, tc.private)
 			if len(tc.expectErr) > 0 {
 				if errStr := errString(err); tc.expectErr != errStr {
 					t.Fatalf("expected error %q but got %q", tc.expectErr, errStr)
diff --git a/keadm/cmd/keadm/app/cmd/config.go b/keadm/cmd/keadm/app/cmd/config.go
index 02e1806fd..0d6eb3681 100644
--- a/keadm/cmd/keadm/app/cmd/config.go
+++ b/keadm/cmd/keadm/app/cmd/config.go
@@ -18,13 +18,14 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/kubeedge/kubeedge/common/constants"
 	"strings"
 
+	"github.com/spf13/cobra"
+
+	"github.com/kubeedge/kubeedge/common/constants"
 	cmdcommon "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
 	"github.com/kubeedge/kubeedge/pkg/image"
-	"github.com/spf13/cobra"
 )
 
 // Configuration represent keadm config options
diff --git a/keadm/cmd/keadm/app/cmd/edge/join_others.go b/keadm/cmd/keadm/app/cmd/edge/join_others.go
index afaf9191b..383305afd 100644
--- a/keadm/cmd/keadm/app/cmd/edge/join_others.go
+++ b/keadm/cmd/keadm/app/cmd/edge/join_others.go
@@ -145,8 +145,8 @@ func createEdgeConfigFiles(opt *common.JoinOptions) error {
 	}
 
 	if opt.RemoteRuntimeEndpoint != "" {
-		edgeCoreConfig.Modules.Edged.RemoteRuntimeEndpoint = opt.RemoteRuntimeEndpoint
-		edgeCoreConfig.Modules.Edged.RemoteImageEndpoint = opt.RemoteRuntimeEndpoint
+		edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ContainerRuntimeEndpoint = opt.RemoteRuntimeEndpoint
+		edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ImageServiceEndpoint = opt.RemoteRuntimeEndpoint
 	}
 
 	host, _, err := net.SplitHostPort(opt.CloudCoreIPPort)
diff --git a/keadm/cmd/keadm/app/cmd/edge/join_windows.go b/keadm/cmd/keadm/app/cmd/edge/join_windows.go
index 60bb8bd17..a45540455 100644
--- a/keadm/cmd/keadm/app/cmd/edge/join_windows.go
+++ b/keadm/cmd/keadm/app/cmd/edge/join_windows.go
@@ -117,8 +117,8 @@ func createEdgeConfigFiles(opt *common.JoinOptions) error {
 	}
 
 	if opt.RemoteRuntimeEndpoint != "" {
-		edgeCoreConfig.Modules.Edged.RemoteRuntimeEndpoint = opt.RemoteRuntimeEndpoint
-		edgeCoreConfig.Modules.Edged.RemoteImageEndpoint = opt.RemoteRuntimeEndpoint
+		edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ContainerRuntimeEndpoint = opt.RemoteRuntimeEndpoint
+		edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ImageServiceEndpoint = opt.RemoteRuntimeEndpoint
 	}
 
 	host, _, err := net.SplitHostPort(opt.CloudCoreIPPort)
diff --git a/keadm/cmd/keadm/app/cmd/reset_others.go b/keadm/cmd/keadm/app/cmd/reset_others.go
index cc444a36a..8abc30624 100644
--- a/keadm/cmd/keadm/app/cmd/reset_others.go
+++ b/keadm/cmd/keadm/app/cmd/reset_others.go
@@ -21,7 +21,6 @@ package cmd
 import (
 	"bufio"
 	"fmt"
-	"github.com/kubeedge/kubeedge/common/constants"
 	"os"
 	"strings"
 	"time"
@@ -31,6 +30,7 @@ import (
 	utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime"
 	utilsexec "k8s.io/utils/exec"
 
+	"github.com/kubeedge/kubeedge/common/constants"
 	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/helm"
 	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
diff --git a/keadm/cmd/keadm/app/cmd/util/edgecoreinstaller.go b/keadm/cmd/keadm/app/cmd/util/edgecoreinstaller.go
index 94087826f..62e331a08 100755
--- a/keadm/cmd/keadm/app/cmd/util/edgecoreinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/edgecoreinstaller.go
@@ -112,8 +112,8 @@ func (ku *KubeEdgeInstTool) createEdgeConfigFiles() error {
 	}
 
 	if ku.RemoteRuntimeEndpoint != "" {
-		edgeCoreConfig.Modules.Edged.RemoteRuntimeEndpoint = ku.RemoteRuntimeEndpoint
-		edgeCoreConfig.Modules.Edged.RemoteImageEndpoint = ku.RemoteRuntimeEndpoint
+		edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ContainerRuntimeEndpoint = ku.RemoteRuntimeEndpoint
+		edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ImageServiceEndpoint = ku.RemoteRuntimeEndpoint
 	}
 	if ku.Token != "" {
 		edgeCoreConfig.Modules.EdgeHub.Token = ku.Token