summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2024-01-19 15:16:29 +0800
committerGitHub <noreply@github.com>2024-01-19 15:16:29 +0800
commit932907a5482772a06f810b66958d71dc90ca9abe (patch)
tree2d815e4c9267b6617302b183792f3e4bfc890417
parentMerge pull request #5336 from wbc6080/automated-cherry-pick-of-#5328-upstream... (diff)
parentSupports installing edgecore without installing the CNI plugin (diff)
downloadkubeedge-932907a5482772a06f810b66958d71dc90ca9abe.tar.gz
Merge pull request #5367 from luomengY/automated-cherry-pick-of-#5196-upstream-release-1.15v1.15.2
Automated cherry pick of #5196 upstream release 1.15
-rw-r--r--keadm/cmd/keadm/app/cmd/util/image.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/keadm/cmd/keadm/app/cmd/util/image.go b/keadm/cmd/keadm/app/cmd/util/image.go
index 7ffbd6056..37dad0c4b 100644
--- a/keadm/cmd/keadm/app/cmd/util/image.go
+++ b/keadm/cmd/keadm/app/cmd/util/image.go
@@ -280,7 +280,7 @@ func (runtime *CRIRuntime) CopyResources(edgeImage string, files map[string]stri
Linux: &runtimeapi.LinuxPodSandboxConfig{
SecurityContext: &runtimeapi.LinuxSandboxSecurityContext{
NamespaceOptions: &runtimeapi.NamespaceOption{
- Network: runtimeapi.NamespaceMode_POD,
+ Network: runtimeapi.NamespaceMode_NODE,
},
},
},