compatibility modification

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

10 files changed, 14 insertions, 15 deletions

diff --git a/edge/cmd/edgemark/hollow_edgecore.go b/edge/cmd/edgemark/hollow_edgecore.go
index de11e9f94..7420f95ff 100644
--- a/edge/cmd/edgemark/hollow_edgecore.go
+++ b/edge/cmd/edgemark/hollow_edgecore.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	oteltrace "go.opentelemetry.io/otel/trace"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/cli/globalflag"
 	"k8s.io/component-base/featuregate"
@@ -169,7 +170,7 @@ func GetFakeKubeletDeps(
 		return nil, fmt.Errorf("failed to start fake runtime %v", err)
 	}
 
-	runtimeService, err := remote.NewRemoteRuntimeService(endpoint, 15*time.Second)
+	runtimeService, err := remote.NewRemoteRuntimeService(endpoint, 15*time.Second, oteltrace.NewNoopTracerProvider())
 	if err != nil {
 		return nil, fmt.Errorf("failed to init runtime service %v", err)
 	}
diff --git a/edge/pkg/edged/config/config.go b/edge/pkg/edged/config/config.go
index b2b4fd511..975b34442 100644
--- a/edge/pkg/edged/config/config.go
+++ b/edge/pkg/edged/config/config.go
@@ -7,7 +7,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/component-base/config/v1alpha1"
 	"k8s.io/component-base/featuregate"
 	kubeletoptions "k8s.io/kubernetes/cmd/kubelet/app/options"
 	"k8s.io/kubernetes/pkg/kubelet"
@@ -144,9 +143,7 @@ func ConvertEdgedKubeletConfigurationToConfigKubeletConfiguration(in *v1alpha2.T
 	out.AllowedUnsafeSysctls = *(*[]string)(unsafe.Pointer(&in.AllowedUnsafeSysctls))
 	out.VolumePluginDir = in.VolumePluginDir
 	out.KernelMemcgNotification = in.KernelMemcgNotification
-	if err := v1alpha1.Convert_v1alpha1_LoggingConfiguration_To_config_LoggingConfiguration(&in.Logging, &out.Logging, s); err != nil {
-		return err
-	}
+	out.Logging = in.Logging
 	if err := v1.Convert_Pointer_bool_To_bool(&in.EnableSystemLogHandler, &out.EnableSystemLogHandler, s); err != nil {
 		return err
 	}
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go
index ef7fcd225..82f982f13 100644
--- a/edge/pkg/edged/edged.go
+++ b/edge/pkg/edged/edged.go
@@ -180,7 +180,7 @@ func newEdged(enable bool, nodeName, namespace string) (*edged, error) {
 	MakeKubeClientBridge(kubeletDeps)
 
 	// source of all configuration
-	kubeletDeps.PodConfig = config.NewPodConfig(config.PodConfigNotificationIncremental, kubeletDeps.Recorder)
+	kubeletDeps.PodConfig = config.NewPodConfig(config.PodConfigNotificationIncremental, kubeletDeps.Recorder, kubeletDeps.PodStartupLatencyTracker)
 
 	ed = &edged{
 		enable:        true,
diff --git a/edge/pkg/metamanager/config/config.go b/edge/pkg/metamanager/config/config.go
index f59b6d2bd..08da7fee8 100644
--- a/edge/pkg/metamanager/config/config.go
+++ b/edge/pkg/metamanager/config/config.go
@@ -19,6 +19,6 @@ func InitConfigure(m *v1alpha2.MetaManager) {
 		Config = Configure{
 			MetaManager: *m,
 		}
-		metaserverconfig.InitConfigure(Config.MetaServer)
+		metaserverconfig.InitConfigure(Config.MetaManager.MetaServer)
 	})
 }
diff --git a/edge/pkg/metamanager/metaserver/auth/auth_test.go b/edge/pkg/metamanager/metaserver/auth/auth_test.go
index 50d4808b3..5d6eea0ca 100644
--- a/edge/pkg/metamanager/metaserver/auth/auth_test.go
+++ b/edge/pkg/metamanager/metaserver/auth/auth_test.go
@@ -367,7 +367,7 @@ func TestTokenGenerateAndValidate(t *testing.T) {
 		auds := authenticator.Audiences{"api"}
 		authn := JWTTokenAuthenticator(nil,
 			[]string{serviceaccount.LegacyIssuer, "bar"}, tc.Keys, auds,
-			serviceaccount.NewLegacyValidator(tc.Client != nil, client.NewGetterFromClient(tc.Client)))
+			serviceaccount.NewLegacyValidator(tc.Client != nil, client.NewGetterFromClient(tc.Client), nil))
 
 		// An invalid, non-JWT token should always fail
 		ctx := authenticator.WithAudiences(context.Background(), auds)
diff --git a/edge/pkg/metamanager/metaserver/config/config.go b/edge/pkg/metamanager/metaserver/config/config.go
index acfa5dda8..e9d47c340 100644
--- a/edge/pkg/metamanager/metaserver/config/config.go
+++ b/edge/pkg/metamanager/metaserver/config/config.go
@@ -22,8 +22,8 @@ func InitConfigure(c *v1alpha2.MetaServer) {
 			// so edgehub must register before metamanager
 			NodeName: edgehubconfig.Config.NodeName,
 		}
-		if len(Config.APIAudiences) == 0 && len(Config.ServiceAccountIssuers) != 0 {
-			Config.APIAudiences = Config.ServiceAccountIssuers
+		if len(Config.MetaServer.APIAudiences) == 0 && len(Config.MetaServer.ServiceAccountIssuers) != 0 {
+			Config.MetaServer.APIAudiences = Config.MetaServer.ServiceAccountIssuers
 		}
 	})
 }
