remove most references to api.PreV1Beta3

This commit is contained in:
Chao Xu
2015-06-03 20:09:03 -07:00
parent 6b81c064ed
commit ca72165b20
10 changed files with 2 additions and 180 deletions

View File

@@ -28,9 +28,6 @@ import (
)
func getLimitRangesResourceName() string {
if api.PreV1Beta3(testapi.Version()) {
return "limitRanges"
}
return "limitranges"
}

View File

@@ -28,9 +28,6 @@ import (
)
func getNodesResourceName() string {
if api.PreV1Beta3(testapi.Version()) {
return "minions"
}
return "nodes"
}

View File

@@ -28,9 +28,6 @@ import (
)
func getPersistentVolumesResoureName() string {
if api.PreV1Beta3(testapi.Version()) {
return "persistentVolumes"
}
return "persistentvolumes"
}

View File

@@ -28,9 +28,6 @@ import (
)
func getPersistentVolumeClaimsResoureName() string {
if api.PreV1Beta3(testapi.Version()) {
return "persistentVolumeClaims"
}
return "persistentvolumeclaims"
}

View File

@@ -31,10 +31,6 @@ func getPodTemplatesResoureName() string {
}
func TestPodTemplateCreate(t *testing.T) {
if api.PreV1Beta3(testapi.Version()) {
return
}
ns := api.NamespaceDefault
podTemplate := api.PodTemplate{
ObjectMeta: api.ObjectMeta{
@@ -58,10 +54,6 @@ func TestPodTemplateCreate(t *testing.T) {
}
func TestPodTemplateGet(t *testing.T) {
if api.PreV1Beta3(testapi.Version()) {
return
}
ns := api.NamespaceDefault
podTemplate := &api.PodTemplate{
ObjectMeta: api.ObjectMeta{
@@ -85,10 +77,6 @@ func TestPodTemplateGet(t *testing.T) {
}
func TestPodTemplateList(t *testing.T) {
if api.PreV1Beta3(testapi.Version()) {
return
}
ns := api.NamespaceDefault
podTemplateList := &api.PodTemplateList{
Items: []api.PodTemplate{
@@ -114,10 +102,6 @@ func TestPodTemplateList(t *testing.T) {
}
func TestPodTemplateUpdate(t *testing.T) {
if api.PreV1Beta3(testapi.Version()) {
return
}
ns := api.NamespaceDefault
podTemplate := &api.PodTemplate{
ObjectMeta: api.ObjectMeta{
@@ -136,10 +120,6 @@ func TestPodTemplateUpdate(t *testing.T) {
}
func TestPodTemplateDelete(t *testing.T) {
if api.PreV1Beta3(testapi.Version()) {
return
}
ns := api.NamespaceDefault
c := &testClient{
Request: testRequest{Method: "DELETE", Path: testapi.ResourcePath(getPodTemplatesResoureName(), ns, "foo"), Query: buildQueryValues(ns, nil)},
@@ -150,10 +130,6 @@ func TestPodTemplateDelete(t *testing.T) {
}
func TestPodTemplateWatch(t *testing.T) {
if api.PreV1Beta3(testapi.Version()) {
return
}
c := &testClient{
Request: testRequest{
Method: "GET",

View File

@@ -25,9 +25,6 @@ import (
)
func getRCResourceName() string {
if api.PreV1Beta3(testapi.Version()) {
return "replicationControllers"
}
return "replicationcontrollers"
}

View File

@@ -28,9 +28,6 @@ import (
)
func getResourceQuotasResoureName() string {
if api.PreV1Beta3(testapi.Version()) {
return "resourceQuotas"
}
return "resourcequotas"
}