Skip to content

Commit ac992f9

Browse files
committed
remove unncessary errors.Unwrap calls
Signed-off-by: Gyuho Lee <[email protected]>
1 parent 1e3dc23 commit ac992f9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkg/kubelet/server/stats/summary_sys_containers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (sp *summaryProviderImpl) GetSystemContainersCPUAndMemoryStats(nodeConfig c
8383
}
8484
s, err := sp.provider.GetCgroupCPUAndMemoryStats(cont.name, cont.forceStatsUpdate)
8585
if err != nil {
86-
if errors.Is(errors.Unwrap(err), cadvisormemory.ErrDataNotFound) {
86+
if errors.Is(err, cadvisormemory.ErrDataNotFound) {
8787
klog.V(4).InfoS("cgroup stats not found in memory cache", "containerName", cont.name)
8888
} else {
8989
klog.ErrorS(err, "Failed to get system container stats", "containerName", cont.name)

pkg/kubelet/stats/provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (p *Provider) RlimitStats() (*statsapi.RlimitStats, error) {
115115
func (p *Provider) GetCgroupStats(cgroupName string, updateStats bool) (*statsapi.ContainerStats, *statsapi.NetworkStats, error) {
116116
info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats)
117117
if err != nil {
118-
if errors.Is(errors.Unwrap(err), cadvisormemory.ErrDataNotFound) {
118+
if errors.Is(err, cadvisormemory.ErrDataNotFound) {
119119
return nil, nil, fmt.Errorf("cgroup stats not found for %q: %w", cgroupName, cadvisormemory.ErrDataNotFound)
120120
}
121121
return nil, nil, fmt.Errorf("failed to get cgroup stats for %q: %v", cgroupName, err)
@@ -131,7 +131,7 @@ func (p *Provider) GetCgroupStats(cgroupName string, updateStats bool) (*statsap
131131
func (p *Provider) GetCgroupCPUAndMemoryStats(cgroupName string, updateStats bool) (*statsapi.ContainerStats, error) {
132132
info, err := getCgroupInfo(p.cadvisor, cgroupName, updateStats)
133133
if err != nil {
134-
if errors.Is(errors.Unwrap(err), cadvisormemory.ErrDataNotFound) {
134+
if errors.Is(err, cadvisormemory.ErrDataNotFound) {
135135
return nil, fmt.Errorf("cgroup stats not found for %q: %w", cgroupName, cadvisormemory.ErrDataNotFound)
136136
}
137137
return nil, fmt.Errorf("failed to get cgroup stats for %q: %v", cgroupName, err)

0 commit comments

Comments
 (0)