github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85135 from wojtek-t/delete_unnecessary_conversions_1

Browse Source 
Eliminate couple unnecessary conversions
This commit is contained in:
Kubernetes Prow Robot 2019-11-12 09:07:01 -08:00 committed by GitHub
commit 402e551ca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/core/v1/conversion_test.go
View File

@ -338,13 +338,7 @@ func roundTripRS(t *testing.T, rs *apps.ReplicaSet) *apps.ReplicaSet {
t.Errorf("%v\nData: %s\nSource: %#v", err, string(data), rs)
return nil
}
obj3 := &apps.ReplicaSet{}
err = legacyscheme.Scheme.Convert(obj2, obj3, nil)
if err != nil {
t.Errorf("%v\nSource: %#v", err, obj2)
return nil
}
return obj3
return obj2.(*apps.ReplicaSet)
}
func Test_core_PodStatus_to_v1_PodStatus(t *testing.T) {

8
pkg/kubelet/config/file_linux_test.go
View File

@ -33,7 +33,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi"
api "k8s.io/kubernetes/pkg/apis/core"
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
@ -200,12 +199,7 @@ func getTestCases(hostname types.NodeName) []*testCase {
}
func (tc *testCase) writeToFile(dir, name string, t *testing.T) string {
var versionedPod runtime.Object
err := legacyscheme.Scheme.Convert(&tc.pod, &versionedPod, nil)
if err != nil {
t.Fatalf("%s: error in versioning the pod: %v", tc.desc, err)
}
fileContents, err := runtime.Encode(testapi.Default.Codec(), versionedPod)
fileContents, err := runtime.Encode(testapi.Default.Codec(), tc.pod)
if err != nil {
t.Fatalf("%s: error in encoding the pod: %v", tc.desc, err)
}

8
pkg/kubelet/config/http_test.go
View File

@ -29,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi"
api "k8s.io/kubernetes/pkg/apis/core"
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
@ -293,12 +292,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
}
for _, testCase := range testCases {
var versionedPods runtime.Object
err := legacyscheme.Scheme.Convert(&testCase.pods, &versionedPods, nil)
if err != nil {
t.Fatalf("%s: error in versioning the pods: %s", testCase.desc, err)
}
data, err := runtime.Encode(testapi.Default.Codec(), versionedPods)
data, err := runtime.Encode(testapi.Default.Codec(), testCase.pods)
if err != nil {
t.Fatalf("%s: error in encoding the pod: %v", testCase.desc, err)
}

17
staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
View File

@ -2675,17 +2675,26 @@ func TestGetWithOptions(t *testing.T) {
t.Errorf("%s: unexpected response: %#v", test.name, resp)
continue
}
var itemOut genericapitesting.Simple
body, err := extractBody(resp, &itemOut)
var itemOut runtime.Object
if test.rootScoped {
itemOut = &genericapitesting.SimpleRoot{}
} else {
itemOut = &genericapitesting.Simple{}
}
body, err := extractBody(resp, itemOut)
if err != nil {
t.Errorf("%s: %v", test.name, err)
continue
}
if itemOut.Name != simpleStorage.item.Name {
if metadata, err := meta.Accessor(itemOut); err == nil {
if metadata.GetName() != simpleStorage.item.Name {
t.Errorf("%s: Unexpected data: %#v, expected %#v (%s)", test.name, itemOut, simpleStorage.item, string(body))
continue
}
} else {
t.Errorf("%s: Couldn't get name from %#v: %v", test.name, itemOut, err)
}
var opts *genericapitesting.SimpleGetOptions
var ok bool

1
staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD
View File

@ -17,7 +17,6 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",

16
staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go
View File

@ -24,7 +24,6 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/client-go/kubernetes/scheme"
metricsapi "k8s.io/metrics/pkg/apis/metrics"
)
@ -86,9 +85,7 @@ func NewNodeMetricsSorter(metrics []metricsapi.NodeMetrics, sortBy string) (*Nod
var usages = make([]v1.ResourceList, len(metrics))
if len(sortBy) > 0 {
for i, v := range metrics {
if err := scheme.Scheme.Convert(&v.Usage, &usages[i], nil); err != nil {
return nil, err
}
v.Usage.DeepCopyInto(&usages[i])
}
}
@ -166,10 +163,7 @@ func (printer *TopCmdPrinter) PrintNodeMetrics(metrics []metricsapi.NodeMetrics,
}
var usage v1.ResourceList
for _, m := range metrics {
err := scheme.Scheme.Convert(&m.Usage, &usage, nil)
if err != nil {
return err
}
m.Usage.DeepCopyInto(&usage)
printMetricsLine(w, &ResourceMetricsInfo{
Name: m.Name,
Metrics: usage,
@ -260,11 +254,9 @@ func getPodMetrics(m *metricsapi.PodMetrics, printContainersOnly bool) (v1.Resou
podMetrics[res], _ = resource.ParseQuantity("0")
}
for _, c := range m.Containers {
var usage v1.ResourceList
if err := scheme.Scheme.Convert(&c.Usage, &usage, nil); err != nil {
return nil, nil, err
}
for _, c := range m.Containers {
c.Usage.DeepCopyInto(&usage)
containers[c.Name] = usage
if !printContainersOnly {
for _, res := range MeasuredResources {