Skip to content

K
k3s
Unverified Commit 66ecee9c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #61402 from lcfang/test0319

Automatic merge from submit-queue (batch tested with PRs 61402, 61143, 61427, 60592). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. delete some unused code **What this PR does / why we need it**: delete some unused code **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 2f4d6b86 a3c1dfba
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
test/e2e/framework/nodes_util.go
View file @ 66ecee9c
...@@ -317,8 +317,7 @@ func CheckNodesReady(c clientset.Interface, nt time.Duration, expect int) ([]str ...@@ -317,8 +317,7 @@ func CheckNodesReady(c clientset.Interface, nt time.Duration, expect int) ([]str
go func() { result <- WaitForNodeToBeReady(c, n, timeout) }() go func() { result <- WaitForNodeToBeReady(c, n, timeout) }()
} }
failed := false failed := false
// TODO(mbforbes): Change to `for range` syntax once we support only Go
// >= 1.4.
for i := range nodeList.Items { for i := range nodeList.Items {
_ = i _ = i
if !<-result { if !<-result {
......
test/e2e/lifecycle/resize_nodes.go
View file @ 66ecee9c
...@@ -30,8 +30,6 @@ import ( ...@@ -30,8 +30,6 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
const resizeNodeReadyTimeout = 2 * time.Minute
func resizeRC(c clientset.Interface, ns, name string, replicas int32) error { func resizeRC(c clientset.Interface, ns, name string, replicas int32) error {
rc, err := c.CoreV1().ReplicationControllers(ns).Get(name, metav1.GetOptions{}) rc, err := c.CoreV1().ReplicationControllers(ns).Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
......
test/e2e/storage/persistent_volumes-local.go
View file @ 66ecee9c
...@@ -103,8 +103,7 @@ type localTestVolume struct { ...@@ -103,8 +103,7 @@ type localTestVolume struct {
const ( const (
// TODO: This may not be available/writable on all images. // TODO: This may not be available/writable on all images.
hostBase = "/tmp" hostBase = "/tmp"
containerBase = "/myvol"
// Path to the first volume in the test containers // Path to the first volume in the test containers
// created via createLocalPod or makeLocalPod // created via createLocalPod or makeLocalPod
// leveraging pv_util.MakePod // leveraging pv_util.MakePod
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment