Merge pull request #1061 from vincepri/prepare059

Prepare for v0.5.9

Author: k8s-ci-robot

Makefile

@@ -38,6 +38,7 @@ export GO111MODULE=on
 TOOLS_DIR := hack/tools
 TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
 GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/golangci-lint)
+GO_APIDIFF := $(TOOLS_BIN_DIR)/go-apidiff
 
 # The help will print out all targets with their descriptions organized bellow their categories. The categories are represented by `##@` and the target descriptions by `##`.
 # The awk commands is responsible to read the entire set of makefiles included in this invocation, looking for lines of the file as xyz: ## something, and then pretty-format the target and help. Then, if there's a line with ##@ something, that gets pretty-printed as a category.
@@ -60,7 +61,10 @@ test: ## Run the script check-everything.sh which will check all.
 ## --------------------------------------
 
 $(GOLANGCI_LINT): $(TOOLS_DIR)/go.mod # Build golangci-lint from tools folder.
-	cd $(TOOLS_DIR); go build -tags=tools -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
+	cd $(TOOLS_DIR) && go build -tags=tools -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
+
+$(GO_APIDIFF): $(TOOLS_DIR)/go.mod # Build go-apidiff from tools folder.
+	cd $(TOOLS_DIR) && go build -tags=tools -o bin/go-apidiff github.com/joelanford/go-apidiff
 
 ## --------------------------------------
 ## Linting

OWNERS_ALIASES

@@ -31,7 +31,6 @@ aliases:
   testing-integration-approvers:
   - apelisse
   - hoegaarden
-  - totherme
 
   # folks who may have context on ancient history,
   # but are no longer directly involved

hack/apidiff.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+#  Copyright 2018 The Kubernetes Authors.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+source $(dirname ${BASH_SOURCE})/common.sh
+
+REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+cd "${REPO_ROOT}"
+
+APIDIFF="hack/tools/bin/go-apidiff"
+
+header_text "fetching and building go-apidiff"
+make "${APIDIFF}"
+
+git status
+
+header_text "verifying api diff"
+header_text "invoking: '${APIDIFF} ${PULL_BASE_SHA} --print-compatible'"
+"${APIDIFF}" "${PULL_BASE_SHA}" --print-compatible

hack/test-all.sh

@@ -22,17 +22,16 @@ setup_envs
 
 header_text "running go test"
 
-# TODO(directxman12): enable the race detector once the LeaderElector race condition is resolved in client-go
-go test ${MOD_OPT} ./... -parallel 4
+go test ${MOD_OPT} ./...
 
 header_text "running coverage"
 
 # Verify no coverage regressions have been introduced.  Remove the exception list from here
 # once the coverage has been brought back up
-if [[ ! $(go test ${MOD_OPT} ./pkg/...  -coverprofile cover.out -parallel 4 | grep -v "coverage: 100.0% of statements" | grep "controller-runtime/pkg " | grep -v "controller-runtime/pkg \|controller-runtime/pkg/recorder \|pkg/cache\|pkg/client \|pkg/event \|pkg/client/config \|pkg/controller/controllertest \|pkg/reconcile/reconciletest \|pkg/test ") ]]; then
+if [[ ! $(go test ${MOD_OPT} ./pkg/...  -coverprofile cover.out | grep -v "coverage: 100.0% of statements" | grep "controller-runtime/pkg " | grep -v "controller-runtime/pkg \|controller-runtime/pkg/recorder \|pkg/cache\|pkg/client \|pkg/event \|pkg/client/config \|pkg/controller/controllertest \|pkg/reconcile/reconciletest \|pkg/test ") ]]; then
 echo "ok"
 else
-go test ${MOD_OPT} ./pkg/...  -coverprofile cover.out -parallel 4 | grep -v "coverage: 100.0% of statements" | grep "controller-runtime/pkg " | grep -v "controller-runtime/pkg \|controller-runtime/pkg/recorder \|pkg/cache\|pkg/client \|pkg/event \|pkg/client/config \|pkg/controller/controllertest \|pkg/reconcile/reconciletest \|pkg/test "
+go test ${MOD_OPT} ./pkg/...  -coverprofile cover.out | grep -v "coverage: 100.0% of statements" | grep "controller-runtime/pkg " | grep -v "controller-runtime/pkg \|controller-runtime/pkg/recorder \|pkg/cache\|pkg/client \|pkg/event \|pkg/client/config \|pkg/controller/controllertest \|pkg/reconcile/reconciletest \|pkg/test "
 echo "missing test coverage"
 exit 1
 fi

hack/tools/go.mod

@@ -2,4 +2,7 @@ module sigs.k8s.io/controller-runtime/hack/tools
 
 go 1.13
 
-require github.com/golangci/golangci-lint v1.23.6
+require (
+	github.com/golangci/golangci-lint v1.23.6
+	github.com/joelanford/go-apidiff v0.0.0-20191206194835-106bcff5f060
+)