Merge pull request kubernetes#10892 from nikhiljindal/beta1

Removing references to pre v1beta3 apis in code
lavalamp · Jul 24, 2015 · 136d534 · 136d534
2 parents 2a10eab + fc4da68
commit 136d534
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 112 deletions.
diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
@@ -468,7 +468,6 @@ runTests() {
 
   ### Printing pod templates works
   kubectl get podtemplates "${kube_flags[@]}"
-  ### Display of an object which doesn't existing in v1beta1 and v1beta2 works
   [[ "$(kubectl get podtemplates -o yaml "${kube_flags[@]}" | grep nginx)" ]]
 
   ### Delete nginx pod template by name
@@ -738,20 +737,6 @@ __EOF__
   # Post-condition: node is schedulable
   kube::test::get_object_assert "nodes 127.0.0.1" "{{.spec.unschedulable}}" '<no value>'
 
-  ###########
-  # Nodes #
-  ###########
-
-  if [[ "${version}" = "v1beta1" ]] || [[ "${version}" = "v1beta2" ]]; then
-    kube::log::status "Testing kubectl(${version}:nodes)"
-
-    kube::test::get_object_assert nodes "{{range.items}}{{$id_field}}:{{end}}" '127.0.0.1:'
-
-    kube::test::get_object_assert nodes '{{.kind}}' 'List'
-
-    kube::test::describe_object_assert nodes "127.0.0.1" "Name:" "Conditions:" "Addresses:" "Capacity:" "Pods:"
-  fi
-
 
   #####################
   # Retrieve multiple #

diff --git a/pkg/api/meta/restmapper.go b/pkg/api/meta/restmapper.go
@@ -66,8 +66,7 @@ type typeMeta struct {
 // can be mapped with the provided MetadataAccessor and Codec interfaces.
 //
 // The resource name of a Kind is defined as the lowercase,
-// English-plural version of the Kind string in v1beta3 and onwards,
-// and as the camelCase version of the name in v1beta1 and v1beta2.
+// English-plural version of the Kind string.
 // When converting from resource to Kind, the singular version of the
 // resource name is also accepted for convenience.
 //

diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
@@ -202,7 +203,7 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
 				ev.ValueFrom = &api.EnvVarSource{}
 				ev.ValueFrom.FieldRef = &api.ObjectFieldSelector{}
 
-				versions := []string{"v1beta1", "v1beta2", "v1beta3"}
+				versions := registered.RegisteredVersions
 
 				ev.ValueFrom.FieldRef.APIVersion = versions[c.Rand.Intn(len(versions))]
 				ev.ValueFrom.FieldRef.FieldPath = c.RandString()

diff --git a/pkg/api/unversioned.go b/pkg/api/unversioned.go
@@ -35,24 +35,13 @@ type RootPaths struct {
 	Paths []string `json:"paths"`
 }
 
-// preV1Beta3 returns true if the provided API version is an API introduced before v1beta3.
-func PreV1Beta3(version string) bool {
-	return version == "v1beta1" || version == "v1beta2"
-}
-
 // TODO: remove me when watch is refactored
 func LabelSelectorQueryParam(version string) string {
-	if PreV1Beta3(version) {
-		return "labels"
-	}
 	return "labelSelector"
 }
 
 // TODO: remove me when watch is refactored
 func FieldSelectorQueryParam(version string) string {
-	if PreV1Beta3(version) {
-		return "fields"
-	}
 	return "fieldSelector"
 }
 

diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -164,15 +164,13 @@ func (c *testClient) ValidateCommon(t *testing.T, err error) {
 // buildResourcePath is a convenience function for knowing if a namespace should be in a path param or not
 func buildResourcePath(namespace, resource string) string {
 	if len(namespace) > 0 {
-		if !(testapi.Version() == "v1beta1" || testapi.Version() == "v1beta2") {
-			return path.Join("namespaces", namespace, resource)
-		}
+		return path.Join("namespaces", namespace, resource)
 	}
 	return resource
 }
 
 // buildQueryValues is a convenience function for knowing if a namespace should be in a query param or not
-func buildQueryValues(namespace string, query url.Values) url.Values {
+func buildQueryValues(query url.Values) url.Values {
 	v := url.Values{}
 	if query != nil {
 		for key, values := range query {
@@ -181,11 +179,6 @@ func buildQueryValues(namespace string, query url.Values) url.Values {
 			}
 		}
 	}
-	if len(namespace) > 0 {
-		if api.PreV1Beta3(testapi.Version()) {
-			v.Set("namespace", namespace)
-		}
-	}
 	return v
 }
 

diff --git a/pkg/client/endpoints_test.go b/pkg/client/endpoints_test.go
@@ -27,7 +27,7 @@ import (
 func TestListEndpoints(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request: testRequest{Method: "GET", Path: testapi.ResourcePath("endpoints", ns, ""), Query: buildQueryValues(ns, nil)},
+		Request: testRequest{Method: "GET", Path: testapi.ResourcePath("endpoints", ns, ""), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200,
 			Body: &api.EndpointsList{
 				Items: []api.Endpoints{
@@ -49,7 +49,7 @@ func TestListEndpoints(t *testing.T) {
 func TestGetEndpoints(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request:  testRequest{Method: "GET", Path: testapi.ResourcePath("endpoints", ns, "endpoint-1"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "GET", Path: testapi.ResourcePath("endpoints", ns, "endpoint-1"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: &api.Endpoints{ObjectMeta: api.ObjectMeta{Name: "endpoint-1"}}},
 	}
 	response, err := c.Setup().Endpoints(ns).Get("endpoint-1")

diff --git a/pkg/client/events.go b/pkg/client/events.go
@@ -192,8 +192,5 @@ func (e *events) GetFieldSelector(involvedObjectName, involvedObjectNamespace, i
 
 // Returns the appropriate field label to use for name of the involved object as per the given API version.
 func getInvolvedObjectNameFieldLabel(version string) string {
-	if api.PreV1Beta3(version) {
-		return "involvedObject.id"
-	}
 	return "involvedObject.name"
 }
diff --git a/pkg/client/limit_ranges_test.go b/pkg/client/limit_ranges_test.go
@@ -57,7 +57,7 @@ func TestLimitRangeCreate(t *testing.T) {
 		Request: testRequest{
 			Method: "POST",
 			Path:   testapi.ResourcePath(getLimitRangesResourceName(), ns, ""),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   limitRange,
 		},
 		Response: Response{StatusCode: 200, Body: limitRange},
@@ -93,7 +93,7 @@ func TestLimitRangeGet(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getLimitRangesResourceName(), ns, "abc"),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: limitRange},
@@ -117,7 +117,7 @@ func TestLimitRangeList(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getLimitRangesResourceName(), ns, ""),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: limitRangeList},
@@ -150,7 +150,7 @@ func TestLimitRangeUpdate(t *testing.T) {
 		},
 	}
 	c := &testClient{
-		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getLimitRangesResourceName(), ns, "abc"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getLimitRangesResourceName(), ns, "abc"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: limitRange},
 	}
 	response, err := c.Setup().LimitRanges(ns).Update(limitRange)
@@ -180,7 +180,7 @@ func TestInvalidLimitRangeUpdate(t *testing.T) {
 		},
 	}
 	c := &testClient{
-		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getLimitRangesResourceName(), ns, "abc"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getLimitRangesResourceName(), ns, "abc"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: limitRange},
 	}
 	_, err := c.Setup().LimitRanges(ns).Update(limitRange)
@@ -192,7 +192,7 @@ func TestInvalidLimitRangeUpdate(t *testing.T) {
 func TestLimitRangeDelete(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getLimitRangesResourceName(), ns, "foo"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getLimitRangesResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
 	err := c.Setup().LimitRanges(ns).Delete("foo")

diff --git a/pkg/client/nodes.go b/pkg/client/nodes.go
@@ -49,12 +49,8 @@ func newNodes(c *Client) *nodes {
 	return &nodes{c}
 }
 
-// resourceName returns node's URL resource name based on resource version.
-// Uses "minions" as the URL resource name for v1beta1 and v1beta2.
+// resourceName returns node's URL resource name.
 func (c *nodes) resourceName() string {
-	if api.PreV1Beta3(c.r.APIVersion()) {
-		return "minions"
-	}
 	return "nodes"
 }
 

diff --git a/pkg/client/nodes_test.go b/pkg/client/nodes_test.go
@@ -44,13 +44,12 @@ func TestListMinions(t *testing.T) {
 }
 
 func TestListMinionsLabels(t *testing.T) {
-	ns := api.NamespaceNone
 	labelSelectorQueryParamName := api.LabelSelectorQueryParam(testapi.Version())
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getNodesResourceName(), "", ""),
-			Query:  buildQueryValues(ns, url.Values{labelSelectorQueryParamName: []string{"foo=bar,name=baz"}})},
+			Query:  buildQueryValues(url.Values{labelSelectorQueryParamName: []string{"foo=bar,name=baz"}})},
 		Response: Response{
 			StatusCode: 200,
 			Body: &api.NodeList{

diff --git a/pkg/client/persistentvolume_test.go b/pkg/client/persistentvolume_test.go
@@ -50,7 +50,7 @@ func TestPersistentVolumeCreate(t *testing.T) {
 		Request: testRequest{
 			Method: "POST",
 			Path:   testapi.ResourcePath(getPersistentVolumesResoureName(), "", ""),
-			Query:  buildQueryValues("", nil),
+			Query:  buildQueryValues(nil),
 			Body:   pv,
 		},
 		Response: Response{StatusCode: 200, Body: pv},
@@ -79,7 +79,7 @@ func TestPersistentVolumeGet(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getPersistentVolumesResoureName(), "", "abc"),
-			Query:  buildQueryValues("", nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: persistentVolume},
@@ -101,7 +101,7 @@ func TestPersistentVolumeList(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getPersistentVolumesResoureName(), "", ""),
-			Query:  buildQueryValues("", nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: persistentVolumeList},
@@ -126,7 +126,7 @@ func TestPersistentVolumeUpdate(t *testing.T) {
 		},
 	}
 	c := &testClient{
-		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getPersistentVolumesResoureName(), "", "abc"), Query: buildQueryValues("", nil)},
+		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getPersistentVolumesResoureName(), "", "abc"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: persistentVolume},
 	}
 	response, err := c.Setup().PersistentVolumes().Update(persistentVolume)
@@ -156,7 +156,7 @@ func TestPersistentVolumeStatusUpdate(t *testing.T) {
 		Request: testRequest{
 			Method: "PUT",
 			Path:   testapi.ResourcePath(getPersistentVolumesResoureName(), "", "abc") + "/status",
-			Query:  buildQueryValues("", nil)},
+			Query:  buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: persistentVolume},
 	}
 	response, err := c.Setup().PersistentVolumes().UpdateStatus(persistentVolume)
@@ -165,7 +165,7 @@ func TestPersistentVolumeStatusUpdate(t *testing.T) {
 
 func TestPersistentVolumeDelete(t *testing.T) {
 	c := &testClient{
-		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getPersistentVolumesResoureName(), "", "foo"), Query: buildQueryValues("", nil)},
+		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getPersistentVolumesResoureName(), "", "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
 	err := c.Setup().PersistentVolumes().Delete("foo")

diff --git a/pkg/client/persistentvolumeclaim_test.go b/pkg/client/persistentvolumeclaim_test.go
@@ -54,7 +54,7 @@ func TestPersistentVolumeClaimCreate(t *testing.T) {
 		Request: testRequest{
 			Method: "POST",
 			Path:   testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, ""),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   pv,
 		},
 		Response: Response{StatusCode: 200, Body: pv},
@@ -87,7 +87,7 @@ func TestPersistentVolumeClaimGet(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, "abc"),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: persistentVolumeClaim},
@@ -110,7 +110,7 @@ func TestPersistentVolumeClaimList(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, ""),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: persistentVolumeList},
@@ -139,7 +139,7 @@ func TestPersistentVolumeClaimUpdate(t *testing.T) {
 		},
 	}
 	c := &testClient{
-		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, "abc"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, "abc"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: persistentVolumeClaim},
 	}
 	response, err := c.Setup().PersistentVolumeClaims(ns).Update(persistentVolumeClaim)
@@ -172,7 +172,7 @@ func TestPersistentVolumeClaimStatusUpdate(t *testing.T) {
 		Request: testRequest{
 			Method: "PUT",
 			Path:   testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, "abc") + "/status",
-			Query:  buildQueryValues(ns, nil)},
+			Query:  buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: persistentVolumeClaim},
 	}
 	response, err := c.Setup().PersistentVolumeClaims(ns).UpdateStatus(persistentVolumeClaim)
@@ -182,7 +182,7 @@ func TestPersistentVolumeClaimStatusUpdate(t *testing.T) {
 func TestPersistentVolumeClaimDelete(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, "foo"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getPersistentVolumeClaimsResoureName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
 	err := c.Setup().PersistentVolumeClaims(ns).Delete("foo")

diff --git a/pkg/client/pod_templates_test.go b/pkg/client/pod_templates_test.go
@@ -43,7 +43,7 @@ func TestPodTemplateCreate(t *testing.T) {
 		Request: testRequest{
 			Method: "POST",
 			Path:   testapi.ResourcePath(getPodTemplatesResoureName(), ns, ""),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   &podTemplate,
 		},
 		Response: Response{StatusCode: 200, Body: &podTemplate},
@@ -66,7 +66,7 @@ func TestPodTemplateGet(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getPodTemplatesResoureName(), ns, "abc"),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: podTemplate},
@@ -92,7 +92,7 @@ func TestPodTemplateList(t *testing.T) {
 		Request: testRequest{
 			Method: "GET",
 			Path:   testapi.ResourcePath(getPodTemplatesResoureName(), ns, ""),
-			Query:  buildQueryValues(ns, nil),
+			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
 		Response: Response{StatusCode: 200, Body: podTemplateList},
@@ -112,7 +112,7 @@ func TestPodTemplateUpdate(t *testing.T) {
 		Template: api.PodTemplateSpec{},
 	}
 	c := &testClient{
-		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getPodTemplatesResoureName(), ns, "abc"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "PUT", Path: testapi.ResourcePath(getPodTemplatesResoureName(), ns, "abc"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: podTemplate},
 	}
 	response, err := c.Setup().PodTemplates(ns).Update(podTemplate)
@@ -122,7 +122,7 @@ func TestPodTemplateUpdate(t *testing.T) {
 func TestPodTemplateDelete(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getPodTemplatesResoureName(), ns, "foo"), Query: buildQueryValues(ns, nil)},
+		Request:  testRequest{Method: "DELETE", Path: testapi.ResourcePath(getPodTemplatesResoureName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
 	err := c.Setup().PodTemplates(ns).Delete("foo", nil)