Merge pull request #6322 from dchen1107/cleanup

Using gcr.io/google_containers/pause by default
This commit is contained in:
Jeff Lowdermilk 2015-04-01 16:28:51 -07:00
commit 412a836bf7

View File

@ -858,7 +858,7 @@ func (kl *Kubelet) killContainerByID(ID string) error {
}
const (
PodInfraContainerImage = "kubernetes/pause:latest"
PodInfraContainerImage = "gcr.io/google_containers/pause:0.8.0"
)
// Determined whether the specified pod is allowed to use host networking