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

Move Kubelet Summary API to staging repo

Browse Source
This commit is contained in:
Marek Siarkowicz
2020-07-11 12:59:52 +02:00
committed by Marek Siarkowicz
parent 402b94f313
commit 7d309e0104
65 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e_node/util.go
View File

@@ -39,10 +39,10 @@ import (
"k8s.io/klog/v2"
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
kubeletpodresourcesv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1"
stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/features"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/apis/podresources"
kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/cm"
"k8s.io/kubernetes/pkg/kubelet/cri/remote"
kubeletconfigcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec"
@@ -71,7 +71,7 @@ const (
defaultPodResourcesMaxSize = 1024 * 1024 * 16 // 16 Mb
)
func getNodeSummary() (*kubeletstatsv1alpha1.Summary, error) {
func getNodeSummary() (*stats.Summary, error) {
kubeletConfig, err := getCurrentKubeletConfig()
if err != nil {
return nil, fmt.Errorf("failed to get current kubelet config")
@@ -95,7 +95,7 @@ func getNodeSummary() (*kubeletstatsv1alpha1.Summary, error) {
}
decoder := json.NewDecoder(strings.NewReader(string(contentsBytes)))
summary := kubeletstatsv1alpha1.Summary{}
summary := stats.Summary{}
err = decoder.Decode(&summary)
if err != nil {
return nil, fmt.Errorf("failed to parse /stats/summary to go struct: %+v", resp)