From ff06f1e2004d73a662fc6ceb7409a7f586a097c1 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Mon, 18 Apr 2016 16:46:06 -0700 Subject: [PATCH 1/2] removing call to update-swagger-spec.sh from update-generated-swagger-docs.sh --- hack/update-generated-swagger-docs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/hack/update-generated-swagger-docs.sh b/hack/update-generated-swagger-docs.sh index 2d5c370523e..121870d345c 100755 --- a/hack/update-generated-swagger-docs.sh +++ b/hack/update-generated-swagger-docs.sh @@ -64,5 +64,3 @@ done for group_version in "${GROUP_VERSIONS[@]}"; do generate_version "${group_version}" done - -"${KUBE_ROOT}/hack/update-swagger-spec.sh" From be5b842eb3607142d9d6e47dc51ca15914e5d464 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Mon, 18 Apr 2016 17:56:23 -0700 Subject: [PATCH 2/2] Adding note regarding which script requires another script to be run before that --- hack/after-build/update-swagger-spec.sh | 2 ++ hack/update-api-reference-docs.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hack/after-build/update-swagger-spec.sh b/hack/after-build/update-swagger-spec.sh index 7ec46b7b77e..91c8771f7f1 100755 --- a/hack/after-build/update-swagger-spec.sh +++ b/hack/after-build/update-swagger-spec.sh @@ -21,6 +21,8 @@ set -o errexit set -o nounset set -o pipefail +echo "Note: This assumes that types_swagger_doc_generated.go has been updated for all API group versions. Please run hack/update-generated-swagger-docs.sh to ensure that." + KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. SWAGGER_ROOT_DIR="${KUBE_ROOT}/api/swagger-spec" source "${KUBE_ROOT}/hack/lib/init.sh" diff --git a/hack/update-api-reference-docs.sh b/hack/update-api-reference-docs.sh index 22a65c9fe47..8ee47d7e221 100755 --- a/hack/update-api-reference-docs.sh +++ b/hack/update-api-reference-docs.sh @@ -21,6 +21,8 @@ set -o errexit set -o nounset set -o pipefail +echo "Note: This assumes that swagger spec has been updated. Please run hack/update-swagger-spec.sh to ensure that." + KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env