diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-12-11 10:24:23 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-12-11 10:24:23 +0800 |
| commit | 192539b4e7a66b1507fd46e22795bdded4c38d32 (patch) | |
| tree | 3068a6a656546c95afaecaca97450f53fc8f6c43 /edge/pkg | |
| parent | Merge pull request #5278 from fisherxu/fix-slack (diff) | |
| download | kubeedge-192539b4e7a66b1507fd46e22795bdded4c38d32.tar.gz | |
remove runtimetype
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
Diffstat (limited to 'edge/pkg')
| -rw-r--r-- | edge/pkg/edgehub/upgrade/upgrade.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/edge/pkg/edgehub/upgrade/upgrade.go b/edge/pkg/edgehub/upgrade/upgrade.go index 3a7ecfcd2..e26cd50ca 100644 --- a/edge/pkg/edgehub/upgrade/upgrade.go +++ b/edge/pkg/edgehub/upgrade/upgrade.go @@ -112,7 +112,10 @@ func (*keadmUpgrade) Upgrade(upgradeReq *commontypes.NodeUpgradeJobRequest) erro // install the requested installer keadm from docker image klog.Infof("Begin to download version %s keadm", upgradeReq.Version) - container, err := util.NewContainerRuntime(config.Modules.Edged.ContainerRuntime, config.Modules.Edged.RemoteRuntimeEndpoint, config.Modules.Edged.TailoredKubeletConfig.CgroupDriver) + if config.Modules.Edged.TailoredKubeletConfig.ContainerRuntimeEndpoint == "" { + config.Modules.Edged.TailoredKubeletConfig.ContainerRuntimeEndpoint = config.Modules.Edged.RemoteRuntimeEndpoint + } + container, err := util.NewContainerRuntime(config.Modules.Edged.TailoredKubeletConfig.ContainerRuntimeEndpoint, config.Modules.Edged.TailoredKubeletConfig.CgroupDriver) if err != nil { return fmt.Errorf("failed to new container runtime: %v", err) } |