Skip to content

Commit

Permalink
Merge pull request #2 from gardenlinux/new1720
Browse files Browse the repository at this point in the history 
Update to 1.7.20
  • Loading branch information
@5kt
5kt authored Jul 24, 2024
2 parents 3651433 + f48dea6 commit e4f0e82
Show file tree
Hide file tree
Showing 6 changed files with 908 additions and 1 deletion.
65 changes: 65 additions & 0 deletions patches/0002-disable-runhcs-option-in-cri-config.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
From: Shengjing Zhu <[email protected]>
Date: Sat, 23 Jan 2021 00:42:41 +0800
Subject: disable runhcs option in cri config

Forwarded: not-needed
---
pkg/cri/sbserver/helpers.go | 6 ------
pkg/cri/server/container_stats_list_linux.go | 3 ---
pkg/cri/server/helpers.go | 3 ---
3 files changed, 12 deletions(-)

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
@@ -47 +46,0 @@
- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
@@ -92,3 +90,0 @@
-
- // runtimeRunhcsV1 is the runtime type for runhcs.
- runtimeRunhcsV1 = "io.containerd.runhcs.v1"
@@ -408,2 +403,0 @@
- case runtimeRunhcsV1:
- return &runhcsoptions.Options{}
diff --git a/pkg/cri/server/container_stats_list_linux.go b/pkg/cri/server/container_stats_list_linux.go
index ee46db9..68af207 100644
--- a/pkg/cri/server/container_stats_list_linux.go
+++ b/pkg/cri/server/container_stats_list_linux.go
@@ -22,7 +22,6 @@ import (
"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 @@ func (c *criService) containerMetrics(
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")
}
diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
index 0a72667..0c3e938 100644
--- a/pkg/cri/server/helpers.go
+++ b/pkg/cri/server/helpers.go
@@ -43,7 +43,6 @@ import (
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"
@@ -374,8 +373,6 @@ func getRuntimeOptionsType(t string) interface{} {
return &runcoptions.Options{}
case plugin.RuntimeLinuxV1:
return &runctypes.RuncOptions{}
- case runtimeRunhcsV1:
- return &runhcsoptions.Options{}
default:
return &runtimeoptions.Options{}
}
82 changes: 82 additions & 0 deletions patches/control
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
--- a/debian/control
+++ b/debian/control
@@ -10,78 +10,7 @@
dh-golang,
go-md2man,
golang-any,
- golang-github-blang-semver-dev,
- golang-github-containerd-btrfs-dev (>= 2),
- golang-github-containerd-cgroups-dev (>= 3),
- golang-github-containerd-console-dev,
- golang-github-containerd-continuity-dev (>= 0.0~git20190827.75bee3e~),
- golang-github-containerd-errdefs-dev,
- golang-github-containerd-fifo-dev (>= 1.0.0~),
- golang-github-containerd-go-cni-dev (>= 1.1.9),
- golang-github-containerd-go-runc-dev (>= 1.1.0),
- golang-github-containerd-imgcrypt-dev,
- golang-github-containerd-log-dev,
- golang-github-containerd-nri-dev,
- golang-github-containerd-ttrpc-dev (>= 1.2),
- golang-github-containerd-typeurl-dev (>= 2),
- golang-github-containernetworking-plugins-dev,
- golang-github-containers-ocicrypt-dev,
- golang-github-coreos-bbolt-dev,
- golang-github-coreos-go-systemd-dev,
- golang-github-davecgh-go-spew-dev,
- golang-github-docker-go-events-dev,
- golang-github-docker-go-metrics-dev,
- golang-github-docker-go-units-dev,
- golang-github-emicklei-go-restful-dev,
- golang-github-felixge-httpsnoop-dev,
- golang-github-fsnotify-fsnotify-dev,
- golang-github-go-jose-go-jose.v3-dev,
- golang-github-go-logr-logr-dev,
- golang-github-gogo-googleapis-dev (>= 1.4.0~),
- golang-github-gogo-protobuf-dev (>= 1.3.0~),
- golang-github-google-go-cmp-dev,
- golang-github-google-gofuzz-dev,
- golang-github-google-uuid-dev,
- golang-github-gotestyourself-gotest.tools-dev (>= 3.0.0~),
- golang-github-grpc-ecosystem-go-grpc-prometheus-dev,
- golang-github-hashicorp-go-multierror-dev,
- golang-github-imdario-mergo-dev,
- golang-github-intel-goresctrl-dev,
- golang-github-klauspost-compress-dev,
- golang-github-klauspost-cpuid-dev,
- golang-github-kubernetes-cri-api-dev (>> 0.27),
- golang-github-minio-sha256-simd-dev,
- golang-github-moby-locker-dev,
- golang-github-moby-spdystream-dev,
- golang-github-moby-sys-dev (>= 0.0~git20220215.b8d8fab~),
- golang-github-opencontainers-go-digest-dev (>= 1.0.0~),
- golang-github-opencontainers-image-spec-dev (>= 1.1.0~rc2-2~),
- golang-github-opencontainers-runc-dev (>= 0.1.0~),
- golang-github-opencontainers-runtime-spec-dev,
- golang-github-opencontainers-runtime-tools-dev,
- golang-github-opencontainers-selinux-dev,
- golang-github-pelletier-go-toml-dev,
- golang-github-pkg-errors-dev,
- golang-github-prometheus-client-golang-dev,
- golang-github-sirupsen-logrus-dev,
- golang-github-spf13-pflag-dev,
- golang-github-tchap-go-patricia-dev,
- golang-github-urfave-cli-dev (>= 1.22.2-4~),
- golang-github-vishvananda-netlink-dev,
- golang-go-zfs-dev,
- golang-golang-x-mod-dev,
- golang-golang-x-net-dev,
- golang-golang-x-sync-dev,
- golang-golang-x-sys-dev,
- golang-golang-x-time-dev,
- golang-google-grpc-dev (>= 1.30),
- golang-gopkg-inf.v0-dev,
- golang-k8s-klog-dev (>= 2.30.0~),
- golang-k8s-sigs-json-dev,
- golang-k8s-sigs-structured-merge-diff-dev,
- golang-k8s-sigs-yaml-dev,
- golang-opentelemetry-contrib-dev,
- golang-opentelemetry-otel-dev (>> 1.19)
+ golang-github-urfave-cli-dev (>= 1.22.2-4~)
Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://containerd.io/
Loading

0 comments on commit e4f0e82

Please sign in to comment.