diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-12-06 13:32:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 13:32:48 +0800 |
| commit | bdb8ac745bfd4682f4a19029c1e33503bd9da916 (patch) | |
| tree | e509ebd10f27da869d95e84c79e411386c51fad9 | |
| parent | Merge pull request #5240 from Shelley-BaoYue/automated-cherry-pick-of-#5239-u... (diff) | |
| parent | fix default staticPodPath in windows (diff) | |
| download | kubeedge-bdb8ac745bfd4682f4a19029c1e33503bd9da916.tar.gz | |
Merge pull request #5271 from Shelley-BaoYue/automated-cherry-pick-of-#5254-upstream-release-1.15
Automated cherry pick of #5254: fix default staticPodPath in windows
| -rw-r--r-- | common/constants/default.go | 3 | ||||
| -rw-r--r-- | common/constants/default_others.go | 3 | ||||
| -rw-r--r-- | common/constants/default_windows.go | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/common/constants/default.go b/common/constants/default.go index 81b06bc7c..3480da4e5 100644 --- a/common/constants/default.go +++ b/common/constants/default.go @@ -152,7 +152,4 @@ const ( DeafultMosquittoContainerName = "mqtt-kubeedge" DeployMqttContainerEnv = "DEPLOY_MQTT_CONTAINER" - - // DefaultManifestsDir edge node default static pod path - DefaultManifestsDir = "/etc/kubeedge/manifests" ) diff --git a/common/constants/default_others.go b/common/constants/default_others.go index 20defe4a7..ed6891818 100644 --- a/common/constants/default_others.go +++ b/common/constants/default_others.go @@ -30,4 +30,7 @@ const ( DefaultCNIBinDir = "/opt/cni/bin" DefaultCNICacheDir = "/var/lib/cni/cache" DefaultVolumePluginDir = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" + + // DefaultManifestsDir edge node default static pod path + DefaultManifestsDir = "/etc/kubeedge/manifests" ) diff --git a/common/constants/default_windows.go b/common/constants/default_windows.go index 021ed739c..54e0400d5 100644 --- a/common/constants/default_windows.go +++ b/common/constants/default_windows.go @@ -33,4 +33,7 @@ const ( DefaultCNIBinDir = "c:\\opt\\cni\\bin" DefaultCNICacheDir = "c:\\var\\lib\\cni\\cache" DefaultVolumePluginDir = "C:\\usr\\libexec\\kubernetes\\kubelet-plugins\\volume\\exec\\" + + // DefaultManifestsDir edge node default static pod path + DefaultManifestsDir = "c:\\etc\\kubeedge\\manifests\\" ) |