scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-26 19:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop duplicating preferred version order

Browse Source
This commit is contained in:
David Eads
2018-04-26 09:38:43 -04:00
parent b8ab2891b3
commit a89291a5de
65 changed files with 178 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/core/install/install_test.go
View File

@@ -53,7 +53,7 @@ func TestCodec(t *testing.T) {
pod := internal.Pod{}
// We do want to use package registered rather than testapi here, because we
// want to test if the package install and package registered work as expected.
data, err := runtime.Encode(legacyscheme.Codecs.LegacyCodec(legacyscheme.Registry.GroupOrDie(internal.GroupName).GroupVersion), &pod)
data, err := runtime.Encode(legacyscheme.Codecs.LegacyCodec(legacyscheme.Registry.GroupOrDie(internal.GroupName).GroupVersions[0]), &pod)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -61,7 +61,7 @@ func TestCodec(t *testing.T) {
if err := json.Unmarshal(data, &other); err != nil {
t.Fatalf("unexpected error: %v", err)
}
if other.APIVersion != legacyscheme.Registry.GroupOrDie(internal.GroupName).GroupVersion.Version || other.Kind != "Pod" {
if other.APIVersion != legacyscheme.Registry.GroupOrDie(internal.GroupName).GroupVersions[0].Version || other.Kind != "Pod" {
t.Errorf("unexpected unmarshalled object %#v", other)
}
}

32
pkg/apis/core/validation/validation_test.go
View File

@@ -4025,7 +4025,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.annotations['key']",
},
},
@@ -4034,7 +4034,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.labels['key']",
},
},
@@ -4043,7 +4043,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.name",
},
},
@@ -4052,7 +4052,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.namespace",
},
},
@@ -4061,7 +4061,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.uid",
},
},
@@ -4070,7 +4070,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "spec.nodeName",
},
},
@@ -4079,7 +4079,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "spec.serviceAccountName",
},
},
@@ -4088,7 +4088,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "status.hostIP",
},
},
@@ -4097,7 +4097,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "status.podIP",
},
},
@@ -4166,7 +4166,7 @@ func TestValidateEnv(t *testing.T) {
Value: "foo",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.name",
},
},
@@ -4187,7 +4187,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.name",
},
SecretKeyRef: &core.SecretKeySelector{
@@ -4206,7 +4206,7 @@ func TestValidateEnv(t *testing.T) {
Name: "some_var_name",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.name",
},
ConfigMapKeyRef: &core.ConfigMapKeySelector{
@@ -4225,7 +4225,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
FieldPath: "metadata.name",
},
SecretKeyRef: &core.SecretKeySelector{
@@ -4278,7 +4278,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
},
},
}},
@@ -4303,7 +4303,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
FieldPath: "metadata.whoops",
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
},
},
}},
@@ -4381,7 +4381,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
FieldPath: "status.phase",
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
},
},
}},