@@ -64,7 +64,7 @@ check-test:

 	hack/verify-generated-conversions.sh

 	hack/verify-generated-completions.sh

 	hack/verify-generated-docs.sh

-	hack/verify-swagger-spec.sh

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

 	hack/test-cmd.sh

 	KUBE_RACE=" " hack/test-integration.sh

 .PHONY: check-test

@@ -92,7 +92,7 @@ test:

 	hack/verify-generated-conversions.sh

 	hack/verify-generated-completions.sh

 	hack/verify-generated-docs.sh

-	hack/verify-swagger-spec.sh

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

 	hack/test-cmd.sh

 	KUBE_RACE=" " hack/test-integration-docker.sh

 	hack/test-end-to-end-docker.sh

@@ -474,7 +474,7 @@ os::build::gen-docs() {

   # We do this in a tmpdir in case the dest has other non-autogenned files

   # We don't want to include them in the list of gen'd files

-  local tmpdir="${OS_ROOT}/doc_tmp"

+  local tmpdir="${OS_ROOT}/_tmp/gen_doc"

   mkdir "${tmpdir}"

   # generate the new files

   ${cmd} "${tmpdir}"

@@ -24,4 +24,9 @@ if [[ ! "$genbashcomp" ]]; then

   exit 1

 fi

-os::build::gen-docs "${genbashcomp}" "${OS_ROOT}/rel-eng/completions/bash/"

+OUTPUT_REL_DIR=${1:-""}

+OUTPUT_DIR_ROOT="${OS_ROOT}/${OUTPUT_REL_DIR}/rel-eng/completions"

+

+mkdir -p "${OUTPUT_DIR_ROOT}/bash" || echo $? > /dev/null

+

+os::build::gen-docs "${genbashcomp}" "${OUTPUT_DIR_ROOT}/bash"

@@ -29,11 +29,15 @@ EOF

 	cat >> $TMPFILE <<EOF

 // AUTO-GENERATED FUNCTIONS END HERE

 EOF

-

-	mv $TMPFILE pkg/api/${version}/conversion_generated.go

+	

+	mv $TMPFILE $2

 }

+DESTINATION_FILE_REL=${1:-""}

+DESTINATION_FILE_ROOT="${OS_ROOT}/${DESTINATION_FILE_REL}/pkg/api"

 VERSIONS="v1beta3 v1"

 for ver in $VERSIONS; do

-	generate_version "${ver}"

+	mkdir -p "${DESTINATION_FILE_ROOT}/${ver}" || echo $? > /dev/null

+	DESTINATION_FILE="${DESTINATION_FILE_ROOT}/${ver}/conversion_generated.go"

+	generate_version "${ver}" "${DESTINATION_FILE}"

 done

@@ -15,9 +15,11 @@ os::build::setup_env

 function result_file_name() {

 	local version=$1

 	if [ "${version}" == "api" ]; then

-		echo "pkg/api/deep_copy_generated.go"

+		mkdir -p "${OUTPUT_DIR_ROOT}" || echo $? > /dev/null

+		echo "${OUTPUT_DIR_ROOT}/deep_copy_generated.go"

 	else

-		echo "pkg/api/${version}/deep_copy_generated.go"

+		mkdir -p "${OUTPUT_DIR_ROOT}/${version}" || echo $? > /dev/null

+		echo "${OUTPUT_DIR_ROOT}/${version}/deep_copy_generated.go"

 	fi

 }

@@ -43,6 +45,8 @@ EOF

 	mv $TMPFILE `result_file_name ${version}`

 }

+OUTPUT_DIR_ROOT_REL=${1:-""}

+OUTPUT_DIR_ROOT="${OS_ROOT}/${OUTPUT_DIR_ROOT_REL}/pkg/api"

 VERSIONS="api v1beta3 v1"

 # To avoid compile errors, remove the currently existing files.

 for ver in $VERSIONS; do

@@ -24,4 +24,7 @@ if [[ ! "$gendocs" ]]; then

   exit 1

 fi

-os::build::gen-docs "${gendocs}" "${OS_ROOT}/docs/generated"

+OUTPUT_DIR_REL=${1:-""}

+OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/generated"

+mkdir -p "${OUTPUT_DIR}" || echo $? > /dev/null

+os::build::gen-docs "${gendocs}" "${OUTPUT_DIR}"

new file mode 100755

@@ -0,0 +1,68 @@

+#!/bin/bash

+

+# Script to create latest swagger spec.

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

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

