github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

remove unused param

Browse Source
This commit is contained in:
louisgong 2020-03-23 20:26:21 +08:00
parent 0efb70c0a2
commit e56d40d048
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/stats/cadvisor_stats_provider.go
View File

@ -120,7 +120,7 @@ func (p *cadvisorStatsProvider) ListPodStats() ([]statsapi.PodStats, error) {
if containerName == leaky.PodInfraContainerName { if containerName == leaky.PodInfraContainerName {
// Special case for infrastructure container which is hidden from // Special case for infrastructure container which is hidden from
// the user and has network stats. // the user and has network stats.
podStats.Network = cadvisorInfoToNetworkStats("pod:"+ref.Namespace+"_"+ref.Name, &cinfo) podStats.Network = cadvisorInfoToNetworkStats(&cinfo)
} else { } else {
podStats.Containers = append(podStats.Containers, *cadvisorInfoToContainerStats(containerName, &cinfo, &rootFsInfo, &imageFsInfo)) podStats.Containers = append(podStats.Containers, *cadvisorInfoToContainerStats(containerName, &cinfo, &rootFsInfo, &imageFsInfo))
} }

2
pkg/kubelet/stats/cri_stats_provider.go
View File

@ -426,7 +426,7 @@ func (p *criStatsProvider) addPodNetworkStats(
caPodSandbox, found := caInfos[podSandboxID] caPodSandbox, found := caInfos[podSandboxID]
// try get network stats from cadvisor first. // try get network stats from cadvisor first.
if found { if found {
networkStats := cadvisorInfoToNetworkStats(ps.PodRef.Name, &caPodSandbox) networkStats := cadvisorInfoToNetworkStats(&caPodSandbox)
if networkStats != nil { if networkStats != nil {
ps.Network = networkStats ps.Network = networkStats
return return

2
pkg/kubelet/stats/helper.go
View File

@ -164,7 +164,7 @@ func cadvisorInfoToProcessStats(info *cadvisorapiv2.ContainerInfo) *statsapi.Pro
// cadvisorInfoToNetworkStats returns the statsapi.NetworkStats converted from // cadvisorInfoToNetworkStats returns the statsapi.NetworkStats converted from
// the container info from cadvisor. // the container info from cadvisor.
func cadvisorInfoToNetworkStats(name string, info *cadvisorapiv2.ContainerInfo) *statsapi.NetworkStats { func cadvisorInfoToNetworkStats(info *cadvisorapiv2.ContainerInfo) *statsapi.NetworkStats {
if !info.Spec.HasNetwork { if !info.Spec.HasNetwork {
return nil return nil
} }

2
pkg/kubelet/stats/stats_provider.go
View File

@ -114,7 +114,7 @@ func (p *StatsProvider) GetCgroupStats(cgroupName string, updateStats bool) (*st
} }
// Rootfs and imagefs doesn't make sense for raw cgroup. // Rootfs and imagefs doesn't make sense for raw cgroup.
s := cadvisorInfoToContainerStats(cgroupName, info, nil, nil) s := cadvisorInfoToContainerStats(cgroupName, info, nil, nil)
n := cadvisorInfoToNetworkStats(cgroupName, info) n := cadvisorInfoToNetworkStats(info)
return s, n, nil return s, n, nil
} }