Merge pull request #11841 from eparis/commit-speed

.gitignore

@@ -61,6 +61,6 @@ www/master/shared/config/development.json
 # Karma output
 www/test_out
 
-# precommit temporary directories created by ./hack/verify-gendocs.sh and ./hack/lib/util.sh
+# precommit temporary directories created by ./hack/verify-generated-docs.sh and ./hack/lib/util.sh
 _tmp/
 doc_tmp/

.travis.yml

@@ -17,7 +17,7 @@ script:
   - ./hack/verify-description.sh
   - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-conversions.sh
   - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-deep-copies.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
+  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-generated-docs.sh
   - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
   - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-linkcheck.sh
   - godep go test ./cmd/mungedocs

build/versionize-docs.sh

@@ -71,5 +71,5 @@ done
 # Update API descriptions to match this version.
 $SED -ri -e "s|(releases.k8s.io)/[^/]+|\1/${NEW_VERSION}|" pkg/api/v[0-9]*/types.go
 
-${KUBE_ROOT}/hack/run-gendocs.sh
+${KUBE_ROOT}/hack/update-generated-docs.sh
 ${KUBE_ROOT}/hack/update-swagger-spec.sh

docs/devel/development.md

@@ -345,7 +345,7 @@ See [conformance-test.sh](http://releases.k8s.io/HEAD/hack/conformance-test.sh).
 ## Regenerating the CLI documentation
 
 ```sh
-hack/run-gendocs.sh
+hack/update-generated-docs.sh
 ```
 
 

hack/after-build/README.md

+These should be called only by a script (or a user) who knows that the binaries are built and correct.  Normal users should just have the versions in ../ which should just always do a build.
+
+
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/hack/after-build/README.md?pixel)]()

hack/after-build/update-generated-conversions.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# 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
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+
+genconversion=$(kube::util::find-binary "genconversion")
+
+function generate_version() {
+	local version=$1
+	local TMPFILE="/tmp/conversion_generated.$(date +%s).go"
+
+	echo "Generating for version ${version}"
+
+	sed 's/YEAR/2015/' hack/boilerplate/boilerplate.go.txt > "$TMPFILE"
+	cat >> "$TMPFILE" <<EOF
+package ${version}
+
+// AUTO-GENERATED FUNCTIONS START HERE
+EOF
+
+  "${genconversion}" -v "${version}" -f - >>  "$TMPFILE"
+
+	cat >> "$TMPFILE" <<EOF
+// AUTO-GENERATED FUNCTIONS END HERE
+EOF
+
+	mv "$TMPFILE" "pkg/api/${version}/conversion_generated.go"
+}
+
+VERSIONS="v1"
+for ver in $VERSIONS; do
+  # Ensure that the version being processed is registered by setting
+  # KUBE_API_VERSIONS.
+  KUBE_API_VERSIONS="${ver}" generate_version "${ver}"
+done
+
+# ex: ts=2 sw=2 et filetype=sh

hack/after-build/update-generated-deep-copies.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# 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
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+
+gendeepcopy=$(kube::util::find-binary "gendeepcopy")
+
+function result_file_name() {
+	local version=$1
+	if [ "${version}" == "api" ]; then
+		echo "pkg/api/deep_copy_generated.go"
+	else
+		echo "pkg/api/${version}/deep_copy_generated.go"
+	fi
+}
+
+function generate_version() {
+	local version=$1
+	local TMPFILE="/tmp/deep_copy_generated.$(date +%s).go"
+
+	echo "Generating for version ${version}"
+
+	sed 's/YEAR/2015/' hack/boilerplate/boilerplate.go.txt > $TMPFILE
+	cat >> $TMPFILE <<EOF
+package ${version}
+
+// AUTO-GENERATED FUNCTIONS START HERE
+EOF
+
+	"${gendeepcopy}" -v "${version}" -f - -o "${version}=" >>  "$TMPFILE"
+
+	cat >> "$TMPFILE" <<EOF
+// AUTO-GENERATED FUNCTIONS END HERE
+EOF
+
+	gofmt -w -s "$TMPFILE"
+	mv "$TMPFILE" `result_file_name ${version}`
+}
+
+function generate_deep_copies() {
+  local versions="api v1"
+  # To avoid compile errors, remove the currently existing files.
+  for ver in ${versions}; do
+    rm -f `result_file_name ${ver}`
+  done
+  apiVersions=""
+  for ver in ${versions}; do
+    # Ensure that the version being processed is registered by setting
+    # KUBE_API_VERSIONS.
+    if [ "${ver}" != "api" ]; then
+      apiVersions="${ver}"
+    fi
+    KUBE_API_VERSIONS="${apiVersions}" generate_version "${ver}"
+  done
+}
+
+generate_deep_copies
+
+# ex: ts=2 sw=2 et filetype=sh