+source "${OS_ROOT}/hack/util.sh"

+

+os::log::install_errexit

+

+function cleanup()

+{

+    out=$?

+    pkill -P $$

+    rm -rf "${TEMP_DIR}"

+

+    if [ $out -ne 0 ]; then

+        echo "[FAIL] !!!!! Generate Failed !!!!"

+        echo

+        cat "${TEMP_DIR}/openshift.log"

+        echo

+        echo -------------------------------------

+        echo

+    fi

+    exit $out

+}

+

+trap "exit" INT TERM

+trap "cleanup" EXIT

+

+set -e

+

+ADDR=127.0.0.1:8443

+HOST=https://${ADDR}

+SWAGGER_SPEC_REL_DIR=${1:-""}

+SWAGGER_SPEC_OUT_DIR="${OS_ROOT}/${SWAGGER_SPEC_REL_DIR}/api/swagger-spec"

+mkdir -p "${SWAGGER_SPEC_OUT_DIR}" || echo $? > /dev/null

+SWAGGER_API_PATH="${HOST}/swaggerapi/"

+

+# Prevent user environment from colliding with the test setup

+unset KUBECONFIG

+

+# set path so OpenShift is available

+GO_OUT="${OS_ROOT}/_output/local/go/bin"

+export PATH="${GO_OUT}:${PATH}"

+

+# create temp dir

+TEMP_DIR=${USE_TEMP:-$(mktemp -d /tmp/openshift-cmd.XXXX)}

+export CURL_CA_BUNDLE="${TEMP_DIR}/openshift.local.config/master/ca.crt"

+

+# Start openshift

+echo "Starting OpenShift..."

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

+OPENSHIFT_ON_PANIC=crash openshift start master --listen="https://0.0.0.0:8443" --master="https://127.0.0.1:8443" &> /dev/null &

+OS_PID=$!

+popd > /dev/null

+

+wait_for_url "${HOST}/healthz" "apiserver: " 0.25 80

+

+echo "Updating ${SWAGGER_SPEC_OUT_DIR}:"

+echo "Updating ${SWAGGER_SPEC_OUT_DIR}/oapi-v1.json from ${SWAGGER_API_PATH}oapi/v1..."

+curl "${SWAGGER_API_PATH}oapi/v1" > "${SWAGGER_SPEC_OUT_DIR}/oapi-v1.json"

+echo "Updating ${SWAGGER_SPEC_OUT_DIR}/api-v1.json from ${SWAGGER_API_PATH}api/v1..."

+curl "${SWAGGER_API_PATH}api/v1" > "${SWAGGER_SPEC_OUT_DIR}/api-v1.json"

+echo "SUCCESS"

\ No newline at end of file

deleted file mode 100755

@@ -1,67 +0,0 @@

-#!/bin/bash

-

-# Script to create latest swagger spec.

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

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

-source "${OS_ROOT}/hack/util.sh"

-

-os::log::install_errexit

-

-function cleanup()

-{

-    out=$?

-    pkill -P $$

-    rm -rf "${TEMP_DIR}"

-

-    if [ $out -ne 0 ]; then

-        echo "[FAIL] !!!!! Generate Failed !!!!"

-        echo

-        cat "${TEMP_DIR}/openshift.log"

-        echo

-        echo -------------------------------------

-        echo

-    fi

-    exit $out

-}

-

-trap "exit" INT TERM

-trap "cleanup" EXIT

-

-set -e

-

-ADDR=127.0.0.1:8443

-HOST=https://${ADDR}

-SWAGGER_SPEC_OUT_DIR=${1:-"${OS_ROOT}/api/swagger-spec"}

-mkdir -p "${SWAGGER_SPEC_OUT_DIR}"

-SWAGGER_API_PATH="${HOST}/swaggerapi/"

-

-# Prevent user environment from colliding with the test setup

-unset KUBECONFIG

-

-# set path so OpenShift is available

-GO_OUT="${OS_ROOT}/_output/local/go/bin"

-export PATH="${GO_OUT}:${PATH}"

-

-# create temp dir

-TEMP_DIR=${USE_TEMP:-$(mktemp -d /tmp/openshift-cmd.XXXX)}

-export CURL_CA_BUNDLE="${TEMP_DIR}/openshift.local.config/master/ca.crt"

-

-# Start openshift

-echo "Starting OpenShift..."

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

-OPENSHIFT_ON_PANIC=crash openshift start master --listen="https://0.0.0.0:8443" --master="https://127.0.0.1:8443" &> /dev/null &

