Merge pull request #1255 from vincepri/fix-make-verify

Update controller-tools / fix CI verify step

Author: k8s-ci-robot

Makefile

@@ -198,7 +198,6 @@ clean-clientset: ## Remove all generated clientset files
 .PHONY: verify
 verify:
 	./hack/verify-boilerplate.sh
-	./hack/verify-clientset.sh
 	./hack/verify-bazel.sh
 	./hack/verify-doctoc.sh
 

api/v1alpha2/zz_generated.deepcopy.go

@@ -23,6 +23,6 @@ require (
 	k8s.io/klog v0.3.1
 	k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5
 	sigs.k8s.io/controller-runtime v0.2.0-beta.5
-	sigs.k8s.io/controller-tools v0.2.0-beta.5
+	sigs.k8s.io/controller-tools v0.2.0-beta.5.0.20190813195144-ba0eb80257fe
 	sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4
 )

go.mod

@@ -276,8 +276,8 @@ k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 sigs.k8s.io/controller-runtime v0.2.0-beta.5 h1:W2jTb239QEwQ+HejhTCF9GriFPy2zmo1I6pPmJTeEy8=
 sigs.k8s.io/controller-runtime v0.2.0-beta.5/go.mod h1:HweyYKQ8fBuzdu2bdaeBJvsFgAi/OqBBnrVGXcqKhME=
-sigs.k8s.io/controller-tools v0.2.0-beta.5 h1:imdq9hdihQFOjjtSXvJ3xfTm2FiFAUqGRlRLAo7Evxo=
-sigs.k8s.io/controller-tools v0.2.0-beta.5/go.mod h1:8t/X+FVWvk6TaBcsa+UKUBbn7GMtvyBKX30SGl4em6Y=
+sigs.k8s.io/controller-tools v0.2.0-beta.5.0.20190813195144-ba0eb80257fe h1:p7e8JxcC9XVcf+AKW1kpvaDtWCnLIJ/oEDCRx9x3wQE=
+sigs.k8s.io/controller-tools v0.2.0-beta.5.0.20190813195144-ba0eb80257fe/go.mod h1:8t/X+FVWvk6TaBcsa+UKUBbn7GMtvyBKX30SGl4em6Y=
 sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
 sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4 h1:GtDhkj3cF4A4IW+A9LScsuxvJqA9DE7G7PGH1f8B07U=
 sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=

go.sum

@@ -18,6 +18,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+command -v doctoc || echo "doctoc is not available on your system, skipping verification" && exit 0
+
 doctoc_files="README.md \
               CONTRIBUTING.md \
               cmd/clusterctl/README.md \
@@ -33,24 +35,24 @@ function check_doctoc(){
     changed_files=""
     for file in $doctoc_files
     do
-        res=$(git diff --cached $file)
+        res=$(git diff --cached "$file")
         if [ "$res" ]
         then
             changed_files="$changed_files\n$file"
         fi
     done
 
-    if [ $changed_files ];then
+    if [ "${changed_files}" ];then
         echo -e "Please update these files: $changed_files."
         echo "Update with doctoc FILENAME."
         echo "Re-commit with -n/--no-verify option."
-        exit -1
+        exit 1
     fi
 
 }
 
-doctoc $doctoc_files >/dev/null 2>&1
+doctoc "${doctoc_files}" >/dev/null 2>&1
 check=$(git diff)
-if [ ! -z "$check" ];then
+if [ -n "$check" ];then
     check_doctoc
 fi

hack/verify-clientset.sh

@@ -528,8 +528,8 @@ sigs.k8s.io/controller-runtime/pkg/scheme
 sigs.k8s.io/controller-runtime/pkg/client
 sigs.k8s.io/controller-runtime/pkg/client/config
 sigs.k8s.io/controller-runtime/pkg/manager
-sigs.k8s.io/controller-runtime/pkg/runtime/signals
 sigs.k8s.io/controller-runtime/pkg/runtime/log
+sigs.k8s.io/controller-runtime/pkg/runtime/signals
 sigs.k8s.io/controller-runtime/pkg/controller
 sigs.k8s.io/controller-runtime/pkg/handler
 sigs.k8s.io/controller-runtime/pkg/reconcile
@@ -563,7 +563,7 @@ sigs.k8s.io/controller-runtime/pkg/envtest/printer
 sigs.k8s.io/controller-runtime/pkg/internal/controller/metrics
 sigs.k8s.io/controller-runtime/pkg/internal/objectutil
 sigs.k8s.io/controller-runtime/pkg/conversion
-# sigs.k8s.io/controller-tools v0.2.0-beta.5
+# sigs.k8s.io/controller-tools v0.2.0-beta.5.0.20190813195144-ba0eb80257fe
 sigs.k8s.io/controller-tools/cmd/controller-gen
 sigs.k8s.io/controller-tools/pkg/crd
 sigs.k8s.io/controller-tools/pkg/deepcopy