From 1350cc8bc38cfa5cba516f38296d7be42f40bb33 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Thu, 9 Jul 2015 18:39:33 -0700 Subject: [PATCH] Set KUBE_API_VERSIONS appropriately --- hack/update-generated-conversions.sh | 6 ++++-- hack/update-generated-deep-copies.sh | 26 ++++++++++++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/hack/update-generated-conversions.sh b/hack/update-generated-conversions.sh index 1236079ee7c..e67f5feda18 100755 --- a/hack/update-generated-conversions.sh +++ b/hack/update-generated-conversions.sh @@ -49,6 +49,8 @@ EOF } VERSIONS="v1beta3 v1" -for ver in $VERSIONS; do - generate_version "${ver}" +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 diff --git a/hack/update-generated-deep-copies.sh b/hack/update-generated-deep-copies.sh index 3b2e9a2415f..71e6e88bc45 100755 --- a/hack/update-generated-deep-copies.sh +++ b/hack/update-generated-deep-copies.sh @@ -50,11 +50,21 @@ EOF mv $TMPFILE `result_file_name ${version}` } -VERSIONS="api v1beta3 v1" -# To avoid compile errors, remove the currently existing files. -for ver in $VERSIONS; do - rm -f `result_file_name ${ver}` -done -for ver in $VERSIONS; do - generate_version "${ver}" -done +function generate_deep_copies() { + local versions="api v1beta3 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