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.

Sign up for GitHub

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

⚠️ Use Kind's default network in CAPD #4002

Merged
merged 1 commit into from
Dec 15, 2020
Merged

⚠️ Use Kind's default network in CAPD #4002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/book/src/developer/testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ Following guidelines should be followed when developing E2E tests:
See [e2e development] for more information on developing e2e tests for CAPI and external providers.

## Running the end-to-end tests
Before running the tests, ensure kind is using the default **bridge** network. This can be done by exporting the variable `KIND_EXPERIMENTAL_DOCKER_NETWORK`:
```bash
export KIND_EXPERIMENTAL_DOCKER_NETWORK=bridge
```

`make docker-build-e2e` will build the images for all providers that will be needed for the e2e test.

Expand Down
4 changes: 0 additions & 4 deletions docs/book/src/user/quick-start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ please follow the additional instructions in the dedicated tab:
{{#tabs name:"install-kind" tabs:"v0.9.x,Docker"}}
{{#tab v0.9.x}}

Export the variable **KIND_EXPERIMENTAL_DOCKER_NETWORK=bridge** to let kind run in the default **bridge** network:
```bash
export KIND_EXPERIMENTAL_DOCKER_NETWORK=bridge
```
Create the kind cluster:
```bash
kind create cluster
Expand Down
1 change: 0 additions & 1 deletion scripts/ci-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export E2E_CONF_FILE="${REPO_ROOT}/test/e2e/config/docker.yaml"
export ARTIFACTS="${ARTIFACTS:-${REPO_ROOT}/_artifacts}"
export SKIP_RESOURCE_CLEANUP=false
export USE_EXISTING_CLUSTER=false
export KIND_EXPERIMENTAL_DOCKER_NETWORK="bridge"

# Run e2e tests
mkdir -p "$ARTIFACTS"
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/docker/kind_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ func createNode(name, image, clusterLabel, role string, mounts []v1alpha4.Mount,
// some k8s things want to read /lib/modules
"--volume", "/lib/modules:/lib/modules:ro",
"--hostname", name, // make hostname match container name
"--network", defaultNetwork,
"--name", name, // ... and set the container name
// label the node with the cluster ID
"--label", clusterLabel,
Expand Down Expand Up @@ -186,8 +187,7 @@ type proxyDetails struct {
}

const (
// Docker default bridge network is named "bridge" (https://docs.docker.com/network/bridge/#use-the-default-bridge-network)
defaultNetwork = "bridge"
defaultNetwork = "kind"
httpProxy = "HTTP_PROXY"
httpsProxy = "HTTPS_PROXY"
noProxy = "NO_PROXY"
Expand Down