Skip to content

Commit 4163fd9

Browse files
author
Kenichi Omichi
committed
Move recreate_node.go to e2e/node
e2e/framework is a place to keep common functions for e2e tests, and it is not a place to keep e2e tests themself. recreate_node.go is e2e test for node. This moves recreate_node.go to e2e/node.
1 parent aa348b1 commit 4163fd9

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

test/e2e/framework/providers/gce/BUILD

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,22 @@ go_library(
66
"firewall.go",
77
"gce.go",
88
"ingress.go",
9-
"recreate_node.go",
109
"util.go",
1110
],
1211
importpath = "k8s.io/kubernetes/test/e2e/framework/providers/gce",
1312
visibility = ["//visibility:public"],
1413
deps = [
1514
"//staging/src/k8s.io/api/core/v1:go_default_library",
1615
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
17-
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
18-
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
1916
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
2017
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
2118
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
2219
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
2320
"//staging/src/k8s.io/cloud-provider:go_default_library",
2421
"//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library",
2522
"//test/e2e/framework:go_default_library",
26-
"//test/e2e/framework/node:go_default_library",
27-
"//test/e2e/framework/pod:go_default_library",
2823
"//test/e2e/framework/pv:go_default_library",
2924
"//test/e2e/framework/service:go_default_library",
30-
"//test/e2e/framework/skipper:go_default_library",
31-
"//test/utils:go_default_library",
3225
"//vendor/github.com/onsi/ginkgo:go_default_library",
3326
"//vendor/google.golang.org/api/compute/v1:go_default_library",
3427
"//vendor/google.golang.org/api/googleapi:go_default_library",

test/e2e/node/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ go_library(
1414
"pod_gc.go",
1515
"pods.go",
1616
"pre_stop.go",
17+
"recreate_node.go",
1718
"runtimeclass.go",
1819
"security_context.go",
1920
"ssh.go",
@@ -49,6 +50,7 @@ go_library(
4950
"//test/e2e/framework/node:go_default_library",
5051
"//test/e2e/framework/perf:go_default_library",
5152
"//test/e2e/framework/pod:go_default_library",
53+
"//test/e2e/framework/providers/gce:go_default_library",
5254
"//test/e2e/framework/rc:go_default_library",
5355
"//test/e2e/framework/security:go_default_library",
5456
"//test/e2e/framework/skipper:go_default_library",

test/e2e/framework/providers/gce/recreate_node.go renamed to test/e2e/node/recreate_node.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package gce
17+
package node
1818

1919
import (
2020
"context"
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/kubernetes/test/e2e/framework"
3131
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3232
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
33+
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
3334
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3435
testutils "k8s.io/kubernetes/test/utils"
3536
)
@@ -103,12 +104,12 @@ var _ = ginkgo.Describe("Recreate [Feature:Recreate]", func() {
103104

104105
// Recreate all the nodes in the test instance group
105106
func testRecreate(c clientset.Interface, ps *testutils.PodStore, systemNamespace string, nodes []v1.Node, podNames []string) {
106-
err := RecreateNodes(c, nodes)
107+
err := gce.RecreateNodes(c, nodes)
107108
if err != nil {
108109
framework.Failf("Test failed; failed to start the restart instance group command.")
109110
}
110111

111-
err = WaitForNodeBootIdsToChange(c, nodes, recreateNodeReadyAgainTimeout)
112+
err = gce.WaitForNodeBootIdsToChange(c, nodes, recreateNodeReadyAgainTimeout)
112113
if err != nil {
113114
framework.Failf("Test failed; failed to recreate at least one node in %v.", recreateNodeReadyAgainTimeout)
114115
}

0 commit comments

Comments
 (0)