Merge pull request #110 from LukeShu/lukeshu/generate

Miscellaneous generate script changes

Author: ericchiang

.travis.yml

@@ -9,6 +9,11 @@ go:
 services:
   - docker
 
+addons:
+  apt:
+    packages:
+    - bsdtar
+
 env:
   - K8S_CLIENT_TEST=1 KUBECONFIG=scripts/kubeconfig
 

Makefile

@@ -1,4 +1,4 @@
-KUBE_VERSION=1.10.1
+KUBE_VERSION=1.13.2
 
 build:
 	go build -v ./...
@@ -13,23 +13,23 @@ test-examples:
 
 .PHONY: generate
 generate: _output/kubernetes _output/bin/protoc _output/bin/gomvpkg _output/bin/protoc-gen-gofast _output/src/github.com/golang/protobuf
-	./scripts/generate.sh
-	go run scripts/register.go
+	GO111MODULE=off ./scripts/generate.sh
+	GO111MODULE=off go run scripts/register.go
 	cp scripts/json.go.partial apis/meta/v1/json.go
 
 .PHONY: verify-generate
 verify-generate: generate
 	./scripts/git-diff.sh
 
 _output/bin/protoc-gen-gofast:
-	./scripts/go-install.sh \
+	GO111MODULE=off ./scripts/go-install.sh \
 		https://github.com/gogo/protobuf \
 		github.com/gogo/protobuf \
 		github.com/gogo/protobuf/protoc-gen-gofast \
 		tags/v0.5
 
 _output/bin/gomvpkg:
-	./scripts/go-install.sh \
+	GO111MODULE=off ./scripts/go-install.sh \
 		https://github.com/golang/tools \
 		golang.org/x/tools \
 		golang.org/x/tools/cmd/gomvpkg \
@@ -44,7 +44,7 @@ _output/bin/protoc:
 _output/kubernetes:
 	mkdir -p _output
 	curl -o _output/kubernetes.zip -L https://github.com/kubernetes/kubernetes/archive/v$(KUBE_VERSION).zip
-	unzip _output/kubernetes.zip -d _output > /dev/null
+	bsdtar -x -f _output/kubernetes.zip -C _output > /dev/null
 	mv _output/kubernetes-$(KUBE_VERSION) _output/kubernetes
 
 .PHONY: clean