vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #420 from mrunalp/fix_hostname

Browse source 
Set the container hostname same as pod hostname
This commit is contained in:
Mrunal Patel 2017-03-31 07:35:49 -07:00 • committed by GitHub
commit fa467a30f1
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/container_create.go
View file

@ -435,6 +435,10 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
specgen.AddBindMount(sb.resolvPath, "/etc/resolv.conf", []string{"ro"})
}
if sb.hostname != "" {
specgen.SetHostname(sb.hostname)
}
specgen.AddAnnotation("ocid/name", containerName)
specgen.AddAnnotation("ocid/sandbox_id", sb.id)
specgen.AddAnnotation("ocid/sandbox_name", sb.infraContainer.Name())