@@ -64,14 +64,14 @@ verify: build

 	hack/verify-upstream-commits.sh

 	hack/verify-gofmt.sh

 	hack/verify-govet.sh

+	hack/verify-generated-bootstrap-bindata.sh

 	hack/verify-generated-deep-copies.sh

 	hack/verify-generated-conversions.sh

 	hack/verify-generated-clientsets.sh

 	hack/verify-generated-completions.sh

 	hack/verify-generated-docs.sh

-	hack/verify-generated-swagger-spec.sh

-	hack/verify-bootstrap-bindata.sh

 	hack/verify-generated-swagger-descriptions.sh

+	hack/verify-generated-swagger-spec.sh

 .PHONY: verify

 # Update all generated artifacts.

@@ -79,13 +79,14 @@ verify: build

 # Example:

 #   make update

 update: build

-	hack/update-generated-completions.sh

-	hack/update-generated-conversions.sh

+	hack/update-generated-bootstrap-bindata.sh

 	hack/update-generated-deep-copies.sh

+	hack/update-generated-conversions.sh

+	hack/update-generated-clientsets.sh

+	hack/update-generated-completions.sh

 	hack/update-generated-docs.sh

 	hack/update-generated-swagger-descriptions.sh

 	hack/update-generated-swagger-spec.sh

-	hack/update-generated-clientsets.sh

 .PHONY: update

 # Run unit tests.

deleted file mode 100755

@@ -1,28 +0,0 @@

-#!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-STARTTIME=$(date +%s)

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-EXAMPLES=examples

-OUTPUT_PARENT=${OUTPUT_ROOT:-$OS_ROOT}

-

-pushd vendor/github.com/jteeuwen/go-bindata > /dev/null

-  go install ./...

-popd > /dev/null

-

-pushd "${OS_ROOT}" > /dev/null

-  "$(os::util::find-go-binary go-bindata)" -nocompress -nometadata -prefix "bootstrap" -pkg "bootstrap" \

-                                   -o "${OUTPUT_PARENT}/pkg/bootstrap/bindata.go" -ignore "README.md" \

-                                   ${EXAMPLES}/image-streams/... \

-                                   ${EXAMPLES}/db-templates/... \

-                                   ${EXAMPLES}/jenkins/pipeline/... \

-                                   ${EXAMPLES}/quickstarts/...

-popd > /dev/null

-

-ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"

deleted file mode 100755

@@ -1,18 +0,0 @@

-#!/bin/bash

-

-# Script to generate docs from the latest swagger spec.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-cd "${OS_ROOT}"

-source "${OS_ROOT}/hack/lib/init.sh"

-os::log::stacktrace::install

-

-pushd "${OS_ROOT}/hack/swagger-doc" > /dev/null

-gradle gendocs --info

-popd > /dev/null

-

-echo "[INFO] Swagger doc generation successful"

new file mode 100755

@@ -0,0 +1,31 @@

+#!/bin/bash

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+STARTTIME=$(date +%s)

+OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+source "${OS_ROOT}/hack/lib/init.sh"

+os::log::stacktrace::install

+

+EXAMPLES=examples

+OUTPUT_PARENT=${OUTPUT_ROOT:-$OS_ROOT}

+

+if [[ -z "$( which go-bindata )" ]]; then

+  pushd vendor/github.com/jteeuwen/go-bindata > /dev/null

+    go install ./...

+  popd > /dev/null

+fi

+

+pushd "${OS_ROOT}" > /dev/null

+  "$(os::util::find-go-binary go-bindata)" -nocompress -nometadata -prefix "bootstrap" -pkg "bootstrap" \

+                                   -o "${OUTPUT_PARENT}/pkg/bootstrap/bindata.go" -ignore "README.md" -ignore ".*\.go$" \

+                                   ${EXAMPLES}/image-streams/... \

+                                   ${EXAMPLES}/db-templates/... \

+                                   ${EXAMPLES}/jenkins/pipeline/... \

