Make sandbox container image configurable

Signed-off-by: Jamie Zhuang <lanchongyizu@gmail.com>
This commit is contained in:
Jamie Zhuang
2017-09-03 02:53:17 -04:00
parent 86e8a24977
commit 915f5b0aea
4 changed files with 8 additions and 4 deletions

View File

@@ -57,8 +57,6 @@ const (
)
const (
// defaultSandboxImage is the image used by sandbox container.
defaultSandboxImage = "gcr.io/google_containers/pause:3.0"
// defaultSandboxOOMAdj is default omm adj for sandbox container. (kubernetes#47938).
defaultSandboxOOMAdj = -998
// defaultSandboxCPUshares is default cpu shares for sandbox container.

View File

@@ -111,7 +111,8 @@ func NewCRIContainerdService(
networkPluginConfDir,
streamAddress,
streamPort string,
cgroupPath string) (CRIContainerdService, error) {
cgroupPath string,
sandboxImage string) (CRIContainerdService, error) {
// TODO(random-liu): [P2] Recover from runtime state and checkpoint.
client, err := containerd.New(containerdEndpoint, containerd.WithDefaultNamespace(k8sContainerdNamespace))
@@ -129,7 +130,7 @@ func NewCRIContainerdService(
serverAddress: serverAddress,
os: osinterface.RealOS{},
rootDir: rootDir,
sandboxImage: defaultSandboxImage,
sandboxImage: sandboxImage,
snapshotter: containerdSnapshotter,
sandboxStore: sandboxstore.NewStore(),
containerStore: containerstore.NewStore(),