summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2024-04-28 20:06:06 +0800
committerGitHub <noreply@github.com>2024-04-28 20:06:06 +0800
commitd9bbf3d5b8c90d763e9a4bb3353264a866221ffe (patch)
tree8b3ea944d0f6e002956734763f4cff8f848d5994
parentMerge pull request #5576 from WillardHu/automated-cherry-pick-of-#5575-upstre... (diff)
parentfix compile failed in windows (diff)
downloadkubeedge-d9bbf3d5b8c90d763e9a4bb3353264a866221ffe.tar.gz
Merge pull request #5579 from Shelley-BaoYue/automated-cherry-pick-of-#5578-upstream-release-1.17v1.17.0
Automated cherry pick of #5578: fix compile failed in windows
-rw-r--r--keadm/cmd/keadm/app/cmd/edge/reset_others.go (renamed from keadm/cmd/keadm/app/cmd/edge/reset_other.go)0
-rw-r--r--keadm/cmd/keadm/app/cmd/util/common_windows.go8
2 files changed, 8 insertions, 0 deletions
diff --git a/keadm/cmd/keadm/app/cmd/edge/reset_other.go b/keadm/cmd/keadm/app/cmd/edge/reset_others.go
index efc180d9d..efc180d9d 100644
--- a/keadm/cmd/keadm/app/cmd/edge/reset_other.go
+++ b/keadm/cmd/keadm/app/cmd/edge/reset_others.go
diff --git a/keadm/cmd/keadm/app/cmd/util/common_windows.go b/keadm/cmd/keadm/app/cmd/util/common_windows.go
index 22308a8df..270e79bdb 100644
--- a/keadm/cmd/keadm/app/cmd/util/common_windows.go
+++ b/keadm/cmd/keadm/app/cmd/util/common_windows.go
@@ -247,3 +247,11 @@ func runEdgeCore() error {
func KillKubeEdgeBinary(proc string) error {
return errors.New("not implemented")
}
+
+func EdgeCoreRunningModuleV2(opt *types.ResetOptions) types.ModuleRunning {
+ return types.NoneRunning
+}
+
+func CloudCoreRunningModuleV2(opt *types.ResetOptions) types.ModuleRunning {
+ return types.NoneRunning
+}