modification for k8s 1.23.15

Signed-off-by: Shelley-BaoYue <[email protected]>
gy95 · Jan 16, 2023 · e10f4d1 · e10f4d1
1 parent 9e211f7
commit e10f4d1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/edge/cmd/edgemark/hollow_edgecore.go b/edge/cmd/edgemark/hollow_edgecore.go
@@ -135,6 +135,7 @@ func EdgeCoreConfig(config *hollowEdgeNodeConfig) *v1alpha2.EdgeCoreConfig {
 	edgeCoreConfig := v1alpha2.NewDefaultEdgeCoreConfig()
 
 	falseFlag := false
+	trueFlag := true
 
 	// overWrite config
 	edgeCoreConfig.DataBase.DataSource = "/edgecore.db"
@@ -144,7 +145,7 @@ func EdgeCoreConfig(config *hollowEdgeNodeConfig) *v1alpha2.EdgeCoreConfig {
 
 	edgeCoreConfig.Modules.Edged.HostnameOverride = config.NodeName
 	edgeCoreConfig.Modules.Edged.NodeLabels = config.NodeLabels
-	edgeCoreConfig.Modules.Edged.RegisterNode = true
+	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.RegisterNode = &trueFlag
 	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.CgroupsPerQOS = &falseFlag
 	edgeCoreConfig.Modules.Edged.ContainerRuntime = kubetypes.RemoteContainerRuntime
 	edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.EnableControllerAttachDetach = &falseFlag

diff --git a/edge/pkg/edged/config/config.go b/edge/pkg/edged/config/config.go
@@ -32,7 +32,6 @@ func ConvertConfigEdgedFlagToConfigKubeletFlag(in *v1alpha2.TailoredKubeletFlag,
 	out.HostnameOverride = in.HostnameOverride
 	out.NodeIP = in.NodeIP
 	out.RootDirectory = in.RootDirectory
-	out.RegisterNode = in.RegisterNode
 	out.RegisterWithTaints = in.RegisterWithTaints
 	out.RemoteRuntimeEndpoint = in.RemoteRuntimeEndpoint
 	out.RemoteImageEndpoint = in.RemoteImageEndpoint

diff --git a/edge/test/integration/appdeployment/application_test.go b/edge/test/integration/appdeployment/application_test.go
@@ -149,8 +149,8 @@ var _ = Describe("Application deployment in edgecore Testing", func() {
 			//Generate the random string and assign as a UID
 			UID = "deployment-app-" + edge.GetRandomString(10)
 			httpact := v1.HTTPGetAction{Path: "/var/lib/edged", Scheme: "HTTP", Port: intstr.IntOrString{Type: intstr.Type(1), IntVal: 1884, StrVal: "1884"}}
-			handler := v1.Handler{HTTPGet: &httpact}
-			probe := v1.Probe{Handler: handler, TimeoutSeconds: 1, InitialDelaySeconds: 10, PeriodSeconds: 15}
+			handler := v1.ProbeHandler{HTTPGet: &httpact}
+			probe := v1.Probe{ProbeHandler: handler, TimeoutSeconds: 1, InitialDelaySeconds: 10, PeriodSeconds: 15}
 			IsAppDeployed := HandleAddAndDeletePods(http.MethodPut, ctx.Cfg.TestManager+AppHandler, UID, []v1.Container{{Name: UID, Image: ctx.Cfg.AppImageURL[0], LivenessProbe: &probe, ImagePullPolicy: v1.PullIfNotPresent}}, v1.RestartPolicyOnFailure)
 			Expect(IsAppDeployed).Should(BeTrue())
 			CheckPodRunningState(ctx.Cfg.EdgedEndpoint+AppHandler, UID)
@@ -163,8 +163,8 @@ var _ = Describe("Application deployment in edgecore Testing", func() {
 			//Generate the random string and assign as a UID
 			UID = "deployment-app-" + edge.GetRandomString(10)
 			httpact := v1.HTTPGetAction{Path: "/var/lib/edged", Scheme: "HTTP", Port: intstr.IntOrString{Type: intstr.Type(1), IntVal: 10255, StrVal: "10255"}}
-			handler := v1.Handler{HTTPGet: &httpact}
-			probe := v1.Probe{Handler: handler, TimeoutSeconds: 1, InitialDelaySeconds: 10, PeriodSeconds: 15}
+			handler := v1.ProbeHandler{HTTPGet: &httpact}
+			probe := v1.Probe{ProbeHandler: handler, TimeoutSeconds: 1, InitialDelaySeconds: 10, PeriodSeconds: 15}
 			IsAppDeployed := HandleAddAndDeletePods(http.MethodPut, ctx.Cfg.TestManager+AppHandler, UID, []v1.Container{{Name: UID, Image: ctx.Cfg.AppImageURL[0], ReadinessProbe: &probe, ImagePullPolicy: v1.PullIfNotPresent}}, v1.RestartPolicyOnFailure)
 			Expect(IsAppDeployed).Should(BeTrue())
 			CheckPodRunningState(ctx.Cfg.EdgedEndpoint+AppHandler, UID)

diff --git a/keadm/cmd/keadm/app/cmd/util/image.go b/keadm/cmd/keadm/app/cmd/util/image.go
@@ -29,7 +29,7 @@ import (
 	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	internalapi "k8s.io/cri-api/pkg/apis"
-	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/kubelet/cri/remote"
 	kubetypes "k8s.io/kubernetes/pkg/kubelet/types"