github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7629 from caesarxuchao/new-fix-7260-7491

Browse Source 
Change the order the different versions of API are registered
This commit is contained in:
Clayton Coleman
2015-05-04 15:01:59 -04:00
parent 82b939760e 4787c66214
commit dd8184247e
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/latest/latest.go
View File

@@ -110,7 +110,8 @@ func init() {
},
)
// list of versions we support on the server
versions := []string{"v1beta1", "v1beta2", "v1beta3", "v1"}
// versions should be listed in the order of perferred versions first
versions := []string{"v1beta3", "v1beta2", "v1beta1", "v1"}
// versions that used mixed case URL formats
versionMixedCase := map[string]bool{

5
pkg/api/latest/latest_test.go
View File

@@ -72,11 +72,10 @@ func TestInterfacesFor(t *testing.T) {
}
func TestRESTMapper(t *testing.T) {
// TODO: This test does not seem right. The version returned here depends on the order in which API versions were registered. This will just return the API version that was registered first. Fix this.
if v, k, err := RESTMapper.VersionAndKindForResource("replicationControllers"); err != nil || v != "v1beta1" || k != "ReplicationController" {
if v, k, err := RESTMapper.VersionAndKindForResource("replicationControllers"); err != nil || v != "v1beta3" || k != "ReplicationController" {
t.Errorf("unexpected version mapping: %s %s %v", v, k, err)
}
if v, k, err := RESTMapper.VersionAndKindForResource("replicationcontrollers"); err != nil || v != "v1beta1" || k != "ReplicationController" {
if v, k, err := RESTMapper.VersionAndKindForResource("replicationcontrollers"); err != nil || v != "v1beta3" || k != "ReplicationController" {
t.Errorf("unexpected version mapping: %s %s %v", v, k, err)
}