Merge pull request #10892 from nikhiljindal/beta1
Removing references to pre v1beta3 apis in code
This commit is contained in:
@@ -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.
|
||||
//
|
||||
|
@@ -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()
|
||||
|
@@ -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"
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user