Merge pull request #157 from ncdc/client-go-5

Upgrade to client-go v5.0.1, kubernetes v1.8.2

Gopkg.toml

@@ -21,12 +21,16 @@
 #  version = "2.4.0"
 
 required = [
-  "k8s.io/kubernetes/cmd/libs/go2idl/client-gen",
-  "k8s.io/kubernetes/cmd/libs/go2idl/lister-gen",
-  "k8s.io/kubernetes/cmd/libs/go2idl/informer-gen"
+  "k8s.io/code-generator/cmd/client-gen",
+  # needed by generated clientsets, but not an explicit dep in client-gen itself
+  "k8s.io/apimachinery/pkg/apimachinery/registered",
+
+  "k8s.io/code-generator/cmd/deepcopy-gen",
+  "k8s.io/code-generator/cmd/defaulter-gen",
+  "k8s.io/code-generator/cmd/lister-gen",
+  "k8s.io/code-generator/cmd/informer-gen",
 ]
 
-
 [[constraint]]
   name = "cloud.google.com/go"
   version = "0.11.0"
@@ -85,16 +89,28 @@ required = [
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  revision = "1fd2e63a9a370677308a42f24fd40c86438afddf"
+  revision = "019ae5ada31de202164b118aee88ee2d14075c31"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "~4.0"
+  version = "~5.0"
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  version = "~1.7"
+  version = "~1.8"
 
 [[override]]
   name = "github.com/russross/blackfriday"
   revision = "93622da34e54fb6529bfb7c57e710f37a8d9cbd8"
+
+[[constraint]]
+  branch = "release-1.8"
+  name = "k8s.io/api"
+
+[[constraint]]
+  branch = "release-1.8"
+  name = "k8s.io/code-generator"
+
+[[override]]
+  name = "k8s.io/gengo"
+  revision = "9e661e9308f078838e266cca1c673922088c0ea4"

hack/boilerplate.go.txt

@@ -0,0 +1,15 @@
+/*
+Copyright YEAR the Heptio Ark contributors.
+
+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.
+*/

hack/test.sh

@@ -25,31 +25,4 @@ TARGETS=$(for d in "$@"; do echo ./$d/...; done)
 echo "Running tests:"
 go test -i -installsuffix "static" ${TARGETS}
 go test -installsuffix "static" -timeout 60s ${TARGETS}
-echo
-
-echo -n "Checking gofmt: "
-ERRS=$(find "$@" -type f -name \*.go | xargs gofmt -l 2>&1 || true)
-if [ -n "${ERRS}" ]; then
-    echo "FAIL - the following files need to be gofmt'ed:"
-    for e in ${ERRS}; do
-        echo "    $e"
-    done
-    echo
-    exit 1
-fi
-echo "PASS"
-echo
-
-# TODO(ncdc): there are govet failures in the generated clientset and the log error location hook
-# that prevent us from running vet at this time.
-#
-# echo -n "Checking go vet: "
-# ERRS=$(go vet ${TARGETS} 2>&1 || true)
-# if [ -n "${ERRS}" ]; then
-#     echo "FAIL"
-#     echo "${ERRS}"
-#     echo
-#     exit 1
-# fi
-# echo "PASS"
-# echo
+echo "Success!"

hack/update-fmt.sh

@@ -18,7 +18,9 @@ HACK_DIR=$(dirname "${BASH_SOURCE}")
 
 echo "Updating formatting"
 
-gofmt -w=true $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*")
-goimports -w=true -d $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*")
+gofmt -w -s $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*" -not -name "zz_generated*")
+
+command -v goimports > /dev/null || go get golang.org/x/tools/cmd/goimports
+goimports -w -d $(find . -type f -name "*.go" -not -path "./vendor/*" -not -path "./pkg/generated/*" -not -name "zz_generated*")
 
 echo "Success!"