diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2021-09-22 11:06:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 11:06:39 +0800 |
| commit | b9dbf99b25379d66ab7194c5e04151cb02716167 (patch) | |
| tree | c13c9daab6de639e3c724118c5ab5fd62021d798 /docs/proposals | |
| parent | Merge pull request #3136 from siredmar/sameip-logs (diff) | |
| parent | Back to kubeedge/pause (diff) | |
| download | kubeedge-b9dbf99b25379d66ab7194c5e04151cb02716167.tar.gz | |
Merge pull request #3114 from siredmar/uniform_sandbox2
Replaced 'kubeedge/pause' with 'k8s.gcr.io/pause' multi arch image
Diffstat (limited to 'docs/proposals')
| -rw-r--r-- | docs/proposals/configuration.md | 5 | ||||
| -rw-r--r-- | docs/proposals/cri.md | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/docs/proposals/configuration.md b/docs/proposals/configuration.md index 9faf61289..e48617c2b 100644 --- a/docs/proposals/configuration.md +++ b/docs/proposals/configuration.md @@ -560,10 +560,7 @@ type Edged struct { EdgedMemoryCapacity int64 `json:"edgedMemoryCapacity,omitempty"` // PodSandboxImage is the image whose network/ipc namespaces containers in each pod will use. // +Required - // kubeedge/pause:3.1 for x86 arch - // kubeedge/pause-arm:3.1 for arm arch - // kubeedge/pause-arm64 for arm64 arch - // default kubeedge/pause:3.1 + // default kubeedge/pause PodSandboxImage string `json:"podSandboxImage,omitempty"` // ImagePullProgressDeadline indicates image pull progress dead line (second) // default 60 diff --git a/docs/proposals/cri.md b/docs/proposals/cri.md index b20a38a17..9823eefb5 100644 --- a/docs/proposals/cri.md +++ b/docs/proposals/cri.md @@ -171,7 +171,7 @@ func getConfig() *Config { Get remote runtime endpoint and set to /var/run/containerd/container.sock if not provided Get remote image endpoint and set same as remote runtime endpoint of not provided Get runtime Request Timeout and set to default of 2 min if not provided - Get PodSandboxImage and set to k8s.gcr.io/pause + Get PodSandboxImage and set to kubeedge/pause .... } |