Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added unit tests in "kube-fledged/pkg/images" #36

Merged
merged 3 commits into from
Dec 4, 2018
Merged

Added unit tests in "kube-fledged/pkg/images" #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b72484
added unit tests for pullImage() and deleteImage()
senthilrch Dec 3, 2018
88d9bac
added unit tests for handlePodStatusChange()
senthilrch Dec 4, 2018
5879f70
added unit tests for updateImageCacheStatus()
senthilrch Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/app/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func NewController(
imageCacheRefreshFrequency: imageCacheRefreshFrequency,
}

imageManager := images.NewImageManager(controller.workqueue, controller.imageworkqueue, controller.kubeclientset, fledgedNameSpace, imagePullDeadlineDuration, dockerClientImage, imagePullPolicy)
imageManager, _ := images.NewImageManager(controller.workqueue, controller.imageworkqueue, controller.kubeclientset, fledgedNameSpace, imagePullDeadlineDuration, dockerClientImage, imagePullPolicy)
controller.imageManager = imageManager

glog.Info("Setting up event handlers")
Expand Down
16 changes: 12 additions & 4 deletions pkg/images/image_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
kubeinformers "k8s.io/client-go/informers"
coreinformers "k8s.io/client-go/informers/core/v1"
"k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
Expand Down Expand Up @@ -107,7 +108,7 @@ func NewImageManager(
kubeclientset kubernetes.Interface,
namespace string,
imagePullDeadlineDuration time.Duration,
dockerClientImage, imagePullPolicy string) *ImageManager {
dockerClientImage, imagePullPolicy string) (*ImageManager, coreinformers.PodInformer) {

kubeInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(
kubeclientset,
Expand Down Expand Up @@ -145,7 +146,7 @@ func NewImageManager(
},
//DeleteFunc: ,
})
return imagemanager
return imagemanager, podInformer
}

func (m *ImageManager) handlePodStatusChange(pod *corev1.Pod) {
Expand Down Expand Up @@ -248,7 +249,7 @@ func (m *ImageManager) updatePendingImageWorkResults(imageCacheName string) erro
return nil
}

func (m *ImageManager) updateImageCacheStatus(imageCacheName string) {
func (m *ImageManager) updateImageCacheStatus(imageCacheName string, errCh chan<- error) {
wait.Poll(time.Second, m.imagePullDeadlineDuration,
func() (done bool, err error) {
m.lock.RLock()
Expand All @@ -268,6 +269,7 @@ func (m *ImageManager) updateImageCacheStatus(imageCacheName string) {
err := m.updatePendingImageWorkResults(imageCacheName)
if err != nil {
glog.Errorf("Error from updatePendingImageWorkResults(): %v", err)
errCh <- err
return
}
glog.V(4).Info("m.updatePendingImageWorkResults exited successfully")
Expand All @@ -290,25 +292,30 @@ func (m *ImageManager) updateImageCacheStatus(imageCacheName string) {
Delete(job, &metav1.DeleteOptions{PropagationPolicy: &deletePropagation}); err != nil {
glog.Errorf("Error deleting job %s: %v", job, err)
m.lock.Unlock()
errCh <- err
return
}
}
}
m.lock.Unlock()
if imageCache == nil {
glog.Errorf("Unable to obtain reference to image cache")
errCh <- fmt.Errorf("Unable to obtain reference to image cache")
return
}
objKey, err := cache.MetaNamespaceKeyFunc(imageCache)
if err != nil {
glog.Errorf("Error from cache.MetaNamespaceKeyFunc(imageCache): %v", err)
errCh <- err
return
}
m.workqueue.AddRateLimited(WorkQueueKey{
WorkType: ImageCacheStatusUpdate,
Status: &iwstatus,
ObjKey: objKey,
})

errCh <- nil
return
}

Expand Down Expand Up @@ -374,7 +381,8 @@ func (m *ImageManager) processNextWorkItem() bool {

if iwr.Image == "" && iwr.Node == "" {
m.imageworkqueue.Forget(obj)
go m.updateImageCacheStatus(iwr.Imagecache.Name)
errCh := make(chan error)
go m.updateImageCacheStatus(iwr.Imagecache.Name, errCh)
return nil
}
// Run the syncHandler, passing it the namespace/name string of the
Expand Down
Loading