-OS_PID=$!

-popd > /dev/null

-

-wait_for_url "${HOST}/healthz" "apiserver: " 0.25 80

-

-echo "Updating ${SWAGGER_SPEC_OUT_DIR}:"

-echo "Updating ${SWAGGER_SPEC_OUT_DIR}/oapi-v1.json from ${SWAGGER_API_PATH}oapi/v1..."

-curl "${SWAGGER_API_PATH}oapi/v1" > "${SWAGGER_SPEC_OUT_DIR}/oapi-v1.json"

-echo "Updating ${SWAGGER_SPEC_OUT_DIR}/api-v1.json from ${SWAGGER_API_PATH}api/v1..."

-curl "${SWAGGER_API_PATH}api/v1" > "${SWAGGER_SPEC_OUT_DIR}/api-v1.json"

-echo "SUCCESS"

\ No newline at end of file

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -o errexit

+set -e

 set -o nounset

 set -o pipefail

@@ -9,23 +9,30 @@ source "${OS_ROOT}/hack/common.sh"

 cd "${OS_ROOT}"

-COMPLETION_ROOT="${OS_ROOT}/rel-eng/completions"

-_tmp="${OS_ROOT}/_tmp"

-TMP_COMPLETION_ROOT="${_tmp}/completions"

+echo "===== Verifying Generated Completions ====="

-mkdir -p "${_tmp}"

-cp -a "${COMPLETION_ROOT}/" "${_tmp}"

+COMPLETION_ROOT_REL="rel-eng/completions"

+COMPLETION_ROOT="${OS_ROOT}/${COMPLETION_ROOT_REL}"

+TMP_COMPLETION_ROOT_REL="_tmp/verify-generated-completions/"

+TMP_COMPLETION_ROOT="${OS_ROOT}/${TMP_COMPLETION_ROOT_REL}/${COMPLETION_ROOT_REL}"

-"${OS_ROOT}/hack/update-generated-completions.sh"

-echo "diffing ${COMPLETION_ROOT} against freshly generated completions"

+echo "Generating fresh completions..."

+if ! output=`${OS_ROOT}/hack/update-generated-completions.sh ${TMP_COMPLETION_ROOT_REL} 2>&1`

+then

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

+	echo "$output"

+	exit 1

+fi

+

+

+echo "Diffing current completions against freshly generated completions..."

 ret=0

 diff -Naupr "${COMPLETION_ROOT}" "${TMP_COMPLETION_ROOT}" || ret=$?

-cp -a "${TMP_COMPLETION_ROOT}" "${COMPLETION_ROOT}/.."

-rm -rf "${_tmp}"

+rm -rf "${TMP_COMPLETION_ROOT}"

 if [[ $ret -eq 0 ]]

 then

-  echo "${COMPLETION_ROOT} up to date."

+  echo "SUCCESS: Generated completions up to date."

 else

-  echo "${COMPLETION_ROOT} is out of date. Please run hack/update-generated-completions.sh"

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

   exit 1

 fi

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -o errexit

+set -e

 set -o nounset

 set -o pipefail

@@ -8,37 +8,54 @@ OS_ROOT=$(dirname "${BASH_SOURCE}")/..

 source "${OS_ROOT}/hack/common.sh"

 cd "${OS_ROOT}"

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

+

+echo "===== Verifying Generated Conversions ====="

+echo "Building genconversion binary..."

+if ! buildout=`"${OS_ROOT}/hack/build-go.sh" cmd/genconversion 2>&1`

+then

+  echo "FAILURE: Building genconversion binary failed:"

+  echo "$buildout"

+  exit 1

+else

+  echo "$buildout" | sed 's/^/   /'

+fi

+

 genconversion="${OS_ROOT}/_output/local/go/bin/genconversion"

+echo "   Verifying genconversion binary..."

 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 "FAILURE: It looks as if you don't have a compiled conversion binary."

+    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="${OS_ROOT}/pkg/api"

-TMP_APIROOT="${OS_ROOT}/_tmp/api"

-_tmp="${OS_ROOT}/_tmp"

+APIROOT_REL="pkg/api"

+APIROOT="${OS_ROOT}/${APIROOT_REL}"

+TMP_APIROOT_REL="_tmp/verify-generated-conversions"

+TMP_APIROOT="${OS_ROOT}/${TMP_APIROOT_REL}/${APIROOT_REL}"

+

