Run integration tests with kind

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

.travis.yml

@@ -34,3 +34,10 @@ jobs:
       script:
         - go build -o out/skaffold.exe cmd/skaffold/skaffold.go
         - go test -short -timeout 60s ./...
+    - stage: integration
+      os: linux
+      go: "1.11.x"
+      before_install:
+        - curl -Lo ${HOME}/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.3.0/kind-linux-amd64
+        - chmod +x ${HOME}/bin/kind
+      script: make integration-in-kind

Makefile

@@ -148,19 +148,38 @@ release-build-in-docker:
 clean:
 	rm -rf $(BUILD_DIR)
 
-.PHONY: integration-in-docker
-integration-in-docker:
+.PHONY: kind-cluster
+kind-cluster:
+	kind get clusters | grep -q kind || kind create cluster
+
+.PHONY: skaffold-builder
+skaffold-builder:
 	-docker pull gcr.io/$(GCP_PROJECT)/skaffold-builder
 	docker build \
 		--cache-from gcr.io/$(GCP_PROJECT)/skaffold-builder \
 		-f deploy/skaffold/Dockerfile \
 		--target integration \
 		-t gcr.io/$(GCP_PROJECT)/skaffold-integration .
+
+.PHONY: integration-in-kind
+integration-in-kind: kind-cluster skaffold-builder
+	docker exec -it kind-control-plane cat /etc/kubernetes/admin.conf > /tmp/kind-config
+	echo '{}' > /tmp/docker-config
+	docker run --rm \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		-v /tmp/kind-config:/kind-config \
+		-v /tmp/docker-config:/root/.docker/config.json \
+		-e REMOTE_INTEGRATION=$(REMOTE_INTEGRATION) \
+		-e KUBECONFIG=/kind-config \
+		gcr.io/$(GCP_PROJECT)/skaffold-integration
+
+.PHONY: integration-in-docker
+integration-in-docker: skaffold-builder
 	docker run --rm \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v $(HOME)/.config/gcloud:/root/.config/gcloud \
 		-v $(GOOGLE_APPLICATION_CREDENTIALS):$(GOOGLE_APPLICATION_CREDENTIALS) \
-		-e REMOTE_INTEGRATION=true \
+		-e REMOTE_INTEGRATION=$(REMOTE_INTEGRATION) \
 		-e GCP_PROJECT=$(GCP_PROJECT) \
 		-e GKE_CLUSTER_NAME=$(GKE_CLUSTER_NAME) \
 		-e GKE_ZONE=$(GKE_ZONE) \

cmd/skaffold/app/cmd/config/util.go

@@ -19,6 +19,7 @@ package config
 import (
 	"io/ioutil"
 	"path/filepath"
+	"strings"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/context"
@@ -226,5 +227,10 @@ func GetInsecureRegistries() ([]string, error) {
 func isDefaultLocal(kubeContext string) bool {
 	return kubeContext == constants.DefaultMinikubeContext ||
 		kubeContext == constants.DefaultDockerForDesktopContext ||
-		kubeContext == constants.DefaultDockerDesktopContext
+		kubeContext == constants.DefaultDockerDesktopContext ||
+		IsKindCluster(kubeContext)
+}
+
+func IsKindCluster(kubeContext string) bool {
+	return strings.HasSuffix(kubeContext, "@kind")
 }

deploy/skaffold/Dockerfile

@@ -96,6 +96,11 @@ COPY . .
 FROM builder as integration
 ARG VERSION
 
+ENV KIND_VERSION=v0.3.0
+RUN curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64 && \
+  chmod +x kind && \
+  mv kind /usr/local/bin/
+
 RUN make out/skaffold-linux-amd64 VERSION=$VERSION && mv out/skaffold-linux-amd64 /usr/bin/skaffold
 
 CMD ["make", "integration"]

hack/kokoro/presubmit.sh

@@ -18,6 +18,6 @@ export DOCKER_NAMESPACE=gcr.io/k8s-skaffold
 source $KOKORO_GFILE_DIR/common.sh
 
 pushd $KOKORO_ARTIFACTS_DIR/github/skaffold >/dev/null
-    make integration-in-docker
+    REMOTE_INTEGRATION=true make integration-in-docker
 popd
 

pkg/skaffold/runner/build.go

@@ -19,9 +19,12 @@ package runner
 import (
 	"context"
 	"io"
+	"os/exec"
 
+	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -53,5 +56,16 @@ func (r *SkaffoldRunner) BuildAndTest(ctx context.Context, out io.Writer, artifa
 			return nil, errors.Wrap(err, "test failed")
 		}
 	}
+
+	// With `kind`, docker images have to be loaded with the `kind` CLI.
+	if config.IsKindCluster(r.runCtx.KubeContext) {
+		for _, image := range bRes {
+			cmd := exec.CommandContext(ctx, "kind", "load", "docker-image", image.Tag)
+			if err := util.RunCmd(cmd); err != nil {
+				return nil, errors.Wrapf(err, "unable to load image with kind: %s", image.Tag)
+			}
+		}
+	}
+
 	return bRes, err
 }