github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-07 11:04:44 +00:00
Code Issues Projects Releases Wiki Activity

rename StoreToControllerLister -> StoreToReplicationControllerLister to make room for more controllers

Browse Source
This commit is contained in:
Mike Danese
2015-07-27 15:41:00 -07:00
parent 6e8648f828
commit d167fa27e0
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/replication_controller.go
View File

@@ -91,8 +91,8 @@ type ReplicationManager struct {
// A TTLCache of pod creates/deletes each rc expects to see
expectations RCExpectationsManager
// A store of controllers, populated by the rcController
controllerStore cache.StoreToControllerLister
// A store of replication controllers, populated by the rcController
rcStore cache.StoreToReplicationControllerLister
// A store of pods, populated by the podController
podStore cache.StoreToPodLister
// Watches changes to all replication controllers
@@ -120,7 +120,7 @@ func NewReplicationManager(kubeClient client.Interface, burstReplicas int) *Repl
queue: workqueue.New(),
}
rm.controllerStore.Store, rm.rcController = framework.NewInformer(
rm.rcStore.Store, rm.rcController = framework.NewInformer(
&cache.ListWatch{
ListFunc: func() (runtime.Object, error) {
return rm.kubeClient.ReplicationControllers(api.NamespaceAll).List(labels.Everything())
@@ -204,7 +204,7 @@ func (rm *ReplicationManager) Run(workers int, stopCh <-chan struct{}) {
// getPodControllers returns the controller managing the given pod.
// TODO: Surface that we are ignoring multiple controllers for a single pod.
func (rm *ReplicationManager) getPodControllers(pod *api.Pod) *api.ReplicationController {
controllers, err := rm.controllerStore.GetPodControllers(pod)
controllers, err := rm.rcStore.GetPodControllers(pod)
if err != nil {
glog.V(4).Infof("No controllers found for pod %v, replication manager will avoid syncing", pod.Name)
return nil
@@ -376,7 +376,7 @@ func (rm *ReplicationManager) syncReplicationController(key string) error {
glog.V(4).Infof("Finished syncing controller %q (%v)", key, time.Now().Sub(startTime))
}()
obj, exists, err := rm.controllerStore.Store.GetByKey(key)
obj, exists, err := rm.rcStore.Store.GetByKey(key)
if !exists {
glog.Infof("Replication Controller has been deleted %v", key)
rm.expectations.DeleteExpectations(key)