diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-15 09:48:13 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-20 14:15:51 +0800 |
| commit | cc0337d336a85aa9be1aa5a6917f00e7213e5af0 (patch) | |
| tree | 7fac11f5c04a3608c413cd49355c0d06f548feca /edge/cmd | |
| parent | bump helm to v1.12.3 (diff) | |
| download | kubeedge-cc0337d336a85aa9be1aa5a6917f00e7213e5af0.tar.gz | |
modification for kubernetes v1.27.7
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
Diffstat (limited to 'edge/cmd')
| -rw-r--r-- | edge/cmd/edgemark/hollow_edgecore.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/edge/cmd/edgemark/hollow_edgecore.go b/edge/cmd/edgemark/hollow_edgecore.go index 7420f95ff..fa5dbde1f 100644 --- a/edge/cmd/edgemark/hollow_edgecore.go +++ b/edge/cmd/edgemark/hollow_edgecore.go @@ -37,7 +37,6 @@ import ( containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/cri/remote" fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake" - kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/configmap" @@ -52,6 +51,7 @@ import ( "k8s.io/mount-utils" "github.com/kubeedge/beehive/pkg/core" + "github.com/kubeedge/kubeedge/common/constants" "github.com/kubeedge/kubeedge/edge/pkg/common/dbm" "github.com/kubeedge/kubeedge/edge/pkg/edged" "github.com/kubeedge/kubeedge/edge/pkg/edgehub" @@ -150,7 +150,7 @@ func EdgeCoreConfig(config *hollowEdgeNodeConfig) *v1alpha2.EdgeCoreConfig { edgeCoreConfig.Modules.Edged.NodeLabels = config.NodeLabels edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.RegisterNode = &trueFlag edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.CgroupsPerQOS = &falseFlag - edgeCoreConfig.Modules.Edged.ContainerRuntime = kubetypes.RemoteContainerRuntime + edgeCoreConfig.Modules.Edged.ContainerRuntime = constants.DefaultRuntimeType edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.EnableControllerAttachDetach = &falseFlag edgeCoreConfig.Modules.Edged.TailoredKubeletConfig.ProtectKernelDefaults = false |