Merge pull request #3775 from dgageot/go1.14

Go 1.14

.travis.yml

@@ -1,7 +1,7 @@
 dist: xenial
 
 language: go
-go: "1.13.x"
+go: "1.14.x"
 go_import_path: /skaffold
 
 git:
@@ -42,9 +42,6 @@ jobs:
           - $HOME/.cache/go-build
     - os: windows
       name: "Windows unit"
-      env:
-        - GO111MODULE=on
-        - GOFLAGS="-mod=vendor"
       script:
         - go test -short -timeout 60s ./...
       cache:

DEVELOPMENT.md

@@ -9,7 +9,7 @@ This doc explains the development workflow so you can get started
 You must install these tools:
 
 1. [`go`](https://golang.org/doc/install): The language skaffold is
-   built in (version >= go 1.13)
+   built in (version >= go 1.14)
 1. [`git`](https://help.github.com/articles/set-up-git/): For source control
 1. [`make`](https://www.gnu.org/software/make/): For building skaffold.
 1. [`golangci-lint`](https://github.com/golangci/golangci-lint): You can use the

Makefile

@@ -41,11 +41,6 @@ ifeq "$(strip $(VERSION))" ""
  override VERSION = $(shell git describe --always --tags --dirty)
 endif
 
-# Force using Go Modules and always read the dependencies from
-# the `vendor` folder.
-export GO111MODULE = on
-export GOFLAGS = -mod=vendor
-
 LDFLAGS_linux = -static
 LDFLAGS_darwin =
 LDFLAGS_windows =
@@ -80,16 +75,16 @@ install: $(BUILD_DIR)/$(PROJECT)
 .PHONY: cross
 cross: $(foreach platform, $(SUPPORTED_PLATFORMS), $(BUILD_DIR)/$(PROJECT)-$(platform).sha256)
 
-$(BUILD_DIR)/$(PROJECT)-%-$(GOARCH): $(STATIK_FILES) $(GO_FILES) $(BUILD_DIR)
+$(BUILD_DIR)/$(PROJECT)-%-$(GOARCH): $(STATIK_FILES) $(GO_FILES) $(BUILD_DIR) deploy/cross/Dockerfile
 	docker build \
-		--build-arg PROJECT=$(REPOPATH) \
-		--build-arg TARGETS=$*/$(GOARCH) \
-		--build-arg FLAG_LDFLAGS=$(GO_LDFLAGS_$(*)) \
-		--build-arg FLAG_TAGS=$(GO_BUILD_TAGS_$(*)) \
+		--build-arg GOOS=$* \
+		--build-arg GOARCH=$(GOARCH) \
+		--build-arg TAGS=$(GO_BUILD_TAGS_$(*)) \
+		--build-arg LDFLAGS=$(GO_LDFLAGS_$(*)) \
 		-f deploy/cross/Dockerfile \
 		-t skaffold/cross \
 		.
-	docker run --rm --entrypoint sh skaffold/cross -c "cat /build/skaffold*" > $@
+	docker run --rm skaffold/cross cat /build/skaffold > $@
 
 %.sha256: %
 	shasum -a 256 $< > $@

Makefile.diag

@@ -21,11 +21,6 @@ VERSION_PACKAGE = $(REPOPATH)/pkg/diag/version
 
 TEST_PACKAGES := $(shell go list ./pkg/diag/...)
 
-# Force using Go Modules and always read the dependencies from
-# the `vendor` folder.
-export GO111MODULE = on
-export GOFLAGS = -mod=vendor
-
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
 

deploy/cross/Dockerfile

@@ -12,20 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM karalabe/xgo-1.13.4
+FROM dockercore/golang-cross:1.13.8 as base
 
-ARG PROJECT
-ARG FLAG_LDFLAGS
-ARG FLAG_TAGS
-ARG TARGETS
+# The base image is not yet available for go 1.14.
+# Let's just replace the Go that's installed with a newer one.
+RUN rm -Rf /usr/local/go && mkdir /usr/local/go
+RUN curl --fail --show-error --silent --location https://dl.google.com/go/go1.14.linux-amd64.tar.gz \
+    | tar xz --directory=/usr/local/go --strip-components=1
 
-ENV PACK cmd/skaffold
-ENV EXT_GOPATH /ext-go
-ENV FLAG_LDFLAGS $FLAG_LDFLAGS
-ENV TARGETS $TARGETS
-ENV FLAG_TAGS $FLAG_TAGS
-ENV GO111MODULE off
+# Cross compile Skaffold for Linux, Windows and MacOS
+ARG GOOS
+ARG GOARCH
+ARG TAGS
+ARG LDFLAGS
 
-WORKDIR /ext-go/src/$PROJECT
-COPY . .
-RUN /build.sh $PROJECT
+WORKDIR /skaffold
+COPY . ./
+RUN if [ "$GOOS" = "darwin" ]; then export CC=o64-clang CXX=o64-clang++; fi; \
+    GOOS=$GOOS GOARCH=$GOARCH CGO_ENABLED=1 \
+    go build -tags "${TAGS}" -ldflags "${LDFLAGS}" -o /build/skaffold ./cmd/skaffold

deploy/skaffold/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # This base image has to be updated manually after running `make build_deps`
-FROM gcr.io/k8s-skaffold/build_deps:d414a205df8d8307c92eff8e577cbf2691e46a34 as builder
+FROM gcr.io/k8s-skaffold/build_deps:28bbb2cbb0f23cc7a8af602c0513b3bcd74aa911 as builder
 WORKDIR /skaffold
 COPY . .
 

deploy/skaffold/Dockerfile.deps

@@ -106,5 +106,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
     jq \
     apt-transport-https && \
     rm -rf /var/lib/apt/lists/*
-COPY --from=golang:1.13 /usr/local/go /usr/local/go
+COPY --from=golang:1.14 /usr/local/go /usr/local/go
 ENV PATH /usr/local/go/bin:/root/go/bin:$PATH

deploy/webhook/Dockerfile

@@ -44,7 +44,7 @@ COPY --from=download-docsy /docsy ./themes/docsy
 COPY --from=download-hugo /hugo /usr/local/bin/
 COPY --from=download-kubectl /kubectl /usr/local/bin/
 
-FROM golang:1.13 as webhook
+FROM golang:1.14 as webhook
 WORKDIR /skaffold
 COPY . .
 RUN go build -mod=vendor -o /webhook webhook/webhook.go

go.mod

@@ -1,6 +1,6 @@
 module github.com/GoogleContainerTools/skaffold
 
-go 1.13
+go 1.14
 
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.0.1+incompatible