+echo "Generating fresh conversions..."

+if ! output=`${OS_ROOT}/hack/update-generated-conversions.sh ${TMP_APIROOT_REL} 2>&1`

+then

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

+  echo "$output"

+  exit 1

+fi

-mkdir -p "${_tmp}"

-cp -a "${APIROOT}" "${TMP_APIROOT}"

+cp -au "${APIROOT}" "${TMP_APIROOT}/.."

-"${OS_ROOT}/hack/update-generated-conversions.sh"

-echo "diffing ${APIROOT} against freshly generated conversions"

+echo "Diffing current conversions against freshly generated conversions..."

 ret=0

 diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?

-cp -a ${TMP_APIROOT} "${OS_ROOT}/pkg"

-rm -rf "${_tmp}"

+rm -rf "${TMP_APIROOT}"

 if [[ $ret -eq 0 ]]

 then

-  echo "${APIROOT} up to date."

+  echo "SUCCESS: Generated conversions up to date."

 else

-  echo "${APIROOT} is out of date. Please run hack/update-generated-conversions.sh"

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

   exit 1

 fi

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -o errexit

+set -e

 set -o nounset

 set -o pipefail

@@ -8,37 +8,54 @@ OS_ROOT=$(dirname "${BASH_SOURCE}")/..

 source "${OS_ROOT}/hack/common.sh"

 cd "${OS_ROOT}"

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

-genconversion="${OS_ROOT}/_output/local/go/bin/gendeepcopy"

-if [[ ! -x "$genconversion" ]]; then

+echo "===== Verifying Generated Conversions ====="

+echo "Building gendeepcopy binary..."

+if ! buildout=`"${OS_ROOT}/hack/build-go.sh" cmd/gendeepcopy 2>&1`

+then

+  echo "FAILURE: Building gendeepcopy binary failed:"

+  echo "$buildout"

+  exit 1

+else

+  echo "$buildout" | sed 's/^/   /'

+fi

+

+gendeepcopy="${OS_ROOT}/_output/local/go/bin/gendeepcopy"

+

+echo "   Verifying gendeepcopy binary..."

+if [[ ! -x "$gendeepcopy" ]]; 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 "FAILURE: It looks as if you don't have a compiled conversion binary."

+    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="${OS_ROOT}/pkg/api"

-TMP_APIROOT="${OS_ROOT}/_tmp/api"

-_tmp="${OS_ROOT}/_tmp"

+APIROOT_REL="pkg/api"

+APIROOT="${OS_ROOT}/${APIROOT_REL}"

+TMP_APIROOT_REL="_tmp/verify-generated-deep-copies"

+TMP_APIROOT="${OS_ROOT}/${TMP_APIROOT_REL}/${APIROOT_REL}"

+

+echo "Generating fresh deep copies..."

+if ! output=`${OS_ROOT}/hack/update-generated-deep-copies.sh ${TMP_APIROOT_REL} 2>&1`

+then

+  echo "FAILURE: Generating fresh deep copies failed:"

+  echo "$output"

+  exit 1

+fi

-mkdir -p "${_tmp}"

-cp -a "${APIROOT}" "${TMP_APIROOT}"

+cp -au "${APIROOT}" "${TMP_APIROOT}/.."

-"${OS_ROOT}/hack/update-generated-deep-copies.sh"

-echo "diffing ${APIROOT} against freshly generated deep copies"

+echo "Diffing current deep copies against freshly generated deep copies..."

 ret=0

-diff -Naupr -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?

-cp -a ${TMP_APIROOT} "${OS_ROOT}/pkg"

-rm -rf "${_tmp}"

+diff -Nauprq -I 'Auto generated by' "${APIROOT}" "${TMP_APIROOT}" || ret=$?

+rm -rf "${TMP_APIROOT}"

 if [[ $ret -eq 0 ]]

 then

-  echo "${APIROOT} up to date."

+  echo "SUCCESS: Current deep copies up to date."

 else

-  echo "${APIROOT} is out of date. Please run hack/update-generated-deep-copies.sh"

+  echo "FAILURE: Current deep copies out of date. Please run hack/update-generated-deep-copies.sh"

   exit 1

 fi

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -o errexit

+set -e

 set -o nounset

 set -o pipefail

@@ -9,23 +9,28 @@ source "${OS_ROOT}/hack/common.sh"

 cd "${OS_ROOT}"

-GENERATED_DOCS_ROOT="${OS_ROOT}/docs/generated"

