Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit 3230b37

Browse files
committed
Update kubectl to 1.15 and add context to ./hack/tools
Signed-off-by: JoshVanL <[email protected]>
1 parent e1014c1 commit 3230b37

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ help: ## display this help
1111
UNAME_S := $(shell uname -s)
1212
ifeq ($(UNAME_S),Linux)
1313
SHASUM := sha256sum -c
14-
KUBECTL_URL := https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl
15-
KUBECTL_HASH := f3be209a48394e0e649b30ea376ce5093205fd6769c12e62c7ab39a0827c26fb
14+
KUBECTL_URL := https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl
15+
KUBECTL_HASH := ecec7fe4ffa03018ff00f14e228442af5c2284e57771e4916b977c20ba4e5b39
1616
GOLANGCILINT_URL := https://github.com/golangci/golangci-lint/releases/download/v1.15.0/golangci-lint-1.15.0-linux-amd64.tar.gz
1717
GOLANGCILINT_HASH := f37f4a15eb309578b0546703da5ea96bc5bd472f45f204338051aaca6fbbfc5b
1818
endif
1919
ifeq ($(UNAME_S),Darwin)
2020
SHASUM := shasum -a 256 -c
21-
KUBECTL_URL := https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/darwin/amd64/kubectl
22-
KUBECTL_HASH := 2ff06345a02636f1e6934f19dbc55452b587e06b2828c775dcdb29229c8da40f
21+
KUBECTL_URL := https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/darwin/amd64/kubectl
22+
KUBECTL_HASH := 63f1ace419edffa1f5ebb64a6c63597afd48f8d94a61d4fb44e820139adbbe54
2323
GOLANGCILINT_URL := https://github.com/golangci/golangci-lint/releases/download/v1.15.0/golangci-lint-1.15.0-darwin-amd64.tar.gz
2424
GOLANGCILINT_HASH := 083941efa692bfe3c29ba709964e9fe5896889316d51813e523157c96c3153e0
2525
endif
@@ -63,7 +63,9 @@ go_fmt:
6363
go_vet:
6464
go vet $$(go list ./pkg/... ./cmd/...)
6565

66-
# We have to make sure we omit ./hack/tools
66+
# We vendor packages using ./hack/tools with go modules for building binaries.
67+
# These files will fail linting since they use '_' importing with no usage so
68+
# must be ommited.
6769
go_lint: $(BINDIR)/golangci-lint ## lint golang code for problems
6870
go list -f '{{.Dir}}' ./... | fgrep -v hack/tools | xargs realpath --relative-to=. | xargs $(BINDIR)/golangci-lint run
6971

hack/tools/tools.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// Copyright Jetstack Ltd. See LICENSE for details.
22
package tools
33

4+
// This file is used to vendor packages we use to build binaries.
5+
// This is the current canonical way with go modules.
6+
47
//+build tools
58

69
import (

0 commit comments

Comments
 (0)