demus/golang-github-containerd-rpm
1
0
Fork 0
generated from demus/golang-rpm-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove windows related code to avoid dependency

Browse Source
This commit is contained in:
demus
2025-01-14 17:55:53 +01:00
parent 1a442bf06c
commit 9fbac48769
3 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0001-Revert-commit-for-Windows-metrics.patch
+2 -2
View File
@@ -23,7 +23,7 @@ diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.
default:
return errors.New("cannot convert metric data to cgroups.Metrics or windows.Statistics")
}
@@ -94,11 +91,6 @@
@@ -94,11 +91,7 @@
printCgroupMetricsTable(w, v)
case *v2.Metrics:
printCgroup2MetricsTable(w, v)
@@ -31,7 +31,7 @@ diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.
- if err := printWindowsStats(w, v); err != nil {
- return fmt.Errorf("cannot convert metrics data from windows.Statistics: %w", err)
- }
- }
}
return w.Flush()
case formatJSON:
marshaledJSON, err := json.MarshalIndent(data, "", " ")
0003-Remove-everything-windows-related.patch
+74
View File
@@ -0,0 +1,74 @@
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")
}
golang-github-containerd.spec
+13 -9
View File
@@ -15,7 +15,7 @@
# https://github.com/containerd/containerd
%global goipath github.com/containerd/containerd
Version: 1.7.24
Version: 1.7.2
%gometa -L
@@ -51,10 +51,16 @@ Patch1: 0002-Remove-windows-only-dep.patch
# Backport for github.com/containerd/typeurl update
# To use with latest go-runc
Patch2: 0001-Add-reaper-StartLocked.patch
Patch3: 0003-Remove-everything-windows-related.patch
%if %{without bootstrap}
BuildRequires: golang(github.com/containerd/aufs/plugin)
BuildRequires: golang(github.com/containerd/zfs/plugin)
BuildRequires: golang(github.com/containerd/nri)
BuildRequires: golang(github.com/containerd/nri/types/v1)
BuildRequires: golang(github.com/containerd/imgcrypt)
BuildRequires: golang(github.com/containerd/imgcrypt/images/encryption)
%endif
BuildRequires: golang(github.com/containerd/btrfs)
BuildRequires: golang(github.com/containerd/cgroups)
@@ -69,16 +75,9 @@ BuildRequires: golang(github.com/containerd/continuity/sysx)
BuildRequires: golang(github.com/containerd/fifo)
BuildRequires: golang(github.com/containerd/go-cni)
BuildRequires: golang(github.com/containerd/go-runc)
BuildRequires: golang(github.com/containerd/imgcrypt)
BuildRequires: golang(github.com/containerd/imgcrypt/images/encryption)
BuildRequires: golang(github.com/containerd/nri)
BuildRequires: golang(github.com/containerd/nri/types/v1)
BuildRequires: golang(github.com/containerd/ttrpc)
BuildRequires: golang(github.com/containerd/ttrpc/plugin)
BuildRequires: golang(github.com/containerd/typeurl)
%if %{without bootstrap}
BuildRequires: golang(github.com/containerd/zfs/plugin)
%endif
BuildRequires: golang(github.com/containernetworking/plugins/pkg/ns)
BuildRequires: golang(github.com/coreos/go-systemd/v22/daemon)
BuildRequires: golang(github.com/davecgh/go-spew/spew)
@@ -170,7 +169,7 @@ BuildRequires: golang(k8s.io/client-go/tools/remotecommand)
BuildRequires: golang(k8s.io/client-go/util/cert)
BuildRequires: golang(k8s.io/component-base/logs/logreduction)
BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1)
BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2)
# BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2)
BuildRequires: golang(k8s.io/klog/v2)
BuildRequires: golang(k8s.io/utils/clock)
BuildRequires: golang(k8s.io/utils/exec)
@@ -194,6 +193,11 @@ BuildRequires: golang(k8s.io/utils/clock/testing)
%goprep -A
%autopatch -p1
%if %{without bootstrap}
%generate_buildrequires
%go_generate_buildrequires
%endif
%install
%gopkginstall