Merge pull request #99508 from wojtek-t/cleanup_describe_10

Move node_recreate test to cloud/gcp directory
This commit is contained in:
Kubernetes Prow Robot 2021-02-26 18:06:38 -08:00 committed by GitHub
commit f2d5ee2d2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions

View File

@ -11,6 +11,7 @@ go_library(
"kubelet_security.go",
"node_lease.go",
"reboot.go",
"recreate_node.go",
"resize_nodes.go",
"restart.go",
],
@ -37,6 +38,7 @@ go_library(
"//test/e2e/framework/network:go_default_library",
"//test/e2e/framework/node:go_default_library",
"//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/providers/gce:go_default_library",
"//test/e2e/framework/skipper:go_default_library",
"//test/e2e/framework/ssh:go_default_library",
"//test/e2e/upgrades:go_default_library",

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package node
package gcp
import (
"context"
@ -41,15 +41,7 @@ const (
recreateNodeReadyAgainTimeout = 10 * time.Minute
)
func nodeNames(nodes []v1.Node) []string {
result := make([]string, 0, len(nodes))
for i := range nodes {
result = append(result, nodes[i].Name)
}
return result
}
var _ = ginkgo.Describe("Recreate [Feature:Recreate]", func() {
var _ = SIGDescribe("Recreate [Feature:Recreate]", func() {
f := framework.NewDefaultFramework("recreate")
var originalNodes []v1.Node
var originalPodNames []string

View File

@ -14,7 +14,6 @@ go_library(
"pod_gc.go",
"pods.go",
"pre_stop.go",
"recreate_node.go",
"runtimeclass.go",
"security_context.go",
"ssh.go",
@ -47,7 +46,6 @@ go_library(
"//test/e2e/framework/node:go_default_library",
"//test/e2e/framework/perf:go_default_library",
"//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/providers/gce:go_default_library",
"//test/e2e/framework/rc:go_default_library",
"//test/e2e/framework/security:go_default_library",
"//test/e2e/framework/skipper:go_default_library",