Update the version of code generator and regenerate (#178)

Signed-off-by: Arjun Naik <[email protected]>

Author: arjunrn

go.mod

@@ -1,34 +1,29 @@
 module github.com/zalando-incubator/stackset-controller
 
-go 1.12
+go 1.13
 
 require (
 	github.com/alecthomas/kingpin v2.2.6+incompatible
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/gogo/protobuf v1.2.1 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/emicklei/go-restful v2.11.1+incompatible // indirect
+	github.com/go-openapi/jsonreference v0.19.3 // indirect
+	github.com/go-openapi/spec v0.19.4 // indirect
 	github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
-	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.3.1
 	github.com/googleapis/gnostic v0.2.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
-	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/mailru/easyjson v0.7.0 // indirect
 	github.com/prometheus/client_golang v1.2.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/pflag v1.0.2 // indirect
 	github.com/stretchr/testify v1.4.0
-	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
-	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
+	golang.org/x/tools v0.0.0-20191210221141-98df12377212 // indirect
+	gonum.org/v1/gonum v0.6.1 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/api v0.0.0-20181004124137-fd83cbc87e76
-	k8s.io/apimachinery v0.0.0-20180913025736-6dd46049f395
-	k8s.io/client-go v9.0.0+incompatible
-	k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 // indirect
+	gopkg.in/yaml.v2 v2.2.7 // indirect
+	k8s.io/api v0.0.0-20191121175643-4ed536977f46
+	k8s.io/apimachinery v0.0.0-20191121175448-79c2a76c473a
+	k8s.io/client-go v0.0.0-20191202165906-e3970fe37d8a
+	k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
+	k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e // indirect
 )

go.sum

@@ -0,0 +1,19 @@
+// +build tools
+
+/*
+Copyright 2019 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.
+*/
+
+// This package imports things required by build scripts, to force `go mod` to see them as dependencies
+package tools
+
+import _ "k8s.io/code-generator"

hack/tools.go

@@ -23,38 +23,17 @@ GOPKG="$SRC/zalando-incubator/stackset-controller"
 CUSTOM_RESOURCE_NAME="zalando.org"
 CUSTOM_RESOURCE_VERSION="v1"
 
-SCRIPT_ROOT="$(dirname ${BASH_SOURCE})/.."
-
-# special setup for go modules
-CODE_GEN_K8S_VERSION="b1289fc74931d4b6b04bd1a259acfc88a2cb0a66" # 1.12.8 (https://github.com/kubernetes/code-generator/releases/tag/kubernetes-1.12.8)
-packages=(
-defaulter-gen
-client-gen
-lister-gen
-informer-gen
-deepcopy-gen
-)
-mkdir -p build
-for pkg in "${packages[@]}"; do
-    go get "k8s.io/code-generator/cmd/${pkg}@${CODE_GEN_K8S_VERSION}"
-done
-# use vendor/ as a temporary stash for code-generator.
-rm -rf "${SCRIPT_ROOT}/vendor/k8s.io/code-generator"
-rm -rf "${SCRIPT_ROOT}/vendor/k8s.io/gengo"
-git clone --branch=release-1.12 https://github.com/kubernetes/code-generator.git "${SCRIPT_ROOT}/vendor/k8s.io/code-generator"
-git clone https://github.com/kubernetes/gengo.git "${SCRIPT_ROOT}/vendor/k8s.io/gengo"
+SCRIPT_ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+OUTPUT_BASE="$(dirname ${BASH_SOURCE})/"
 
-CODEGEN_PKG="${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}"
+go mod vendor
 
 # generate the code with:
 # --output-base    because this script should also be able to run inside the vendor dir of
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
-
-OUTPUT_BASE="$(dirname ${BASH_SOURCE})/"
-
-cd "${SCRIPT_ROOT}"
-"${CODEGEN_PKG}/generate-groups.sh" all \
+bash "${CODEGEN_PKG}"/generate-groups.sh all \
   "${GOPKG}/pkg/client" "${GOPKG}/pkg/apis" \
   "${CUSTOM_RESOURCE_NAME}:${CUSTOM_RESOURCE_VERSION}" \
   --go-header-file hack/boilerplate.go.txt \