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

Merge pull request #49470 from jianglingxia/jlx72414

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45345, 49470, 49407, 49448, 49486)

statefulset_expansion.go delete ps define

reopen #46157 

**Release note**:

```release-note
NONE
This commit is contained in:
Kubernetes Submit Queue 2017-07-24 07:40:50 -07:00 committed by GitHub
commit 5dbef94aaf
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/listers/apps/internalversion/statefulset_expansion.go
View File

@ -40,7 +40,6 @@ type StatefulSetNamespaceListerExpansion interface{}
// Returns an error only if no matching StatefulSets are found. // Returns an error only if no matching StatefulSets are found.
func (s *statefulSetLister) GetPodStatefulSets(pod *api.Pod) ([]*apps.StatefulSet, error) { func (s *statefulSetLister) GetPodStatefulSets(pod *api.Pod) ([]*apps.StatefulSet, error) {
var selector labels.Selector var selector labels.Selector
var ps *apps.StatefulSet
if len(pod.Labels) == 0 { if len(pod.Labels) == 0 {
return nil, fmt.Errorf("no StatefulSets found for pod %v because it has no labels", pod.Name) return nil, fmt.Errorf("no StatefulSets found for pod %v because it has no labels", pod.Name)
@ -52,8 +51,7 @@ func (s *statefulSetLister) GetPodStatefulSets(pod *api.Pod) ([]*apps.StatefulSe
} }
var psList []*apps.StatefulSet var psList []*apps.StatefulSet
for i := range list { for _, ps := range list {
ps = list[i]
if ps.Namespace != pod.Namespace { if ps.Namespace != pod.Namespace {
continue continue
} }