hack/run-gendocs.sh → hack/after-build/update-generated-docs.sh

@@ -18,11 +18,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
-"${KUBE_ROOT}/hack/build-go.sh" cmd/gendocs cmd/genman cmd/genbashcomp cmd/mungedocs
 
 # Find binary
 gendocs=$(kube::util::find-binary "gendocs")
@@ -30,16 +29,6 @@ genman=$(kube::util::find-binary "genman")
 genbashcomp=$(kube::util::find-binary "genbashcomp")
 mungedocs=$(kube::util::find-binary "mungedocs")
 
-if [[ ! -x "$gendocs" || ! -x "$genman" || ! -x "$genbashcomp" || ! -x "$mungedocs" ]]; then
-  {
-    echo "It looks as if you don't have a compiled gendocs, genman, genbashcomp or mungedocs binary"
-    echo
-    echo "If you are running from a clone of the git repo, please run"
-    echo "'./hack/build-go.sh cmd/gendocs cmd/genman cmd/genbashcomp cmd/mungedocs'."
-  } >&2
-  exit 1
-fi
-
 kube::util::gen-doc "${gendocs}" "${KUBE_ROOT}" "docs/user-guide/kubectl/" '###### Auto generated by spf13/cobra'
 kube::util::gen-doc "${genman}" "${KUBE_ROOT}" "docs/man/man1"
 kube::util::gen-doc "${genbashcomp}" "${KUBE_ROOT}" "contrib/completions/bash/"

hack/after-build/update-swagger-spec.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# 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.
+
+# Script to fetch latest swagger spec.
+# Puts the updated spec at swagger-spec/
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+SWAGGER_ROOT_DIR="${KUBE_ROOT}/api/swagger-spec"
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+function cleanup()
+{
+    [[ -n ${APISERVER_PID-} ]] && kill ${APISERVER_PID} 1>&2 2>/dev/null
+
+    kube::etcd::cleanup
+
+    kube::log::status "Clean up complete"
+}
+
+trap cleanup EXIT SIGINT
+
+kube::golang::setup_env
+
+apiserver=$(kube::util::find-binary "kube-apiserver")
+
+ETCD_HOST=${ETCD_HOST:-127.0.0.1}
+ETCD_PORT=${ETCD_PORT:-4001}
+API_PORT=${API_PORT:-8050}
+API_HOST=${API_HOST:-127.0.0.1}
+KUBELET_PORT=${KUBELET_PORT:-10250}
+
+kube::etcd::start
+
+# Start kube-apiserver
+kube::log::status "Starting kube-apiserver"
+KUBE_API_VERSIONS="v1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
+  --address="127.0.0.1" \
+  --public-address-override="127.0.0.1" \
+  --port="${API_PORT}" \
+  --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
+  --public-address-override="127.0.0.1" \
+  --kubelet-port=${KUBELET_PORT} \
+  --runtime-config=api/v1 \
+  --service-cluster-ip-range="10.0.0.0/24" >/dev/null 2>&1 &
+APISERVER_PID=$!
+
+kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: "
+
+SWAGGER_API_PATH="http://127.0.0.1:${API_PORT}/swaggerapi/"
+kube::log::status "Updating " ${SWAGGER_ROOT_DIR}
+curl -fs ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json
+curl -fs ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json
+curl -fs ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json
+curl -fs ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json
+
+kube::log::status "SUCCESS"
+
+# ex: ts=2 sw=2 et filetype=sh

hack/after-build/verify-generated-conversions.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# 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
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+
+APIROOT="${KUBE_ROOT}/pkg/api"
+TMP_APIROOT="${KUBE_ROOT}/_tmp/api"
+_tmp="${KUBE_ROOT}/_tmp"
+
+mkdir -p "${_tmp}"
+cp -a "${APIROOT}" "${TMP_APIROOT}"
+
+"${KUBE_ROOT}/hack/update-generated-conversions.sh"
+echo "diffing ${APIROOT} against freshly generated conversions"
+ret=0
+diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?
+cp -a ${TMP_APIROOT} "${KUBE_ROOT}/pkg"
+rm -rf "${_tmp}"
+if [[ $ret -eq 0 ]]
+then
+  echo "${APIROOT} up to date."
+else
+  echo "${APIROOT} is out of date. Please run hack/update-generated-conversions.sh"
+  exit 1
+fi
+
+# ex: ts=2 sw=2 et filetype=sh

