github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dockershim: fix docker filter, Hostname, and the apiversion

pull/6/head
Yu-Ju Hong 2016-09-14 16:01:12 -07:00
parent fc466743a8
commit 13b23c51cb
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/dockershim/docker_container.go
View File

@ -103,7 +103,6 @@ func (ds *dockerService) CreateContainer(podSandboxID string, config *runtimeApi
Name: makeContainerName(sandboxConfig, config), Name: makeContainerName(sandboxConfig, config),
Config: &dockercontainer.Config{ Config: &dockercontainer.Config{
// TODO: set User. // TODO: set User.
Hostname: sandboxConfig.GetHostname(),
Entrypoint: dockerstrslice.StrSlice(config.GetCommand()), Entrypoint: dockerstrslice.StrSlice(config.GetCommand()),
Cmd: dockerstrslice.StrSlice(config.GetArgs()), Cmd: dockerstrslice.StrSlice(config.GetArgs()),
Env: generateEnvList(config.GetEnvs()), Env: generateEnvList(config.GetEnvs()),

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

@ -80,10 +80,13 @@ func (ds *dockerService) Version(apiVersion string) (*runtimeApi.VersionResponse
} }
runtimeAPIVersion := kubeAPIVersion runtimeAPIVersion := kubeAPIVersion
name := dockerRuntimeName name := dockerRuntimeName
// Docker API version (e.g., 1.23) is not semver compatible. Add a ".0"
// suffix to remedy this.
apiVersion := fmt.Sprintf("%s.0", v.APIVersion)
return &runtimeApi.VersionResponse{ return &runtimeApi.VersionResponse{
Version: &runtimeAPIVersion, Version: &runtimeAPIVersion,
RuntimeName: &name, RuntimeName: &name,
RuntimeVersion: &v.Version, RuntimeVersion: &v.Version,
RuntimeApiVersion: &v.APIVersion, RuntimeApiVersion: &apiVersion,
}, nil }, nil
} }

6
pkg/kubelet/dockershim/helpers.go
View File

@ -161,15 +161,15 @@ func getNetworkNamespace(c *dockertypes.ContainerJSON) string {
// dockerFilter wraps around dockerfilters.Args and provides methods to modify // dockerFilter wraps around dockerfilters.Args and provides methods to modify
// the filter easily. // the filter easily.
type dockerFilter struct { type dockerFilter struct {
f *dockerfilters.Args args *dockerfilters.Args
} }
func newDockerFilter(args *dockerfilters.Args) *dockerFilter { func newDockerFilter(args *dockerfilters.Args) *dockerFilter {
return &dockerFilter{f: args} return &dockerFilter{args: args}
} }
func (f *dockerFilter) Add(key, value string) { func (f *dockerFilter) Add(key, value string) {
f.Add(key, value) f.args.Add(key, value)
} }
func (f *dockerFilter) AddLabel(key, value string) { func (f *dockerFilter) AddLabel(key, value string) {