github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Move image PullPolicy logic to pullImage().

Browse Source 
This will allow us to remove the Docker-specific logic in
pullImageAndRunContainer() and re-use pullImage() in other runtimes.
This commit is contained in:
Victor Marmol 2015-04-27 13:48:25 -07:00
parent aa487b7cab
commit b232eef5f7
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/kubelet/kubelet.go
View File

@ -847,21 +847,43 @@ func parseResolvConf(reader io.Reader) (nameservers []string, searches []string,
return nameservers, searches, nil return nameservers, searches, nil
} }
func (kl *Kubelet) pullImage(img string, ref *api.ObjectReference) error { // Pull the image for the specified pod and container.
func (kl *Kubelet) pullImage(pod *api.Pod, container *api.Container) error {
if container.ImagePullPolicy == api.PullNever {
return nil
}
start := time.Now() start := time.Now()
defer func() { defer func() {
metrics.ImagePullLatency.Observe(metrics.SinceInMicroseconds(start)) metrics.ImagePullLatency.Observe(metrics.SinceInMicroseconds(start))
}() }()
if err := kl.containerManager.Pull(img); err != nil { ref, err := kubecontainer.GenerateContainerRef(pod, container)
if err != nil {
glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
}
present, err := kl.containerManager.IsImagePresent(container.Image)
if err != nil {
if ref != nil { if ref != nil {
kl.recorder.Eventf(ref, "failed", "Failed to pull image %q: %v", img, err) kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q: %v", container.Image, err)
} }
glog.Errorf("Failed to inspect image %q: %v; skipping pod %q container %q", container.Image, err, kubecontainer.GetPodFullName(pod), container.Name)
return err return err
} }
if ref != nil {
kl.recorder.Eventf(ref, "pulled", "Successfully pulled image %q", img) if container.ImagePullPolicy == api.PullAlways ||
(container.ImagePullPolicy == api.PullIfNotPresent && (!present)) {
if err := kl.containerManager.Pull(container.Image); err != nil {
if ref != nil {
kl.recorder.Eventf(ref, "failed", "Failed to pull image %q: %v", container.Image, err)
}
return err
}
if ref != nil {
kl.recorder.Eventf(ref, "pulled", "Successfully pulled image %q", container.Image)
}
} }
return nil return nil
} }
@ -959,33 +981,15 @@ func shouldContainerBeRestarted(container *api.Container, pod *api.Pod, podStatu
// Attempts to start a container pulling the image before that if necessary. It returns DockerID of a started container // Attempts to start a container pulling the image before that if necessary. It returns DockerID of a started container
// if it was successful, and a non-nil error otherwise. // if it was successful, and a non-nil error otherwise.
func (kl *Kubelet) pullImageAndRunContainer(pod *api.Pod, container *api.Container, podInfraContainerID dockertools.DockerID) (dockertools.DockerID, error) { func (kl *Kubelet) pullImageAndRunContainer(pod *api.Pod, container *api.Container, podInfraContainerID dockertools.DockerID) (dockertools.DockerID, error) {
podFullName := kubecontainer.GetPodFullName(pod) if err := kl.pullImage(pod, container); err != nil {
ref, err := kubecontainer.GenerateContainerRef(pod, container) return "", err
if err != nil {
glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
}
if container.ImagePullPolicy != api.PullNever {
present, err := kl.containerManager.IsImagePresent(container.Image)
if err != nil {
if ref != nil {
kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q: %v", container.Image, err)
}
glog.Errorf("Failed to inspect image %q: %v; skipping pod %q container %q", container.Image, err, podFullName, container.Name)
return "", err
}
if container.ImagePullPolicy == api.PullAlways ||
(container.ImagePullPolicy == api.PullIfNotPresent && (!present)) {
if err := kl.pullImage(container.Image, ref); err != nil {
return "", err
}
}
} }
// TODO(dawnchen): Check RestartPolicy.DelaySeconds before restart a container // TODO(dawnchen): Check RestartPolicy.DelaySeconds before restart a container
namespaceMode := fmt.Sprintf("container:%v", podInfraContainerID) namespaceMode := fmt.Sprintf("container:%v", podInfraContainerID)
containerID, err := kl.containerManager.RunContainer(pod, container, kl, kl.handlerRunner, namespaceMode, namespaceMode) containerID, err := kl.containerManager.RunContainer(pod, container, kl, kl.handlerRunner, namespaceMode, namespaceMode)
if err != nil { if err != nil {
// TODO(bburns) : Perhaps blacklist a container after N failures? // TODO(bburns) : Perhaps blacklist a container after N failures?
glog.Errorf("Error running pod %q container %q: %v", podFullName, container.Name, err) glog.Errorf("Error running pod %q container %q: %v", kubecontainer.GetPodFullName(pod), container.Name, err)
return "", err return "", err
} }
return containerID, nil return containerID, nil