hack/after-build/verify-generated-deep-copies.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# 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
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+
+gendeepcopy=$(kube::util::find-binary "gendeepcopy")
+
+APIROOT="${KUBE_ROOT}/pkg/api"
+TMP_APIROOT="${KUBE_ROOT}/_tmp/api"
+_tmp="${KUBE_ROOT}/_tmp"
+
+mkdir -p "${_tmp}"
+cp -a "${APIROOT}" "${TMP_APIROOT}"
+
+"${KUBE_ROOT}/hack/update-generated-deep-copies.sh"
+echo "diffing ${APIROOT} against freshly generated deep copies"
+ret=0
+diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?
+cp -a ${TMP_APIROOT} "${KUBE_ROOT}/pkg"
+rm -rf "${_tmp}"
+if [[ $ret -eq 0 ]]
+then
+  echo "${APIROOT} up to date."
+else
+  echo "${APIROOT} is out of date. Please run hack/update-generated-deep-copies.sh"
+  exit 1
+fi
+
+# ex: ts=2 sw=2 et filetype=sh

hack/verify-gendocs.sh → hack/after-build/verify-generated-docs.sh

@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
@@ -29,16 +29,6 @@ genman=$(kube::util::find-binary "genman")
 genbashcomp=$(kube::util::find-binary "genbashcomp")
 mungedocs=$(kube::util::find-binary "mungedocs")
 
-if [[ ! -x "$gendocs" || ! -x "$genman" || ! -x "$genbashcomp" || ! -x "$mungedocs" ]]; then
-  {
-    echo "It looks as if you don't have a compiled gendocs, genman, genbashcomp or mungedocs binary"
-    echo
-    echo "If you are running from a clone of the git repo, please run"
-    echo "'./hack/build-go.sh cmd/gendocs cmd/genman cmd/genbashcomp cmd/mungedocs'."
-  } >&2
-  exit 1
-fi
-
 DOCROOT="${KUBE_ROOT}/docs/"
 EXAMPLEROOT="${KUBE_ROOT}/examples/"
 TMP_DOCROOT="${KUBE_ROOT}/_tmp/docs/"
@@ -51,7 +41,7 @@ cp -a "${DOCROOT}" "${TMP_DOCROOT}"
 # links will be distorted. --verify means that it will not make changes.
 "${mungedocs}" "--verify=true" "--root-dir=${DOCROOT}" && ret=0 || ret=$?
 if [[ $ret -eq 1 ]]; then
-  echo "${DOCROOT} is out of date. Please run hack/run-gendocs.sh"
+  echo "${DOCROOT} is out of date. Please run hack/update-generated-docs.sh"
   exit 1
 fi
 if [[ $ret -gt 1 ]]; then
@@ -61,7 +51,7 @@ fi
 
 "${mungedocs}" "--verify=true" "--root-dir=${EXAMPLEROOT}" && ret=0 || ret=$?
 if [[ $ret -eq 1 ]]; then
-  echo "${EXAMPLEROOT} is out of date. Please run hack/run-gendocs.sh"
+  echo "${EXAMPLEROOT} is out of date. Please run hack/update-generated-docs.sh"
   exit 1
 fi
 if [[ $ret -gt 1 ]]; then
@@ -85,7 +75,7 @@ if [[ $ret -eq 0 ]]
 then
   echo "${DOCROOT} up to date."
 else
-  echo "${DOCROOT} is out of date. Please run hack/run-gendocs.sh"
+  echo "${DOCROOT} is out of date. Please run hack/update-generated-docs.sh"
   exit 1
 fi
 
@@ -99,7 +89,7 @@ if [ $ret -eq 0 ]
 then
 	echo "${COMPROOT} up to date."
 else
-	echo "${COMPROOT} is out of date. Please run hack/run-gendocs.sh"
+	echo "${COMPROOT} is out of date. Please run hack/update-generated-docs.sh"
 	echo "If you did not make a change to kubectl or its dependencies,"
 	echo "run 'make clean' and retry this command."
 	exit 1

hack/after-build/verify-linkcheck.sh

