Skip to content

Use the kind that’s inside skaffold-builder #3430

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

Merged
merged 1 commit into from
Jan 6, 2020
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,8 @@ jobs:
- os: linux
name: "integration"
language: minimal
before_install:
- curl -Lo ${HOME}/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.6.1/kind-linux-amd64
- chmod +x ${HOME}/bin/kind
script:
- make -j integration-in-kind
- make integration-in-kind
cache:
directories:
- $HOME/.cache/go-build
Expand Down
18 changes: 8 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,6 @@ release-build: cross
clean:
rm -rf $(BUILD_DIR) hack/bin

.PHONY: kind-cluster
kind-cluster:
kind get clusters | grep -q kind || TERM=dumb time kind create cluster --image=kindest/node:v1.13.12@sha256:ad1dd06aca2b85601f882ba1df4fdc03d5a57b304652d0e81476580310ba6289

.PHONY: skaffold-builder
skaffold-builder:
time docker build \
Expand All @@ -168,18 +164,20 @@ skaffold-builder:
-t gcr.io/$(GCP_PROJECT)/skaffold-builder .

.PHONY: integration-in-kind
integration-in-kind: kind-cluster skaffold-builder
kind get kubeconfig --internal > /tmp/kind-config
integration-in-kind: skaffold-builder
echo '{}' > /tmp/docker-config
time docker run --rm \
docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(HOME)/.gradle:/root/.gradle \
-v $(HOME)/.cache:/root/.cache \
-v /tmp/kind-config:/kind-config \
-v /tmp/docker-config:/root/.docker/config.json \
-e KUBECONFIG=/kind-config \
-e KUBECONFIG=/tmp/kind-config \
gcr.io/$(GCP_PROJECT)/skaffold-builder \
make integration
sh -c ' \
kind get clusters | grep -q kind || TERM=dumb kind create cluster --image=kindest/node:v1.13.12@sha256:ad1dd06aca2b85601f882ba1df4fdc03d5a57b304652d0e81476580310ba6289; \
kind get kubeconfig --internal > /tmp/kind-config; \
make integration \
'

.PHONY: integration-in-docker
integration-in-docker: skaffold-builder
Expand Down