Make staging hack/update-codec.sh scripts relocatable and kube independent

hack/update-codegen.sh

@@ -121,7 +121,7 @@ ${informergen} \
 # You may add additional calls of code generators like set-gen above.
 
 # call generation on sub-project for now
-vendor/k8s.io/kube-aggregator/hack/update-codegen.sh
-vendor/k8s.io/sample-apiserver/hack/update-codegen.sh
-vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
-vendor/k8s.io/metrics/hack/update-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/kube-aggregator/hack/update-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/sample-apiserver/hack/update-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/metrics/hack/update-codegen.sh

hack/verify-codegen.sh

@@ -27,9 +27,9 @@ kube::golang::setup_env
 #
 # Note: these must be before the main script call because the later calls the sub-project's
 #       update-codegen.sh scripts. We wouldn't see any error on changes then.
-vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh
-vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh
-vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
-vendor/k8s.io/metrics/hack/verify-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
+KUBEGEN_PKG=./vendor/k8s.io/kube-gen vendor/k8s.io/metrics/hack/verify-codegen.sh
 
 "${KUBE_ROOT}/hack/update-codegen.sh" --verify-only

staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh

@@ -18,9 +18,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
-APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
+KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)}
 
 if LANG=C sed --help 2>&1 | grep -q GNU; then
   SED="sed"
@@ -41,7 +41,7 @@ trap cleanup EXIT
 
 echo "Building client-gen"
 CLIENTGEN="${PWD}/client-gen-binary"
-go build -o "${CLIENTGEN}" k8s.io/kube-gen/cmd/client-gen
+go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen
 
 PREFIX=k8s.io/apiextensions-apiserver/pkg/apis
 INPUT_BASE="--input-base ${PREFIX}"
@@ -52,25 +52,25 @@ apiextensions/v1beta1
 INPUT="--input ${INPUT_APIS[@]}"
 CLIENTSET_PATH="--clientset-path k8s.io/apiextensions-apiserver/pkg/client/clientset"
 