+#!/bin/bash
+
+# Copyright 2014 The Kubernetes Authors All rights reserved.
+#
+# 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
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+linkcheck=$(kube::util::find-binary "linkcheck")
+
+TYPEROOT="${KUBE_ROOT}/pkg/api/"
+"${linkcheck}" "--root-dir=${TYPEROOT}" "--repo-root=${KUBE_ROOT}" "--file-suffix=types.go" "--prefix=http://releases.k8s.io/HEAD" && ret=0 || ret=$?
+if [[ $ret -eq 1 ]]; then
+  echo "links in ${TYPEROOT} is out of date."
+  exit 1
+fi
+if [[ $ret -gt 1 ]]; then
+  echo "Error running linkcheck"
+  exit 1
+fi
+
+# ex: ts=2 sw=2 et filetype=sh

hack/after-build/verify-swagger-spec.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# 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
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+
+apiserver=$(kube::util::find-binary "kube-apiserver")
+
+SPECROOT="${KUBE_ROOT}/api/swagger-spec"
+TMP_SPECROOT="${KUBE_ROOT}/_tmp/swagger-spec"
+_tmp="${KUBE_ROOT}/_tmp"
+
+mkdir -p "${_tmp}"
+cp -a "${SPECROOT}" "${TMP_SPECROOT}"
+
+"${KUBE_ROOT}/hack/update-swagger-spec.sh"
+echo "diffing ${SPECROOT} against freshly generated swagger spec"
+ret=0
+diff -Naupr -I 'Auto generated by' "${SPECROOT}" "${TMP_SPECROOT}" || ret=$?
+cp -a ${TMP_SPECROOT} "${KUBE_ROOT}/api"
+rm -rf "${_tmp}"
+if [[ $ret -eq 0 ]]
+then
+  echo "${SPECROOT} up to date."
+else
+  echo "${SPECROOT} is out of date. Please run hack/update-swagger-spec.sh"
+  exit 1
+fi
+
+# ex: ts=2 sw=2 et filetype=sh

hack/build-ui.sh

