summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorgy95 <1015105054@qq.com>2022-12-29 16:03:14 +0800
committergy95 <1015105054@qq.com>2023-01-09 17:09:08 +0800
commit439874a022134f75b35a24e4d0a8729a5df2f473 (patch)
treef0c42844d64c41ee1b45e407f85db24cc353dc6a /common
parentMerge pull request #4498 from vincentgoat/cve_containerd (diff)
downloadkubeedge-439874a022134f75b35a24e4d0a8729a5df2f473.tar.gz
update sandboxImage to kubeedge/pause:3.6
Signed-off-by: gy95 <1015105054@qq.com>
Diffstat (limited to 'common')
-rw-r--r--common/constants/default.go18
1 files changed, 10 insertions, 8 deletions
diff --git a/common/constants/default.go b/common/constants/default.go
index 56025e41e..5eda30083 100644
--- a/common/constants/default.go
+++ b/common/constants/default.go
@@ -42,14 +42,16 @@ const (
DefaultMqttKeyFile = "/etc/kubeedge/certs/server.key"
// Edged
- DefaultKubeletConfig = "/etc/kubeedge/config/kubeconfig"
- DefaultDockerAddress = "unix:///var/run/docker.sock"
- DefaultRuntimeType = "docker"
- DefaultEdgedMemoryCapacity = 7852396000
- DefaultRemoteRuntimeEndpoint = "unix:///var/run/dockershim.sock"
- DefaultRemoteImageEndpoint = "unix:///var/run/dockershim.sock"
- DefaultMosquittoImage = "eclipse-mosquitto:1.6.15"
- DefaultPodSandboxImage = "kubeedge/pause:3.1"
+ DefaultKubeletConfig = "/etc/kubeedge/config/kubeconfig"
+ DefaultDockerAddress = "unix:///var/run/docker.sock"
+ DefaultRuntimeType = "docker"
+ DefaultEdgedMemoryCapacity = 7852396000
+ DefaultRemoteRuntimeEndpoint = "unix:///var/run/dockershim.sock"
+ DefaultRemoteImageEndpoint = "unix:///var/run/dockershim.sock"
+ DefaultMosquittoImage = "eclipse-mosquitto:1.6.15"
+ // update PodSandboxImage version when bumping k8s vendor version, consistent with vendor/k8s.io/kubernetes/cmd/kubelet/app/options/container_runtime.go defaultPodSandboxImageVersion
+ // When this value are updated, also update comments in pkg/apis/componentconfig/edgecore/v1alpha1/types.go
+ DefaultPodSandboxImage = "kubeedge/pause:3.6"
DefaultImagePullProgressDeadline = time.Minute
DefaultImageGCHighThreshold = 80
DefaultImageGCLowThreshold = 40