From cc4ec80ec74019e49835857b2291d16cae3b7ad7 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Fri, 9 Oct 2015 15:19:13 -0700 Subject: [PATCH] in scripts, experimental/v1alpha1->extensions/v1beta1 --- cluster/gce/config-test.sh | 2 +- cluster/gce/util.sh | 6 +++--- cluster/vagrant/util.sh | 4 ++-- hack/after-build/update-generated-conversions.sh | 2 +- hack/after-build/update-generated-deep-copies.sh | 2 +- hack/after-build/update-swagger-spec.sh | 2 +- hack/lib/util.sh | 2 +- hack/test-cmd.sh | 4 ++-- hack/test-go.sh | 6 +++--- hack/test-integration.sh | 10 +++++----- hack/update-generated-swagger-docs.sh | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index d4c84858197..01288b48ecc 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -64,7 +64,7 @@ TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}" TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=3m}" KUBELET_TEST_ARGS="--max-pods=100 $TEST_CLUSTER_LOG_LEVEL" -APISERVER_TEST_ARGS="--runtime-config=experimental/v1alpha1 ${TEST_CLUSTER_LOG_LEVEL}" +APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${TEST_CLUSTER_LOG_LEVEL}" CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL} ${TEST_CLUSTER_RESYNC_PERIOD}" SCHEDULER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" KUBEPROXY_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 2896be6bb74..cacb3d89a73 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -57,10 +57,10 @@ function join_csv { function verify-prereqs { if [[ "${ENABLE_EXPERIMENTAL_API}" == "true" ]]; then if [[ -z "${RUNTIME_CONFIG}" ]]; then - RUNTIME_CONFIG="experimental/v1alpha1=true" + RUNTIME_CONFIG="extensions/v1beta1=true" else - # TODO: add checking if RUNTIME_CONFIG contains "experimental/v1alpha1=false" and appending "experimental/v1alpha1=true" if not. - if echo "${RUNTIME_CONFIG}" | grep -q -v "experimental/v1alpha1=true"; then + # TODO: add checking if RUNTIME_CONFIG contains "extensions/v1beta1=false" and appending "extensions/v1beta1=true" if not. + if echo "${RUNTIME_CONFIG}" | grep -q -v "extensions/v1beta1=true"; then echo "Experimental API should be turned on, but is not turned on in RUNTIME_CONFIG!" >&2 exit 1 fi diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh index 1a69cc48a60..34025721041 100644 --- a/cluster/vagrant/util.sh +++ b/cluster/vagrant/util.sh @@ -36,10 +36,10 @@ function detect-minions { function verify-prereqs { if [[ "${ENABLE_EXPERIMENTAL_API}" == "true" ]]; then if [[ -z "${RUNTIME_CONFIG}" ]]; then - RUNTIME_CONFIG="experimental/v1alpha1" + RUNTIME_CONFIG="extensions/v1beta1" else # TODO: add checking if RUNTIME_CONFIG contains "experimental/v1=false" and appending "experimental/v1=true" if not. - if echo "${RUNTIME_CONFIG}" | grep -q -v "experimental/v1alpha1=true"; then + if echo "${RUNTIME_CONFIG}" | grep -q -v "extensions/v1beta1=true"; then echo "Experimental API should be turned on, but is not turned on in RUNTIME_CONFIG!" exit 1 fi diff --git a/hack/after-build/update-generated-conversions.sh b/hack/after-build/update-generated-conversions.sh index 8106b6e99f8..a2198c44047 100755 --- a/hack/after-build/update-generated-conversions.sh +++ b/hack/after-build/update-generated-conversions.sh @@ -43,7 +43,7 @@ EOF } # TODO(lavalamp): get this list by listing the pkg/apis/ directory? -DEFAULT_GROUP_VERSIONS="v1 experimental/v1alpha1" +DEFAULT_GROUP_VERSIONS="v1 extensions/v1beta1" VERSIONS=${VERSIONS:-$DEFAULT_GROUP_VERSIONS} for ver in $VERSIONS; do # Ensure that the version being processed is registered by setting diff --git a/hack/after-build/update-generated-deep-copies.sh b/hack/after-build/update-generated-deep-copies.sh index 3d2fecffc9e..18599852f00 100755 --- a/hack/after-build/update-generated-deep-copies.sh +++ b/hack/after-build/update-generated-deep-copies.sh @@ -57,6 +57,6 @@ function generate_deep_copies() { } # v1 is in the group "" -DEFAULT_VERSIONS="/ v1 experimental/ experimental/v1alpha1" +DEFAULT_VERSIONS="/ v1 experimental/ extensions/v1beta1" VERSIONS=${VERSIONS:-$DEFAULT_VERSIONS} generate_deep_copies "$VERSIONS" diff --git a/hack/after-build/update-swagger-spec.sh b/hack/after-build/update-swagger-spec.sh index 9f6694f55ae..7851afecae1 100755 --- a/hack/after-build/update-swagger-spec.sh +++ b/hack/after-build/update-swagger-spec.sh @@ -50,7 +50,7 @@ kube::etcd::start # Start kube-apiserver kube::log::status "Starting kube-apiserver" -KUBE_API_VERSIONS="v1,experimental/v1alpha1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \ +KUBE_API_VERSIONS="v1,extensions/v1beta1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \ --address="127.0.0.1" \ --public-address-override="127.0.0.1" \ --port="${API_PORT}" \ diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 7154e1e0082..77cb1ccf82f 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -242,7 +242,7 @@ kube::util::analytics-link() { # Takes a group/version and returns the path to its location on disk, sans # "pkg". E.g.: -# * default behavior: experimental/v1alpha1 -> apis/experimental/v1alpha1 +# * default behavior: extensions/v1beta1 -> apis/extensions/v1beta1 # * default behavior for only a group: experimental -> apis/experimental # * Special handling for empty group: v1 -> api/v1, unversioned -> api/unversioned # * Very special handling for when both group and version are "": / -> api diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 040a3f44efa..ba94d607c9a 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -127,7 +127,7 @@ kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kub # Start kube-apiserver kube::log::status "Starting kube-apiserver" -KUBE_API_VERSIONS="v1,experimental/v1alpha1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \ +KUBE_API_VERSIONS="v1,extensions/v1beta1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \ --address="127.0.0.1" \ --public-address-override="127.0.0.1" \ --port="${API_PORT}" \ @@ -905,7 +905,7 @@ kube_api_versions=( v1 ) for version in "${kube_api_versions[@]}"; do - KUBE_API_VERSIONS="v1,experimental/v1alpha1" runTests "${version}" + KUBE_API_VERSIONS="v1,extensions/v1beta1" runTests "${version}" done kube::log::status "TEST PASSED" diff --git a/hack/test-go.sh b/hack/test-go.sh index 3cbc902188b..50ca0ddbc8d 100755 --- a/hack/test-go.sh +++ b/hack/test-go.sh @@ -57,8 +57,8 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-} # separated by comma, lists are separated by semicolon. e.g., # "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3" # TODO: It's going to be: -# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"} -KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"} +# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"} +KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"} # once we have multiple group supports # Run tests with the standard (registry) and a custom etcd prefix # (kubernetes.io/registry). @@ -315,7 +315,7 @@ for (( i=0, j=0; ; )); do # KUBE_TEST_API sets the version of each group to be tested. KUBE_API_VERSIONS # register the groups/versions as supported by k8s. So KUBE_API_VERSIONS # needs to be the superset of KUBE_TEST_API. - KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,experimental/v1alpha1" ETCD_PREFIX=${etcdPrefix} runTests "$@" + KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,extensions/v1beta1" ETCD_PREFIX=${etcdPrefix} runTests "$@" i=${i}+1 j=${j}+1 if [[ i -eq ${apiVersionsCount} ]] && [[ j -eq ${etcdPrefixesCount} ]]; then diff --git a/hack/test-integration.sh b/hack/test-integration.sh index c214f622137..3f34e7ebf67 100755 --- a/hack/test-integration.sh +++ b/hack/test-integration.sh @@ -28,8 +28,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" # separated by comma, lists are separated by semicolon. e.g., # "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3" # TODO: It's going to be: -# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"} -KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"} +# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"} +KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"} # Give integration tests longer to run KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 240s} @@ -52,18 +52,18 @@ runTests() { KUBE_RACE="" \ KUBE_TIMEOUT="${KUBE_TIMEOUT}" \ KUBE_TEST_API_VERSIONS="$1" \ - KUBE_API_VERSIONS="v1,experimental/v1alpha1" \ + KUBE_API_VERSIONS="v1,extensions/v1beta1" \ "${KUBE_ROOT}/hack/test-go.sh" test/integration kube::log::status "Running integration test scenario" - KUBE_API_VERSIONS="v1,experimental/v1alpha1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \ + KUBE_API_VERSIONS="v1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \ --max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" cleanup } -KUBE_API_VERSIONS="v1,experimental/v1alpha1" "${KUBE_ROOT}/hack/build-go.sh" "$@" cmd/integration +KUBE_API_VERSIONS="v1,extensions/v1beta1" "${KUBE_ROOT}/hack/build-go.sh" "$@" cmd/integration # Run cleanup to stop etcd on interrupt or other kill signal. trap cleanup EXIT diff --git a/hack/update-generated-swagger-docs.sh b/hack/update-generated-swagger-docs.sh index 6a11fce7610..8747af3e80f 100755 --- a/hack/update-generated-swagger-docs.sh +++ b/hack/update-generated-swagger-docs.sh @@ -56,7 +56,7 @@ EOF mv "$TMPFILE" "pkg/$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go" } -GROUP_VERSIONS=(unversioned v1 experimental/v1alpha1) +GROUP_VERSIONS=(unversioned v1 extensions/v1beta1) # To avoid compile errors, remove the currently existing files. for group_version in "${GROUP_VERSIONS[@]}"; do rm -f "pkg/$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go"