@@ -44,7 +44,7 @@ function kube::hack::build_ui() {
   go-bindata -nocompress -o "${output_file}" -prefix ${PWD} -pkg "${pkg}" "${src}"
 
   local year=$(date +%Y)
-  cat hooks/boilerplate.go.txt | sed "s/YEAR/${year}/" > "${TMP_DATAFILE}"
+  cat hack/boilerplate/boilerplate.go.txt | sed "s/YEAR/${year}/" > "${TMP_DATAFILE}"
   echo -e "// generated by hack/build-ui.sh; DO NOT EDIT\n" >> "${TMP_DATAFILE}"
   cat "${output_file}" >> "${TMP_DATAFILE}"
 

hack/lib/etcd.sh

@@ -19,7 +19,6 @@
 kube::etcd::start() {
   local host=${ETCD_HOST:-127.0.0.1}
   local port=${ETCD_PORT:-4001}
-  local testhost=${ETCD_PUBLIC_HOST:-localhost}
 
   which etcd >/dev/null || {
     kube::log::usage "etcd must be in your PATH"

hack/lib/util.sh

@@ -171,7 +171,11 @@ kube::util::gen-doc() {
   done <"${dest}/.files_generated"
 
   # put the new generated file into the destination
-  find "${tmpdir}" -exec rsync -pt {} "${dest}" \; >/dev/null
+  # the shopt is so that we get .files_generated from the glob.
+  shopt -s dotglob
+  cp -af "${tmpdir}"/* "${dest}"
+  shopt -u dotglob
+
   #cleanup
   rm -rf "${tmpdir}"
 }

hack/update-generated-conversions.sh

@@ -23,31 +23,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-function generate_version() {
-	local version=$1
-	local TMPFILE="/tmp/conversion_generated.$(date +%s).go"
+"${KUBE_ROOT}/hack/build-go.sh" cmd/genconversion
 
-	echo "Generating for version ${version}"
+"${KUBE_ROOT}/hack/after-build/update-generated-conversions.sh" "$@"
 
-	sed 's/YEAR/2015/' hooks/boilerplate.go.txt > $TMPFILE
-	cat >> $TMPFILE <<EOF
-package ${version}
-
-// AUTO-GENERATED FUNCTIONS START HERE
-EOF
-
-	GOPATH=$(godep path):$GOPATH go run cmd/genconversion/conversion.go -v ${version} -f - >>  $TMPFILE
-
-	cat >> $TMPFILE <<EOF
-// AUTO-GENERATED FUNCTIONS END HERE
-EOF
-
-	mv $TMPFILE pkg/api/${version}/conversion_generated.go
-}
-
-VERSIONS="v1"
-for ver in $VERSIONS; do
-  # Ensure that the version being processed is registered by setting
-  # KUBE_API_VERSIONS.
-  KUBE_API_VERSIONS="${ver}" generate_version "${ver}"
-done
+# ex: ts=2 sw=2 et filetype=sh

hack/update-generated-deep-copies.sh

@@ -23,53 +23,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-function result_file_name() {
-	local version=$1
-	if [ "${version}" == "api" ]; then
-		echo "pkg/api/deep_copy_generated.go"
-	else
-		echo "pkg/api/${version}/deep_copy_generated.go"
-	fi
-}
+"${KUBE_ROOT}/hack/build-go.sh" cmd/gendeepcopy
 
-function generate_version() {
-	local version=$1
-	local TMPFILE="/tmp/deep_copy_generated.$(date +%s).go"
+"${KUBE_ROOT}/hack/after-build/update-generated-deep-copies.sh" "$@"
 
-	echo "Generating for version ${version}"
-
-	sed 's/YEAR/2015/' hooks/boilerplate.go.txt > $TMPFILE
-	cat >> $TMPFILE <<EOF
-package ${version}
-
-// AUTO-GENERATED FUNCTIONS START HERE
-EOF
-
-	GOPATH=$(godep path):$GOPATH go run cmd/gendeepcopy/deep_copy.go -v ${version} -f - -o "${version}=" >>  $TMPFILE
-
-	cat >> $TMPFILE <<EOF
-// AUTO-GENERATED FUNCTIONS END HERE
-EOF
-
-	gofmt -w -s $TMPFILE
-	mv $TMPFILE `result_file_name ${version}`
-}
-
-function generate_deep_copies() {
-  local versions="api v1"
-  # To avoid compile errors, remove the currently existing files.
-  for ver in ${versions}; do
-    rm -f `result_file_name ${ver}`
-  done
-  apiVersions=""
-  for ver in ${versions}; do
-    # Ensure that the version being processed is registered by setting
-    # KUBE_API_VERSIONS.
-    if [ "${ver}" != "api" ]; then
-      apiVersions="${ver}"
-    fi
-    KUBE_API_VERSIONS="${apiVersions}" generate_version "${ver}"
-  done
-}
-
-generate_deep_copies
+# ex: ts=2 sw=2 et filetype=sh

hooks/description.sh → hack/update-generated-docs.sh

@@ -14,13 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Print 1 if the file in $1 is not in need of additional field descriptions, 0 otherwise.
-FILE="$1"
+set -o errexit
+set -o nounset
+set -o pipefail
 
-if grep json: "${FILE}" | grep -v // | grep -v ,inline | grep -v -q description: ; then
-  echo "0"
-else
-  echo "1"
-fi
-exit 0
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${KUBE_ROOT}/hack/lib/init.sh"
 
+kube::golang::setup_env
+
+"${KUBE_ROOT}/hack/build-go.sh" cmd/gendocs cmd/genman cmd/genbashcomp cmd/mungedocs
+
+"${KUBE_ROOT}/hack/after-build/update-generated-docs.sh" "$@"
+
+# ex: ts=2 sw=2 et filetype=sh

hack/update-swagger-spec.sh

@@ -22,51 +22,12 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-SWAGGER_ROOT_DIR="${KUBE_ROOT}/api/swagger-spec"
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
-function cleanup()
-{
-    [[ -n ${APISERVER_PID-} ]] && kill ${APISERVER_PID} 1>&2 2>/dev/null
+kube::golang::setup_env
 
-    kube::etcd::cleanup
-
-    kube::log::status "Clean up complete"
-}
-
-trap cleanup EXIT SIGINT
-
-kube::log::status "Building apiserver"
 "${KUBE_ROOT}/hack/build-go.sh" cmd/kube-apiserver
 
-kube::etcd::start
-
-ETCD_HOST=${ETCD_HOST:-127.0.0.1}
-ETCD_PORT=${ETCD_PORT:-4001}
-API_PORT=${API_PORT:-8050}
-API_HOST=${API_HOST:-127.0.0.1}
-KUBELET_PORT=${KUBELET_PORT:-10250}
-
-# Start kube-apiserver
-kube::log::status "Starting kube-apiserver"
-KUBE_API_VERSIONS="v1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
-  --address="127.0.0.1" \
-  --public-address-override="127.0.0.1" \
-  --port="${API_PORT}" \
-  --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
-  --public-address-override="127.0.0.1" \
-  --kubelet-port=${KUBELET_PORT} \
-  --runtime-config=api/v1 \
-  --service-cluster-ip-range="10.0.0.0/24" >/dev/null 2>&1 &
-APISERVER_PID=$!
-
-kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: "
-
-SWAGGER_API_PATH="http://127.0.0.1:${API_PORT}/swaggerapi/"
-kube::log::status "Updating " ${SWAGGER_ROOT_DIR}
-curl -fs ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json
-curl -fs ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json
-curl -fs ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json
-curl -fs ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json
+"${KUBE_ROOT}/hack/after-build/update-swagger-spec.sh" "$@"
 
-kube::log::status "SUCCESS"
+# ex: ts=2 sw=2 et filetype=sh

hack/verify-boilerplate.sh

@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-boiler="${KUBE_ROOT}/hooks/boilerplate.py"
+boiler="${KUBE_ROOT}/hack/boilerplate/boilerplate.py"
 
 cd ${KUBE_ROOT}
 

hack/verify-description.sh

@@ -34,17 +34,22 @@ find_files() {
         -o -wholename '*/third_party/*' \
         -o -wholename '*/Godeps/*' \
       \) -prune \
-    \) -name '*.go'
+    \) -wholename '*pkg/api/v*/types.go'
 }
 
-files=`find_files | egrep "pkg/api/v.[^/]*/types\.go"`
+if [[ $# -eq 0 ]]; then
+  files=`find_files | egrep "pkg/api/v.[^/]*/types\.go"`
+else
+  files=("${@}")
+fi
 
-for file in $files
-do
-    if [[ "$("${KUBE_ROOT}/hooks/description.sh" "${file}")" -eq "0" ]]; then
+for file in $files; do
+  if grep json: "${file}" | grep -v // | grep -v ,inline | grep -v -q description: ; then
     echo "API file is missing the required field descriptions: ${file}"
     result=1
   fi
 done
 
 exit ${result}
+
+# ex: ts=2 sw=2 et filetype=sh

hack/verify-generated-conversions.sh

@@ -23,37 +23,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-genconversion=$(kube::util::find-binary "genconversion")
+"${KUBE_ROOT}/hack/build-go.sh" cmd/genconversion
 
-if [[ ! -x "$genconversion" ]]; then
-  {
-    echo "It looks as if you don't have a compiled conversion binary"
-    echo
-    echo "If you are running from a clone of the git repo, please run"
-    echo "'./hack/build-go.sh cmd/genconversion'."
-  } >&2
-  exit 1
-fi
-
-APIROOT="${KUBE_ROOT}/pkg/api"
-TMP_APIROOT="${KUBE_ROOT}/_tmp/api"
-_tmp="${KUBE_ROOT}/_tmp"
-
-mkdir -p "${_tmp}"
-cp -a "${APIROOT}" "${TMP_APIROOT}"
-
-"${KUBE_ROOT}/hack/update-generated-conversions.sh"
-echo "diffing ${APIROOT} against freshly generated conversions"
-ret=0
-diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?
-cp -a ${TMP_APIROOT} "${KUBE_ROOT}/pkg"
-rm -rf "${_tmp}"
-if [[ $ret -eq 0 ]]
-then
-  echo "${APIROOT} up to date."
-else
-  echo "${APIROOT} is out of date. Please run hack/update-generated-conversions.sh"
-  exit 1
-fi
+"${KUBE_ROOT}/hack/after-build/verify-generated-conversions.sh" "$@"
 
 # ex: ts=2 sw=2 et filetype=sh

hack/verify-generated-deep-copies.sh

@@ -23,37 +23,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-genconversion=$(kube::util::find-binary "gendeepcopy")
+"${KUBE_ROOT}/hack/build-go.sh" cmd/gendeepcopy
 
-if [[ ! -x "$genconversion" ]]; then
-  {
-    echo "It looks as if you don't have a compiled conversion binary"
-    echo
-    echo "If you are running from a clone of the git repo, please run"
-    echo "'./hack/build-go.sh cmd/gendeepcopy'."
-  } >&2
-  exit 1
-fi
-
-APIROOT="${KUBE_ROOT}/pkg/api"
-TMP_APIROOT="${KUBE_ROOT}/_tmp/api"
-_tmp="${KUBE_ROOT}/_tmp"
-
-mkdir -p "${_tmp}"
-cp -a "${APIROOT}" "${TMP_APIROOT}"
-
-"${KUBE_ROOT}/hack/update-generated-deep-copies.sh"
-echo "diffing ${APIROOT} against freshly generated deep copies"
-ret=0
-diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?
-cp -a ${TMP_APIROOT} "${KUBE_ROOT}/pkg"
-rm -rf "${_tmp}"
-if [[ $ret -eq 0 ]]
-then
-  echo "${APIROOT} up to date."
-else
-  echo "${APIROOT} is out of date. Please run hack/update-generated-deep-copies.sh"
-  exit 1
-fi
+"${KUBE_ROOT}/hack/after-build/verify-generated-deep-copies.sh" "$@"
 
 # ex: ts=2 sw=2 et filetype=sh

hack/verify-generated-docs.sh

+#!/bin/bash
+
+# Copyright 2014 The Kubernetes Authors All rights reserved.
+#
+# 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
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::setup_env
+
+"${KUBE_ROOT}/hack/build-go.sh" cmd/gendocs cmd/genman cmd/genbashcomp cmd/mungedocs
+
+"${KUBE_ROOT}/hack/after-build/verify-generated-docs.sh" "$@"
+
+# ex: ts=2 sw=2 et filetype=sh

hack/verify-linkcheck.sh

@@ -22,25 +22,9 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
-linkcheck=$(kube::util::find-binary "linkcheck")
 
-if [[ ! -x "$linkcheck" ]]; then
-  {
-    echo "It looks as if you don't have a compiled linkcheck binary"
-    echo
-    echo "If you are running from a clone of the git repo, please run"
-    echo "'./hack/build-go.sh cmd/linkcheck'."
-  } >&2
-  exit 1
-fi
+"${KUBE_ROOT}/hack/build-go.sh" cmd/linkcheck
 
-TYPEROOT="${KUBE_ROOT}/pkg/api/"
-"${linkcheck}" "--root-dir=${TYPEROOT}" "--repo-root=${KUBE_ROOT}" "--file-suffix=types.go" "--prefix=http://releases.k8s.io/HEAD" && ret=0 || ret=$?
-if [[ $ret -eq 1 ]]; then
-  echo "links in ${TYPEROOT} is out of date."
-  exit 1
-fi
-if [[ $ret -gt 1 ]]; then
-  echo "Error running linkcheck"
-  exit 1
-fi
+"${KUBE_ROOT}/hack/after-build/verify-linkcheck.sh" "$@"
+
+# ex: ts=2 sw=2 et filetype=sh

hack/verify-swagger-spec.sh

@@ -23,25 +23,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-SPECROOT="${KUBE_ROOT}/api/swagger-spec"
-TMP_SPECROOT="${KUBE_ROOT}/_tmp/swagger-spec"
-_tmp="${KUBE_ROOT}/_tmp"
+"${KUBE_ROOT}/hack/build-go.sh" cmd/kube-apiserver
 
-mkdir -p "${_tmp}"
-cp -a "${SPECROOT}" "${TMP_SPECROOT}"
-
-"${KUBE_ROOT}/hack/update-swagger-spec.sh"
-echo "diffing ${SPECROOT} against freshly generated swagger spec"
-ret=0
-diff -Naupr -I 'Auto generated by' "${SPECROOT}" "${TMP_SPECROOT}" || ret=$?
-cp -a ${TMP_SPECROOT} "${KUBE_ROOT}/api"
-rm -rf "${_tmp}"
-if [[ $ret -eq 0 ]]
-then
-  echo "${SPECROOT} up to date."
-else
-  echo "${SPECROOT} is out of date. Please run hack/update-swagger-spec.sh"
-  exit 1
-fi
+"${KUBE_ROOT}/hack/after-build/verify-swagger-spec.sh" "$@"
 
 # ex: ts=2 sw=2 et filetype=sh

hooks/pre-commit

@@ -4,8 +4,6 @@ readonly reset=$(tput sgr0)
 readonly   red=$(tput bold; tput setaf 1)
 readonly green=$(tput bold; tput setaf 2)
 
-KUBE_HOOKS_DIR="$(dirname "$(test -L "$0" && echo "$(dirname $0)/$(readlink "$0")" || echo "$0")")"
-
 exit_code=0
 
 echo -ne "Checking that it builds... "
@@ -41,31 +39,13 @@ fi
 echo "${reset}"
 
 echo -ne "Checking for files that need boilerplate... "
-files_need_boilerplate=()
-boiler="${KUBE_HOOKS_DIR}/boilerplate.py"
-# Check for go files without the required boilerplate.
-if [[ ${#files[@]} -gt 0 ]]; then
-  files_need_boilerplate+=($("${boiler}" "go" "${files[@]}"))
-fi
-
-# Check for sh files without the required boilerplate.
-files=($(git diff --cached --name-only --diff-filter ACM | grep "\.sh" | grep -v -e "third_party" -e "Godeps"))
-if [[ ${#files[@]} -gt 0 ]]; then
-  files_need_boilerplate+=($("${boiler}" "sh" "${files[@]}"))
-fi
-
-# Check for py files without the required boilerplate.
-files=($(git diff --cached --name-only --diff-filter ACM | grep "\.py" | grep -v -e "third_party" -e "Godeps"))
-if [[ ${#files} -gt 0 ]]; then
-  files_need_boilerplate+=($("${boiler}" "py" "${files[@]}"))
-fi
-
-if [[ "${#files_need_boilerplate[@]}" -ne 0 ]]; then
+out=($(hack/verify-boilerplate.sh))
+if [[ $? -ne 0 ]]; then
   echo "${red}ERROR!"
   echo "Some files are missing the required boilerplate header"
   echo "from hooks/boilerplate.txt:"
-  for file in "${files_need_boilerplate[@]}"; do
-    echo "  ${file}"
+  for f in "${out[@]}"; do
+    echo "  ${f}"
   done
   exit_code=1
 else
@@ -78,8 +58,8 @@ files_need_description=()
 # Check API schema definitions for field descriptions
 for file in $(git diff --cached --name-only --diff-filter ACM | egrep "pkg/api/v.[^/]*/types\.go" | grep -v "third_party"); do
   # Check for files with fields without description tags
-  descriptionless=$("${KUBE_HOOKS_DIR}/description.sh" "${file}")
-  if [[ "$descriptionless" -eq "0" ]]; then
+  descriptionless=$(hack/after-build/verify-description.sh "${file}")
+  if [[ "$descriptionless" != "" ]]; then
     files_need_description+=("${file}")
   fi
 done
@@ -98,7 +78,7 @@ fi
 echo "${reset}"
 
 echo -ne "Checking for links in API descriptions... "
-if ! hack/verify-linkcheck.sh > /dev/null; then
+if ! hack/after-build/verify-linkcheck.sh > /dev/null; then
   echo "${red}ERROR!"
   echo "Some links in pkg/api/.*types.go are outdated. They require a manual fix."
   exit_code=1
@@ -108,11 +88,11 @@ fi
 echo "${reset}"
 
 echo -ne "Checking for docs that need updating... "
-if ! hack/verify-gendocs.sh > /dev/null; then
+if ! hack/after-build/verify-generated-docs.sh > /dev/null; then
   echo "${red}ERROR!"
   echo "Some docs are out of sync between CLI and markdown."
   echo "To regenerate docs, run:"
-  echo "  hack/run-gendocs.sh"
+  echo "  hack/update-generated-docs.sh"
   exit_code=1
 else
   echo "${green}OK"
@@ -120,7 +100,7 @@ fi
 echo "${reset}"
 
 echo -ne "Checking for conversions that need updating... "
-if ! hack/verify-generated-conversions.sh > /dev/null; then
+if ! hack/after-build/verify-generated-conversions.sh > /dev/null; then
   echo "${red}ERROR!"
   echo "Some conversions functions need regeneration."
   echo "To regenerate conversions, run:"
@@ -132,7 +112,7 @@ fi
 echo "${reset}"
 
 echo -ne "Checking for deep-copies that need updating... "
-if ! hack/verify-generated-deep-copies.sh > /dev/null; then
+if ! hack/after-build/verify-generated-deep-copies.sh > /dev/null; then
   echo "${red}ERROR!"
   echo "Some deep-copy functions need regeneration."
   echo "To regenerate deep-copies, run:"
@@ -144,7 +124,7 @@ fi
 echo "${reset}"
 
 echo -ne "Checking for swagger spec that need updating... "
-if ! hack/verify-swagger-spec.sh > /dev/null; then
+if ! hack/after-build/verify-swagger-spec.sh > /dev/null; then
   echo "${red}ERROR!"
   echo "Swagger spec needs to be updated."
   echo "To regenerate the spec, run:"
@@ -159,3 +139,5 @@ if [[ "${exit_code}" != 0 ]]; then
   echo "${red}Aborting commit${reset}"
 fi
 exit ${exit_code}
+
+# ex: ts=2 sw=2 et filetype=sh

shippable.yml

@@ -32,7 +32,7 @@ install:
   - PATH=$GOPATH/bin:$PATH godep go install ./...
   - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-conversions.sh
   - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-deep-copies.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
+  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-generated-docs.sh
   - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
   - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-linkcheck.sh