github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

cleanup req.Context() and ResponseWrapper

Browse Source
This commit is contained in:
Mike Danese
2020-01-27 18:52:27 -08:00
parent d55d6175f8
commit 968adfa993
36 changed files with 83 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/podautoscaler/legacy_horizontal_test.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package podautoscaler
import (
"context"
"encoding/json"
"fmt"
"io"
@@ -55,11 +56,11 @@ import (
_ "k8s.io/kubernetes/pkg/apis/core/install"
)
func (w fakeResponseWrapper) DoRaw() ([]byte, error) {
func (w fakeResponseWrapper) DoRaw(context.Context) ([]byte, error) {
return w.raw, nil
}
func (w fakeResponseWrapper) Stream() (io.ReadCloser, error) {
func (w fakeResponseWrapper) Stream(context.Context) (io.ReadCloser, error) {
return nil, nil
}

7
pkg/controller/podautoscaler/metrics/legacy_metrics_client.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package metrics
import (
"context"
"encoding/json"
"fmt"
"strings"
@@ -27,7 +28,7 @@ import (
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
autoscaling "k8s.io/api/autoscaling/v2beta2"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
clientset "k8s.io/client-go/kubernetes"
@@ -68,7 +69,7 @@ func (h *HeapsterMetricsClient) GetResourceMetric(resource v1.ResourceName, name
resultRaw, err := h.services.
ProxyGet(h.heapsterScheme, h.heapsterService, h.heapsterPort, metricPath, params).
DoRaw()
DoRaw(context.TODO())
if err != nil {
return nil, time.Time{}, fmt.Errorf("failed to get pod resource metrics: %v", err)
}
@@ -139,7 +140,7 @@ func (h *HeapsterMetricsClient) GetRawMetric(metricName string, namespace string
resultRaw, err := h.services.
ProxyGet(h.heapsterScheme, h.heapsterService, h.heapsterPort, metricPath, map[string]string{"start": startTime.Format(time.RFC3339)}).
DoRaw()
DoRaw(context.TODO())
if err != nil {
return nil, time.Time{}, fmt.Errorf("failed to get pod metrics: %v", err)
}

7
pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go
View File

@@ -17,13 +17,14 @@ limitations under the License.
package metrics
import (
"context"
"encoding/json"
"fmt"
"io"
"testing"
"time"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
@@ -40,11 +41,11 @@ import (
var fixedTimestamp = time.Date(2015, time.November, 10, 12, 30, 0, 0, time.UTC)
func (w fakeResponseWrapper) DoRaw() ([]byte, error) {
func (w fakeResponseWrapper) DoRaw(context.Context) ([]byte, error) {
return w.raw, nil
}
func (w fakeResponseWrapper) Stream() (io.ReadCloser, error) {
func (w fakeResponseWrapper) Stream(context.Context) (io.ReadCloser, error) {
return nil, nil
}