-_tmp="${OS_ROOT}/_tmp"

-TMP_GENERATED_DOCS_ROOT="${_tmp}/generated"

+echo "===== Verifying Generated Docs ====="

-mkdir -p "${_tmp}"

-cp -a "${GENERATED_DOCS_ROOT}/" "${_tmp}"

+GENERATED_DOCS_ROOT_REL="docs/generated"

+GENERATED_DOCS_ROOT="${OS_ROOT}/${GENERATED_DOCS_ROOT_REL}"

+TMP_GENERATED_DOCS_ROOT_REL="_tmp/verify-generated-docs"

+TMP_GENERATED_DOCS_ROOT="${OS_ROOT}/${TMP_GENERATED_DOCS_ROOT_REL}/${GENERATED_DOCS_ROOT_REL}"

-"${OS_ROOT}/hack/update-generated-docs.sh"

-echo "diffing ${GENERATED_DOCS_ROOT} against freshly generated docs"

+echo "Generating fresh docs..."

+if ! output=`${OS_ROOT}/hack/update-generated-docs.sh ${TMP_GENERATED_DOCS_ROOT_REL} 2>&1`

+then

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

+	echo "$output"

+fi

+

+echo "Diffing current docs against freshly generated docs"

 ret=0

 diff -Naupr "${GENERATED_DOCS_ROOT}" "${TMP_GENERATED_DOCS_ROOT}" || ret=$?

-cp -a "${TMP_GENERATED_DOCS_ROOT}" "${GENERATED_DOCS_ROOT}/.."

-rm -rf "${_tmp}"

+rm -rf "${TMP_GENERATED_DOCS_ROOT}"

 if [[ $ret -eq 0 ]]

 then

-  echo "${GENERATED_DOCS_ROOT} up to date."

+  echo "SUCCESS: Generated docs up to date."

 else

-  echo "${GENERATED_DOCS_ROOT} is out of date. Please run hack/update-generated-docs.sh"

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

   exit 1

 fi

new file mode 100755

@@ -0,0 +1,36 @@

+#!/bin/bash

+

+set -e

+set -o nounset

+set -o pipefail

+

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

+source "${OS_ROOT}/hack/common.sh"

+

+cd "${OS_ROOT}"

+

+echo "===== Verifying Swagger Spec ====="

+

+SPECROOT_REL="api/swagger-spec"

+SPECROOT="${OS_ROOT}/${SPECROOT_REL}"

+REL_TMP_PATH="_tmp/verify-generated-swagger-spec"

+TMP_SPECROOT="${OS_ROOT}/${REL_TMP_PATH}/${SPECROOT_REL}"

+

+echo "Generating a fresh spec..."

+if ! output=`${OS_ROOT}/hack/update-generated-swagger-spec.sh ${REL_TMP_PATH} 2>&1`

+then

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

+	echo "$output"

+fi

+

+echo "Diffing current spec against freshly generated spec..."

+ret=0

+diff -Naupr -I 'Auto generated by' "${SPECROOT}" "${TMP_SPECROOT}" || ret=$?

+rm -rf "${TMP_SPECROOT}"

+if [[ $ret -eq 0 ]]

+then

+  echo "SUCCESS: Swagger spec up to date."

+else

+  echo "FAILURE: Swagger spec is out of date. Please run hack/update-generated-swagger-spec.sh"

+  exit 1

+fi

\ No newline at end of file

deleted file mode 100755

@@ -1,29 +0,0 @@

-#!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

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

-source "${OS_ROOT}/hack/common.sh"

-

-cd "${OS_ROOT}"

-

-SPECROOT="${OS_ROOT}/api/swagger-spec"

-TMP_SPECROOT="${OS_ROOT}/_tmp/swagger-spec"

-

-mkdir -p "${TMP_SPECROOT}"

-

-echo "generating fresh swagger spec..."

-${OS_ROOT}/hack/update-swagger-spec.sh ${TMP_SPECROOT}

-echo "diffing ${SPECROOT} against freshly generated swagger spec"

-ret=0

-diff -Naupr -I 'Auto generated by' "${SPECROOT}" "${TMP_SPECROOT}" || ret=$?

-rm -rf "${TMP_SPECROOT}"

-if [[ $ret -eq 0 ]]

-then

-  echo -e "${SPECROOT} up to date."

-else

-  echo -e "${SPECROOT} is out of date. Please run hack/update-swagger-spec.sh"

-  exit 1

-fi

\ No newline at end of file