github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13516 from samsabed/backoff-image-reason

Browse Source 
backoff image pulling on failure
This commit is contained in:
Piotr Szczesniak
2015-10-08 13:05:32 +02:00
parent d9a392790a fdf712cd84
commit 95b293c615
14 changed files with 343 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/rkt/rkt.go
View File

@@ -113,7 +113,7 @@ func New(config *Config,
recorder record.EventRecorder,
containerRefManager *kubecontainer.RefManager,
prober prober.Prober,
volumeGetter volumeGetter) (*Runtime, error) {
volumeGetter volumeGetter, imageBackOff *util.Backoff) (*Runtime, error) {
systemdVersion, err := getSystemdVersion()
if err != nil {
@@ -153,7 +153,7 @@ func New(config *Config,
prober: prober,
volumeGetter: volumeGetter,
}
rkt.imagePuller = kubecontainer.NewImagePuller(recorder, rkt)
rkt.imagePuller = kubecontainer.NewImagePuller(recorder, rkt, imageBackOff)
// Test the rkt version.
version, err := rkt.Version()
@@ -418,7 +418,7 @@ func (r *Runtime) makePodManifest(pod *api.Pod, pullSecrets []api.Secret) (*appc
manifest := appcschema.BlankPodManifest()
for _, c := range pod.Spec.Containers {
if err := r.imagePuller.PullImage(pod, &c, pullSecrets); err != nil {
if err, _ := r.imagePuller.PullImage(pod, &c, pullSecrets); err != nil {
return nil, err
}
imgManifest, err := r.getImageManifest(c.Image)