-${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
-${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH}  --output-base ${KUBE_ROOT}/vendor
+${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
+${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH}  --output-base ${SCRIPT_BASE}
 
 
 echo "Building lister-gen"
 listergen="${PWD}/lister-gen"
-go build -o "${listergen}" k8s.io/kube-gen/cmd/lister-gen
+go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen
 
 LISTER_INPUT="--input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 LISTER_PATH="--output-package k8s.io/apiextensions-apiserver/pkg/client/listers"
-${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
+${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE}
 
 
 echo "Building informer-gen"
 informergen="${PWD}/informer-gen"
-go build -o "${informergen}" k8s.io/kube-gen/cmd/informer-gen
+go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen
 
 ${informergen} \
-  --output-base ${KUBE_ROOT}/vendor \
+  --output-base ${SCRIPT_BASE} \
   --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 \
   --versioned-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset \
   --internal-clientset-package k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset \

staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh

@@ -18,13 +18,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
-APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
 
-DIFFROOT="${APIFEDERATOR_ROOT}/pkg"
-TMP_DIFFROOT="${APIFEDERATOR_ROOT}/_tmp/pkg"
-_tmp="${APIFEDERATOR_ROOT}/_tmp"
+DIFFROOT="${SCRIPT_ROOT}/pkg"
+TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
+_tmp="${SCRIPT_ROOT}/_tmp"
 
 cleanup() {
   rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
 mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
-"${APIFEDERATOR_ROOT}/hack/update-codegen.sh"
+"${SCRIPT_ROOT}/hack/update-codegen.sh"
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?

staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh

@@ -18,9 +18,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
-APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
+KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)}
 
 if LANG=C sed --help 2>&1 | grep -q GNU; then
   SED="sed"
@@ -41,7 +41,8 @@ trap cleanup EXIT
 
 echo "Building client-gen"
 CLIENTGEN="${PWD}/client-gen-binary"
-go build -o "${CLIENTGEN}" k8s.io/kube-gen/cmd/client-gen
+
+go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen
 
 PREFIX=k8s.io/kube-aggregator/pkg/apis
 INPUT_BASE="--input-base ${PREFIX}"
@@ -52,25 +53,25 @@ apiregistration/v1beta1
 INPUT="--input ${INPUT_APIS[@]}"
 CLIENTSET_PATH="--clientset-path k8s.io/kube-aggregator/pkg/client/clientset_generated"
 
-${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
-${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1 ${CLIENTSET_PATH}  --output-base ${KUBE_ROOT}/vendor
+${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
+${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1 ${CLIENTSET_PATH}  --output-base ${SCRIPT_BASE}
 
 
 echo "Building lister-gen"
 listergen="${PWD}/lister-gen"
-go build -o "${listergen}" k8s.io/kube-gen/cmd/lister-gen
+go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen
 
 LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
 LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers"
-${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
+${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE}
 
 
 echo "Building informer-gen"
 informergen="${PWD}/informer-gen"
-go build -o "${informergen}" k8s.io/kube-gen/cmd/informer-gen
+go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen
 
 ${informergen} \
-  --output-base ${KUBE_ROOT}/vendor \
+  --output-base ${SCRIPT_BASE} \
   --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 \
   --versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \
   --internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \

staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh

@@ -18,13 +18,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
-APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
 
-DIFFROOT="${APIFEDERATOR_ROOT}/pkg"
-TMP_DIFFROOT="${APIFEDERATOR_ROOT}/_tmp/pkg"
-_tmp="${APIFEDERATOR_ROOT}/_tmp"
+DIFFROOT="${SCRIPT_ROOT}/pkg"
+TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
+_tmp="${SCRIPT_ROOT}/_tmp"
 
 cleanup() {
   rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
 mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
-"${APIFEDERATOR_ROOT}/hack/update-codegen.sh"
+"${SCRIPT_ROOT}/hack/update-codegen.sh"
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?

staging/src/k8s.io/metrics/hack/update-codegen.sh

@@ -18,9 +18,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
-METRICS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
+KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)}
 
 # Register function to be called on EXIT to remove generated binary.
 function cleanup {
@@ -30,13 +30,13 @@ trap cleanup EXIT
 
 echo "Building client-gen"
 CLIENTGEN="${PWD}/client-gen-binary"
-go build -o "${CLIENTGEN}" k8s.io/kube-gen/cmd/client-gen
+go build -o "${CLIENTGEN}" ${KUBEGEN_PKG}/cmd/client-gen
 
 PREFIX=k8s.io/metrics/pkg/apis
 INPUT_BASE="--input-base ${PREFIX}"
 CLIENTSET_PATH="--clientset-path k8s.io/metrics/pkg/client/clientset_generated"
 
-${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input metrics/v1alpha1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
+${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input metrics/v1alpha1 ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
 
 # we skip informers and listers for metrics, because we don't quite support the requisite operations yet
 # we skip generating the internal clientset as it's not really needed

staging/src/k8s.io/metrics/hack/verify-codegen.sh

@@ -18,13 +18,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
-METRICS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
 
-DIFFROOT="${METRICS_ROOT}/pkg"
-TMP_DIFFROOT="${METRICS_ROOT}/_tmp/pkg"
-_tmp="${METRICS_ROOT}/_tmp"
+DIFFROOT="${SCRIPT_ROOT}/pkg"
+TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
+_tmp="${SCRIPT_ROOT}/_tmp"
 
 cleanup() {
   rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
 mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
-"${METRICS_ROOT}/hack/update-codegen.sh"
+"${SCRIPT_ROOT}/hack/update-codegen.sh"
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
@@ -48,4 +47,3 @@ else
   echo "${DIFFROOT} is out of date. Please run hack/update-codegen.sh"
   exit 1
 fi
-

staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh

@@ -18,11 +18,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=${GOPATH}/src/k8s.io/kubernetes
-BASE_PATH=k8s.io/kubernetes/staging/src/
-BASE_PKG=k8s.io/sample-apiserver
-
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_PACKAGE=k8s.io/sample-apiserver
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
+KUBEGEN_PKG=${KUBEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/kube-gen 2>/dev/null || echo k8s.io/kube-gen)}
 
 clientgen="${PWD}/client-gen-binary"
 listergen="${PWD}/lister-gen"
@@ -38,40 +37,39 @@ trap cleanup EXIT
 function generate_group() {
   local GROUP_NAME=$1
   local VERSION=$2
-  local SERVER_BASE=${GOPATH}/src/${BASE_PATH}
-  local CLIENT_PKG=${BASE_PKG}/pkg/client
+  local CLIENT_PKG=${SCRIPT_PACKAGE}/pkg/client
   local LISTERS_PKG=${CLIENT_PKG}/listers_generated
   local INFORMERS_PKG=${CLIENT_PKG}/informers_generated
-  local PREFIX=${BASE_PKG}/pkg/apis
+  local PREFIX=${SCRIPT_PACKAGE}/pkg/apis
   local INPUT_APIS=(
     ${GROUP_NAME}/
     ${GROUP_NAME}/${VERSION}
   )
 
   echo "Building client-gen"
-  go build -o "${clientgen}" k8s.io/kube-gen/cmd/client-gen
+  go build -o "${clientgen}" ${KUBEGEN_PKG}/cmd/client-gen
 
-  echo "generating clientset for group ${GROUP_NAME} and version ${VERSION} at ${GOPATH}/${BASE_PATH}${CLIENT_PKG}"
-  ${clientgen} --input-base ${PREFIX} --input ${INPUT_APIS[@]} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${GOPATH}/src/${BASE_PATH}
-  ${clientgen} --clientset-name="clientset" --input-base ${PREFIX} --input ${GROUP_NAME}/${VERSION} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${GOPATH}/src/${BASE_PATH}
+  echo "generating clientset for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${CLIENT_PKG}"
+  ${clientgen} --input-base ${PREFIX} --input ${INPUT_APIS[@]} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${SCRIPT_BASE}
+  ${clientgen} --clientset-name="clientset" --input-base ${PREFIX} --input ${GROUP_NAME}/${VERSION} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${SCRIPT_BASE}
   
   echo "Building lister-gen"
-  go build -o "${listergen}" k8s.io/kube-gen/cmd/lister-gen
+  go build -o "${listergen}" ${KUBEGEN_PKG}/cmd/lister-gen
 
-  echo "generating listers for group ${GROUP_NAME} and version ${VERSION} at ${GOPATH}/${BASE_PATH}${LISTERS_PKG}"
-  ${listergen} --input-dirs ${BASE_PKG}/pkg/apis/wardle --input-dirs ${BASE_PKG}/pkg/apis/${GROUP_NAME}/${VERSION} --output-package ${LISTERS_PKG} --output-base ${SERVER_BASE}
+  echo "generating listers for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${LISTERS_PKG}"
+  ${listergen} --input-dirs ${SCRIPT_PACKAGE}/pkg/apis/wardle --input-dirs ${SCRIPT_PACKAGE}/pkg/apis/${GROUP_NAME}/${VERSION} --output-package ${LISTERS_PKG} --output-base ${SCRIPT_BASE}
 
   echo "Building informer-gen"
-  go build -o "${informergen}" k8s.io/kube-gen/cmd/informer-gen
+  go build -o "${informergen}" ${KUBEGEN_PKG}/cmd/informer-gen
 
-  echo "generating informers for group ${GROUP_NAME} and version ${VERSION} at ${GOPATH}/${BASE_PATH}${INFORMERS_PKG}"
+  echo "generating informers for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${INFORMERS_PKG}"
   ${informergen} \
-    --input-dirs ${BASE_PKG}/pkg/apis/${GROUP_NAME} --input-dirs ${BASE_PKG}/pkg/apis/${GROUP_NAME}/${VERSION} \
+    --input-dirs ${SCRIPT_PACKAGE}/pkg/apis/${GROUP_NAME} --input-dirs ${SCRIPT_PACKAGE}/pkg/apis/${GROUP_NAME}/${VERSION} \
     --versioned-clientset-package ${CLIENT_PKG}/clientset_generated/clientset \
     --internal-clientset-package ${CLIENT_PKG}/clientset_generated/internalclientset \
     --listers-package ${LISTERS_PKG} \
     --output-package ${INFORMERS_PKG} \
-    --output-base ${SERVER_BASE}
+    --output-base ${SCRIPT_BASE}
 }
 
 generate_group wardle v1alpha1

staging/src/k8s.io/sample-apiserver/hack/verify-codegen.sh

@@ -18,13 +18,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
-EXAMPLE_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${KUBE_ROOT}/hack/lib/init.sh"
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_BASE=${SCRIPT_ROOT}/../..
 
-DIFFROOT="${EXAMPLE_ROOT}/pkg"
-TMP_DIFFROOT="${EXAMPLE_ROOT}/_tmp/pkg"
-_tmp="${EXAMPLE_ROOT}/_tmp"
+DIFFROOT="${SCRIPT_ROOT}/pkg"
+TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
+_tmp="${SCRIPT_ROOT}/_tmp"
 
 cleanup() {
   rm -rf "${_tmp}"
@@ -36,7 +35,7 @@ cleanup
 mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
-"${EXAMPLE_ROOT}/hack/update-codegen.sh"
+"${SCRIPT_ROOT}/hack/update-codegen.sh"
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?