generated from demus/golang-rpm-template
75 lines
3.1 KiB
Diff
75 lines
3.1 KiB
Diff
Index: pkg/cri/server/helpers.go
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/pkg/cri/sbserver/container_stats_list.go b/pkg/cri/sbserver/container_stats_list.go
|
|
--- a/pkg/cri/sbserver/container_stats_list.go
|
|
+++ b/pkg/cri/sbserver/container_stats_list.go (date 1736383254303)
|
|
@@ -23,7 +23,6 @@
|
|
"reflect"
|
|
"time"
|
|
|
|
- wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
|
|
cg1 "github.com/containerd/cgroups/v3/cgroup1/stats"
|
|
cg2 "github.com/containerd/cgroups/v3/cgroup2/stats"
|
|
"github.com/containerd/containerd/api/services/tasks/v1"
|
|
Index: pkg/cri/server/helpers.go
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
|
|
--- a/pkg/cri/server/helpers.go
|
|
+++ b/pkg/cri/server/helpers.go (date 1736786192450)
|
|
@@ -43,7 +43,6 @@
|
|
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
|
|
"github.com/sirupsen/logrus"
|
|
|
|
- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
|
|
imagedigest "github.com/opencontainers/go-digest"
|
|
"github.com/pelletier/go-toml"
|
|
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
|
|
Index: pkg/cri/sbserver/helpers.go
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/pkg/cri/sbserver/helpers.go b/pkg/cri/sbserver/helpers.go
|
|
--- a/pkg/cri/sbserver/helpers.go
|
|
+++ b/pkg/cri/sbserver/helpers.go (date 1685746840000)
|
|
@@ -44,7 +44,6 @@
|
|
"github.com/containerd/containerd/runtime/linux/runctypes"
|
|
runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
|
|
|
|
- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
|
|
imagedigest "github.com/opencontainers/go-digest"
|
|
"github.com/pelletier/go-toml"
|
|
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
|
|
Index: pkg/cri/server/container_stats_list_linux.go
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
diff --git a/pkg/cri/server/container_stats_list_linux.go b/pkg/cri/server/container_stats_list_linux.go
|
|
--- a/pkg/cri/server/container_stats_list_linux.go
|
|
+++ b/pkg/cri/server/container_stats_list_linux.go (date 1685746840000)
|
|
@@ -22,7 +22,6 @@
|
|
"reflect"
|
|
"time"
|
|
|
|
- wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
|
|
v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
|
|
v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
|
|
"github.com/containerd/containerd/api/types"
|
|
@@ -68,8 +67,6 @@
|
|
data = &v1.Metrics{}
|
|
case typeurl.Is(stats.Data, (*v2.Metrics)(nil)):
|
|
data = &v2.Metrics{}
|
|
- case typeurl.Is(stats.Data, (*wstats.Statistics)(nil)):
|
|
- data = &wstats.Statistics{}
|
|
default:
|
|
return nil, errors.New("cannot convert metric data to cgroups.Metrics or windows.Statistics")
|
|
}
|
|
|