From a4887bc6d4b74a76d5aad7f95c96b9b881cb04c3 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 2 Jun 2015 17:12:53 -0700 Subject: [PATCH 1/2] enable v1 in hack/test-cmd.sh --- hack/test-cmd.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index d269eecaaf3..57a28958631 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -93,6 +93,7 @@ kube::log::status "Starting kube-apiserver" --public_address_override="127.0.0.1" \ --kubelet_port=${KUBELET_PORT} \ --runtime_config=api/v1beta3 \ + --runtime_config=api/v1 \ --cert_dir="${TMPDIR:-/tmp/}" \ --service-cluster-ip-range="10.0.0.0/24" 1>&2 & APISERVER_PID=$! @@ -115,6 +116,7 @@ PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH kube_api_versions=( "" v1beta3 + v1 ) for version in "${kube_api_versions[@]}"; do if [[ -z "${version}" ]]; then @@ -138,15 +140,6 @@ for version in "${kube_api_versions[@]}"; do rc_status_replicas_field=".status.replicas" rc_container_image_field=".spec.template.spec.containers" port_field="(index .spec.ports 0).port" - if [ "${version}" = "v1beta1" ] || [ "${version}" = "v1beta2" ]; then - id_field=".id" - labels_field=".labels" - service_selector_field=".selector" - rc_replicas_field=".desiredState.replicas" - rc_status_replicas_field=".currentState.replicas" - rc_container_image_field=".desiredState.podTemplate.desiredState.manifest.containers" - port_field=".port" - fi # Passing no arguments to create is an error ! kubectl create From d9f67bc76c7e13fb28a5edfef738a8d7400d87ce Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 3 Jun 2015 09:44:19 -0700 Subject: [PATCH 2/2] fix --- pkg/api/latest/latest_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/api/latest/latest_test.go b/pkg/api/latest/latest_test.go index 8169443ae58..881ac4b8558 100644 --- a/pkg/api/latest/latest_test.go +++ b/pkg/api/latest/latest_test.go @@ -21,7 +21,6 @@ import ( "testing" internal "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" ) func TestResourceVersioner(t *testing.T) {