diff --git a/edge/pkg/metamanager/metaserver/handlerfactory/handler.go b/edge/pkg/metamanager/metaserver/handlerfactory/handler.go
index d6b739979..1a33ec65b 100644
--- a/edge/pkg/metamanager/metaserver/handlerfactory/handler.go
+++ b/edge/pkg/metamanager/metaserver/handlerfactory/handler.go
@@ -178,7 +178,7 @@ func (f *Factory) Patch(reqInfo *request.RequestInfo) http.Handler {
 			return
 		}
 
-		responsewriters.WriteObjectNegotiated(scope.Serializer, scope, scope.Kind.GroupVersion(), w, req, 200, retObj)
+		responsewriters.WriteObjectNegotiated(scope.Serializer, scope, scope.Kind.GroupVersion(), w, req, 200, retObj, false)
 	}
 	return http.HandlerFunc(h)
 }
diff --git a/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/client.go b/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/client.go
index 16e537121..15c2f3116 100644
--- a/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/client.go
+++ b/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/client.go
@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/apiserver/pkg/storage/etcd3"
+	"k8s.io/apiserver/pkg/storage"
 
 	"github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/dbm"
@@ -19,7 +19,7 @@ import (
 // maintainers the revision and message cache(todo), so we do not see
 // there are multi-clients.
 var DefaultV2Client = newV2Client()
-var Versioner = etcd3.Versioner
+var Versioner = storage.APIObjectVersioner{}
 
 type Client interface {
 	// This set of functions is for metamanager
diff --git a/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/watchhook/hooks.go b/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/watchhook/hooks.go
index f03056935..72603491c 100644
--- a/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/watchhook/hooks.go
+++ b/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/imitator/watchhook/hooks.go
@@ -6,7 +6,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/apiserver/pkg/storage/etcd3"
+	"k8s.io/apiserver/pkg/storage"
 	"k8s.io/klog/v2"
 
 	"github.com/kubeedge/kubeedge/pkg/metaserver"
@@ -64,7 +64,7 @@ func Trigger(e watch.Event) {
 				klog.Errorf("failed to get accessor, %v", err)
 				return
 			}
-			rev, err := etcd3.Versioner.ParseResourceVersion(accessor.GetResourceVersion())
+			rev, err := storage.APIObjectVersioner{}.ParseResourceVersion(accessor.GetResourceVersion())
 			if err != nil {
 				klog.Errorf("failed to parse resource version, %v", err)
 				return
diff --git a/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/watcher.go b/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/watcher.go
index 8f3cb9669..843be839c 100644
--- a/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/watcher.go
+++ b/edge/pkg/metamanager/metaserver/kubernetes/storage/sqlite/watcher.go
@@ -18,6 +18,7 @@ KubeEdge Authors:
 - This File is drive from kubernetes/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
 - Refactor to adapter imitator
 */
+
 package sqlite
 
 import (