github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Enabel custom infracontainer image

Browse Source 
Modify api protoc for infra
This commit is contained in:
Harry Zhang
2016-09-26 10:18:06 -04:00
parent a241daf3f2
commit 29c6a3b572
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockershim/docker_service.go
View File

@@ -54,10 +54,11 @@ const (
var internalLabelKeys []string = []string{containerTypeLabelKey, sandboxIDLabelKey}
// NOTE: Anything passed to DockerService should be eventually handled in another way when we switch to running the shim as a different process.
func NewDockerService(client dockertools.DockerInterface, seccompProfileRoot string) DockerLegacyService {
func NewDockerService(client dockertools.DockerInterface, seccompProfileRoot string, podSandboxImage string) DockerLegacyService {
return &dockerService{
seccompProfileRoot: seccompProfileRoot,
client: dockertools.NewInstrumentedDockerInterface(client),
podSandboxImage: podSandboxImage,
}
}
@@ -80,6 +81,7 @@ type DockerLegacyService interface {
type dockerService struct {
seccompProfileRoot string
client dockertools.DockerInterface
podSandboxImage string
}
// Version returns the runtime name, runtime version and runtime API version