From c288f52d2f3a05c305c9e5fb54ca01374b84ffa3 Mon Sep 17 00:00:00 2001 From: Anthony Yeh Date: Sat, 25 Feb 2017 17:34:50 -0800 Subject: [PATCH] DaemonSet: Update Lister documentation for ControllerRef. The DaemonSet Listers still use selectors, because this is the behavior expected by callers. This clarifies the meaning of the returned list. Some callers may need to switch to using GetControllerOf() instead, but that is a separate, case-by-case issue. --- .../extensions/internalversion/daemonset_expansion.go | 5 +++-- pkg/client/listers/extensions/v1beta1/daemonset_expansion.go | 5 +++-- .../listers/extensions/v1beta1/daemonset_expansion.go | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/client/listers/extensions/internalversion/daemonset_expansion.go b/pkg/client/listers/extensions/internalversion/daemonset_expansion.go index c5073f3bca6..15c7cc7ea89 100644 --- a/pkg/client/listers/extensions/internalversion/daemonset_expansion.go +++ b/pkg/client/listers/extensions/internalversion/daemonset_expansion.go @@ -35,8 +35,9 @@ type DaemonSetListerExpansion interface { // DaemonSetNamespaeLister. type DaemonSetNamespaceListerExpansion interface{} -// GetPodDaemonSets returns a list of daemon sets managing a pod. -// Returns an error if and only if no matching daemon sets are found. +// GetPodDaemonSets returns a list of DaemonSets that potentially match a pod. +// Only the one specified in the Pod's ControllerRef will actually manage it. +// Returns an error only if no matching DaemonSets are found. func (s *daemonSetLister) GetPodDaemonSets(pod *api.Pod) ([]*extensions.DaemonSet, error) { var selector labels.Selector var daemonSet *extensions.DaemonSet diff --git a/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go b/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go index d3497414e99..b2144df4afc 100644 --- a/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go +++ b/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go @@ -35,8 +35,9 @@ type DaemonSetListerExpansion interface { // DaemonSetNamespaeLister. type DaemonSetNamespaceListerExpansion interface{} -// GetPodDaemonSets returns a list of daemon sets managing a pod. -// Returns an error if and only if no matching daemon sets are found. +// GetPodDaemonSets returns a list of DaemonSets that potentially match a pod. +// Only the one specified in the Pod's ControllerRef will actually manage it. +// Returns an error only if no matching DaemonSets are found. func (s *daemonSetLister) GetPodDaemonSets(pod *v1.Pod) ([]*v1beta1.DaemonSet, error) { var selector labels.Selector var daemonSet *v1beta1.DaemonSet diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go index dc17c105cf8..019cdc40a8a 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go @@ -35,8 +35,9 @@ type DaemonSetListerExpansion interface { // DaemonSetNamespaeLister. type DaemonSetNamespaceListerExpansion interface{} -// GetPodDaemonSets returns a list of daemon sets managing a pod. -// Returns an error if and only if no matching daemon sets are found. +// GetPodDaemonSets returns a list of DaemonSets that potentially match a pod. +// Only the one specified in the Pod's ControllerRef will actually manage it. +// Returns an error only if no matching DaemonSets are found. func (s *daemonSetLister) GetPodDaemonSets(pod *v1.Pod) ([]*v1beta1.DaemonSet, error) { var selector labels.Selector var daemonSet *v1beta1.DaemonSet