Skip to content

Commit 29a4b39

Browse files
authored
Merge pull request kubernetes#87382 from yiyang5055/fix-staticcheck
fix static check failure in pkg/controller/disruption and pkg/control…
2 parents 2808d71 + 53aff81 commit 29a4b39

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

hack/.staticcheck_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ cluster/images/etcd-version-monitor
22
cluster/images/etcd/migrate
33
pkg/controller/daemon
44
pkg/controller/deployment
5-
pkg/controller/disruption
65
pkg/controller/garbagecollector
7-
pkg/controller/namespace/deletion
86
pkg/controller/nodeipam
97
pkg/controller/podautoscaler
108
pkg/controller/podgc

pkg/controller/disruption/disruption_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -639,12 +639,9 @@ func TestReplicationController(t *testing.T) {
639639
// about the RC. This is a known bug. TODO(mml): file issue
640640
ps.VerifyPdbStatus(t, pdbName, 0, 0, 0, 0, map[string]metav1.Time{})
641641

642-
pods := []*v1.Pod{}
643-
644642
for i := int32(0); i < 3; i++ {
645643
pod, _ := newPod(t, fmt.Sprintf("foobar %d", i))
646644
updatePodOwnerToRc(t, pod, rc)
647-
pods = append(pods, pod)
648645
pod.Labels = labels
649646
add(t, dc.podStore, pod)
650647
dc.sync(pdbName)
@@ -680,12 +677,9 @@ func TestStatefulSetController(t *testing.T) {
680677
// about the SS. This is a known bug. TODO(mml): file issue
681678
ps.VerifyPdbStatus(t, pdbName, 0, 0, 0, 0, map[string]metav1.Time{})
682679

683-
pods := []*v1.Pod{}
684-
685680
for i := int32(0); i < 3; i++ {
686681
pod, _ := newPod(t, fmt.Sprintf("foobar %d", i))
687682
updatePodOwnerToSs(t, pod, ss)
688-
pods = append(pods, pod)
689683
pod.Labels = labels
690684
add(t, dc.podStore, pod)
691685
dc.sync(pdbName)

pkg/controller/namespace/deletion/namespaced_resources_deleter.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (d *namespacedResourcesDeleter) initOpCache() {
162162
if len(resources) == 0 {
163163
klog.Fatalf("Unable to get any supported resources from server: %v", err)
164164
}
165-
deletableGroupVersionResources := []schema.GroupVersionResource{}
165+
166166
for _, rl := range resources {
167167
gv, err := schema.ParseGroupVersion(rl.GroupVersion)
168168
if err != nil {
@@ -183,7 +183,6 @@ func (d *namespacedResourcesDeleter) initOpCache() {
183183
d.opCache.setNotSupported(operationKey{operation: op, gvr: gvr})
184184
}
185185
}
186-
deletableGroupVersionResources = append(deletableGroupVersionResources, gvr)
187186
}
188187
}
189188
}

0 commit comments

Comments
 (0)