+                                   ${EXAMPLES}/quickstarts/... \

+                                   pkg/image/admission/imagepolicy/api/v1/...

+popd > /dev/null

+

+ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"

@@ -10,7 +10,6 @@ source "${OS_ROOT}/hack/lib/init.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

-# Do not allow a synthetic GOPATH for these checks

 os::build::setup_env

 "${OS_ROOT}/hack/build-go.sh" tools/genconversion

@@ -10,7 +10,6 @@ source "${OS_ROOT}/hack/lib/init.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

-# Do not allow a synthetic GOPATH for these checks

 os::build::setup_env

 "${OS_ROOT}/hack/build-go.sh" tools/gendeepcopy

new file mode 100755

@@ -0,0 +1,18 @@

+#!/bin/bash

+

+# Script to generate docs from the latest swagger spec.

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+cd "${OS_ROOT}"

+source "${OS_ROOT}/hack/lib/init.sh"

+os::log::stacktrace::install

+

+pushd "${OS_ROOT}/hack/swagger-doc" > /dev/null

+gradle gendocs --info

+popd > /dev/null

+

+echo "[INFO] Swagger doc generation successful"

deleted file mode 100755

@@ -1,34 +0,0 @@

-#!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-source "${OS_ROOT}/hack/lib/init.sh"

-

-cd "${OS_ROOT}"

-

-echo "===== Verifying Generated Bootstrap Bindata ====="

-

-TMP_GENERATED_BOOTSTRAP_DIR="_output/verify-bootstrap-bindata"

-

-echo "Generating bootstrap bindata..."

-if ! output=`OUTPUT_ROOT=${TMP_GENERATED_BOOTSTRAP_DIR} ${OS_ROOT}/hack/gen-bootstrap-bindata.sh 2>&1`

-then

-	echo "FAILURE: Generation of fresh bindata failed:"

-	echo "$output"

-  exit 1

-fi

-

-echo "Diffing current bootstrap bindata against freshly generated bindata"

-ret=0

-diff -Naup "${OS_ROOT}/pkg/bootstrap/bindata.go" "${TMP_GENERATED_BOOTSTRAP_DIR}/pkg/bootstrap/bindata.go" || ret=$?

-rm -rf "${TMP_GENERATED_BOOTSTRAP_DIR}"

-if [[ $ret -eq 0 ]]

-then

-  echo "SUCCESS: Generated bootstrap bindata up to date."

-else

-  echo "FAILURE: Generated bootstrap bindata out of date. Please run hack/gen-bootstrap-bindata.sh"

-  exit 1

-fi

new file mode 100755

@@ -0,0 +1,34 @@

+#!/bin/bash

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+source "${OS_ROOT}/hack/lib/init.sh"

+

+cd "${OS_ROOT}"

+

+echo "===== Verifying Generated Bootstrap Bindata ====="

+

+TMP_GENERATED_BOOTSTRAP_DIR="_output/verify-bootstrap-bindata"

+

+echo "Generating bootstrap bindata..."

+if ! output=`OUTPUT_ROOT=${TMP_GENERATED_BOOTSTRAP_DIR} ${OS_ROOT}/hack/update-generated-bootstrap-bindata.sh 2>&1`

+then

+	echo "FAILURE: Generation of fresh bindata failed:"

+	echo "$output"

+  exit 1

+fi

+

+echo "Diffing current bootstrap bindata against freshly generated bindata"

+ret=0

+diff -Naup "${OS_ROOT}/pkg/bootstrap/bindata.go" "${TMP_GENERATED_BOOTSTRAP_DIR}/pkg/bootstrap/bindata.go" || ret=$?

+rm -rf "${TMP_GENERATED_BOOTSTRAP_DIR}"

+if [[ $ret -eq 0 ]]

+then

+  echo "SUCCESS: Generated bootstrap bindata up to date."

+else

+  echo "FAILURE: Generated bootstrap bindata out of date. Please run hack/update-generated-bootstrap-bindata.sh"

+  exit 1

+fi