github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues 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

6
pkg/registry/core/event/strategy_test.go
View File

@@ -42,7 +42,7 @@ func TestGetAttrs(t *testing.T) {
Name: "foo",
Namespace: "baz",
UID: "long uid string",
APIVersion: legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
APIVersion: legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
ResourceVersion: "0",
FieldPath: "",
},
@@ -58,7 +58,7 @@ func TestGetAttrs(t *testing.T) {
"involvedObject.name": "foo",
"involvedObject.namespace": "baz",
"involvedObject.uid": "long uid string",
"involvedObject.apiVersion": legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
"involvedObject.apiVersion": legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"involvedObject.resourceVersion": "0",
"involvedObject.fieldPath": "",
"reason": "ForTesting",
@@ -73,7 +73,7 @@ func TestGetAttrs(t *testing.T) {
func TestSelectableFieldLabelConversions(t *testing.T) {
fset := EventToSelectableFields(&api.Event{})
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"Event",
fset,
nil,

2
pkg/registry/core/namespace/strategy_test.go
View File

@@ -139,7 +139,7 @@ func TestNamespaceFinalizeStrategy(t *testing.T) {
func TestSelectableFieldLabelConversions(t *testing.T) {
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"Namespace",
NamespaceToSelectableFields(&api.Namespace{}),
map[string]string{"name": "metadata.name"},

2
pkg/registry/core/node/strategy_test.go
View File

@@ -52,7 +52,7 @@ func TestMatchNode(t *testing.T) {
func TestSelectableFieldLabelConversions(t *testing.T) {
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"Node",
NodeToSelectableFields(&api.Node{}),
nil,

2
pkg/registry/core/persistentvolume/strategy_test.go
View File

@@ -29,7 +29,7 @@ import (
func TestSelectableFieldLabelConversions(t *testing.T) {
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"PersistentVolume",
PersistentVolumeToSelectableFields(&api.PersistentVolume{}),
map[string]string{"name": "metadata.name"},

2
pkg/registry/core/persistentvolumeclaim/strategy_test.go
View File

@@ -29,7 +29,7 @@ import (
func TestSelectableFieldLabelConversions(t *testing.T) {
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"PersistentVolumeClaim",
PersistentVolumeClaimToSelectableFields(&api.PersistentVolumeClaim{}),
map[string]string{"name": "metadata.name"},

2
pkg/registry/core/pod/strategy_test.go
View File

@@ -371,7 +371,7 @@ func TestCheckLogLocation(t *testing.T) {
func TestSelectableFieldLabelConversions(t *testing.T) {
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"Pod",
PodToSelectableFields(&api.Pod{}),
nil,

2
pkg/registry/core/replicationcontroller/strategy_test.go
View File

@@ -149,7 +149,7 @@ func TestControllerStatusStrategy(t *testing.T) {
func TestSelectableFieldLabelConversions(t *testing.T) {
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"ReplicationController",
ControllerToSelectableFields(&api.ReplicationController{}),
nil,

2
pkg/registry/core/secret/strategy_test.go
View File

@@ -107,7 +107,7 @@ func TestExportSecret(t *testing.T) {
func TestSelectableFieldLabelConversions(t *testing.T) {
apitesting.TestSelectableFieldLabelConversionsOfKind(t,
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersions[0].String(),
"Secret",
SelectableFields(&api.Secret{}),
nil,