Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hack/e2e.go #84696

Merged
merged 1 commit into from Nov 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion build/BUILD
Expand Up @@ -167,7 +167,6 @@ filegroup(
filegroup(
name = "test-portable-targets",
srcs = [
"//hack:e2e.go",
"//hack:get-build.sh",
"//hack:ginkgo-e2e.sh",
"//hack/e2e-internal:all-srcs",
Expand Down
15 changes: 0 additions & 15 deletions build/root/Makefile
Expand Up @@ -204,21 +204,6 @@ test-integration: generated_files
hack/make-rules/test-integration.sh $(WHAT)
endif

define TEST_E2E_HELP_INFO
# Build and run end-to-end tests.
#
# Example:
# make test-e2e
endef
.PHONY: test-e2e
ifeq ($(PRINT_HELP),y)
test-e2e:
@echo "$$TEST_E2E_HELP_INFO"
else
test-e2e: ginkgo generated_files
go run hack/e2e.go -- --build --up --test --down
endif

define TEST_E2E_NODE_HELP_INFO
# Build and run node end-to-end tests.
#
Expand Down
2 changes: 0 additions & 2 deletions cluster/addons/dns/nodelocaldns/README.md
Expand Up @@ -11,8 +11,6 @@ This feature is graduating to Beta in release 1.15.

This directory contains the addon config yaml - `nodelocaldns.yaml`
The variables will be substituted by the configure scripts when the yaml is copied into master.
To create a GCE cluster with nodelocaldns enabled, use the command:
`KUBE_ENABLE_NODELOCAL_DNS=true go run hack/e2e.go -v --up`

We have the following variables in the yaml:
`__PILLAR__DNS__SERVER__` - set to kube-dns service IP.
Expand Down
8 changes: 3 additions & 5 deletions cluster/gce/util.sh
Expand Up @@ -3857,7 +3857,7 @@ function check-resources() {
}

# -----------------------------------------------------------------------------
# Cluster specific test helpers used from hack/e2e.go
# Cluster specific test helpers

# Execute prior to running tests to build a release if required for env.
#
Expand All @@ -3868,8 +3868,7 @@ function test-build-release() {
"${KUBE_ROOT}/build/release.sh"
}

# Execute prior to running tests to initialize required structure. This is
# called from hack/e2e.go only when running -up.
# Execute prior to running tests to initialize required structure.
#
# Assumed vars:
# Variables from config.sh
Expand Down Expand Up @@ -3925,8 +3924,7 @@ function test-setup() {
done
}

# Execute after running tests to perform any required clean-up. This is called
# from hack/e2e.go
# Execute after running tests to perform any required clean-up.
function test-teardown() {
detect-project
echo "Shutting down test cluster in background."
Expand Down
28 changes: 2 additions & 26 deletions cluster/gce/windows/README-GCE-Windows-kube-up.md
Expand Up @@ -78,9 +78,9 @@ export KUBERNETES_NODE_PLATFORM=windows
export LOGGING_STACKDRIVER_RESOURCE_TYPES=new
```

Now bring up a cluster using one of the following two methods:
Now bring up a cluster using kube-up script:

#### 2a. Create a regular Kubernetes cluster
#### 2. Create a regular Kubernetes cluster

```
# Invoke kube-up.sh with these environment variables:
Expand All @@ -95,30 +95,6 @@ To teardown the cluster run:
PROJECT=${CLOUDSDK_CORE_PROJECT} KUBERNETES_SKIP_CONFIRM=y ./cluster/kube-down.sh
```

#### 2b. Create a Kubernetes end-to-end (E2E) test cluster

If you have built your own release binaries following step 1, run the following
command:
```
PROJECT=${CLOUDSDK_CORE_PROJECT} go run ./hack/e2e.go -- --up
```

Otherwise, you can specify what branch from which to get the release artifacts:
```
# Get the latest build from the stable1 branch
PROJECT=${CLOUDSDK_CORE_PROJECT} go run ./hack/e2e.go -- --up --extract=ci/k8s-stable1
# Or Get the latest build from master
PROJECT=${CLOUDSDK_CORE_PROJECT} go run ./hack/e2e.go -- --up --extract=ci-cross/latest
```

This command, by default, tears down any existing E2E cluster and creates a new
one. To teardown the cluster run the same command with `--down` instead of
`--up`.

No matter what type of cluster you chose to create, the result should be a
Kubernetes cluster with one Linux master node, `NUM_NODES` Linux worker nodes
and `NUM_WINDOWS_NODES` Windows worker nodes.

## Validating the cluster

Invoke this script to run a smoke test that verifies that the cluster has been
Expand Down
25 changes: 0 additions & 25 deletions hack/BUILD
@@ -1,12 +1,5 @@
package(default_visibility = ["//visibility:public"])

load(
"@io_bazel_rules_go//go:def.bzl",
"go_binary",
"go_library",
"go_test",
)

filegroup(
name = "package-srcs",
srcs = glob(["**"]),
Expand Down Expand Up @@ -55,24 +48,6 @@ test_suite(
],
)

go_binary(
name = "hack",
embed = [":go_default_library"],
)

go_test(
name = "go_default_test",
srcs = ["e2e_test.go"],
data = glob(["testdata/**"]),
embed = [":go_default_library"],
)

go_library(
name = "go_default_library",
srcs = ["e2e.go"],
importpath = "k8s.io/kubernetes/hack",
)

sh_binary(
name = "update-mirror",
srcs = ["update-workspace-mirror.sh"],
Expand Down
170 changes: 0 additions & 170 deletions hack/e2e.go

This file was deleted.