Use pause image from new source.
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
parent
356a41c424
commit
f0655ecfe0
@ -56,6 +56,6 @@
|
|||||||
# TODO This needs to be removed once we have consistent concurrent pull results
|
# TODO This needs to be removed once we have consistent concurrent pull results
|
||||||
- name: "Pre-pull pause container image"
|
- name: "Pre-pull pause container image"
|
||||||
shell: |
|
shell: |
|
||||||
/usr/local/bin/ctr pull gcr.io/google_containers/pause:3.1
|
/usr/local/bin/ctr pull k8s.gcr.io/pause:3.1
|
||||||
/usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \
|
/usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \
|
||||||
pull gcr.io/google_containers/pause:3.1
|
pull k8s.gcr.io/pause:3.1
|
||||||
|
@ -16,7 +16,7 @@ The explanation and default value of each configuration item are as follows:
|
|||||||
enable_selinux = false
|
enable_selinux = false
|
||||||
|
|
||||||
# sandbox_image is the image used by sandbox container.
|
# sandbox_image is the image used by sandbox container.
|
||||||
sandbox_image = "gcr.io/google_containers/pause:3.1"
|
sandbox_image = "k8s.gcr.io/pause:3.1"
|
||||||
|
|
||||||
# stats_collect_period is the period (in seconds) of snapshots stats collection.
|
# stats_collect_period is the period (in seconds) of snapshots stats collection.
|
||||||
stats_collect_period = 10
|
stats_collect_period = 10
|
||||||
|
@ -185,7 +185,7 @@ $ crictl info
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"streamServerPort": "10010",
|
"streamServerPort": "10010",
|
||||||
"sandboxImage": "gcr.io/google_containers/pause:3.0",
|
"sandboxImage": "k8s.gcr.io/pause:3.1",
|
||||||
"statsCollectPeriod": 10,
|
"statsCollectPeriod": 10,
|
||||||
"containerdRootDir": "/var/lib/containerd",
|
"containerdRootDir": "/var/lib/containerd",
|
||||||
"containerdEndpoint": "/run/containerd/containerd.sock",
|
"containerdEndpoint": "/run/containerd/containerd.sock",
|
||||||
|
@ -39,7 +39,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
timeout = 1 * time.Minute
|
timeout = 1 * time.Minute
|
||||||
pauseImage = "gcr.io/google_containers/pause:3.1" // This is the same with default sandbox image.
|
pauseImage = "k8s.gcr.io/pause:3.1" // This is the same with default sandbox image.
|
||||||
k8sNamespace = constants.K8sContainerdNamespace
|
k8sNamespace = constants.K8sContainerdNamespace
|
||||||
containerdEndpoint = "/run/containerd/containerd.sock"
|
containerdEndpoint = "/run/containerd/containerd.sock"
|
||||||
)
|
)
|
||||||
|
@ -118,7 +118,7 @@ func DefaultConfig() PluginConfig {
|
|||||||
StreamServerAddress: "",
|
StreamServerAddress: "",
|
||||||
StreamServerPort: "10010",
|
StreamServerPort: "10010",
|
||||||
EnableSelinux: false,
|
EnableSelinux: false,
|
||||||
SandboxImage: "gcr.io/google_containers/pause:3.1",
|
SandboxImage: "k8s.gcr.io/pause:3.1",
|
||||||
StatsCollectPeriod: 10,
|
StatsCollectPeriod: 10,
|
||||||
SystemdCgroup: false,
|
SystemdCgroup: false,
|
||||||
Registry: Registry{
|
Registry: Registry{
|
||||||
|
Loading…
Reference in New Issue
Block a user