File golang-gvisor-startshim.patch of Package golang-gvisor

Overview Repositories Revisions Requests Users Attributes Meta

File golang-gvisor-startshim.patch of Package golang-gvisor

From 9fcc9958b3557bd33411408751ab08cd546375a1 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Wed, 17 Apr 2024 15:55:41 +0100
Subject: [PATCH] Update to newer containerd API: Shim from shim.

The Shim interface's StartShim function's signature has changed.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 pkg/shim/service.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/shim/service.go b/pkg/shim/service.go
index a6904e1ae..5c12da03b 100644
--- a/pkg/shim/service.go
+++ b/pkg/shim/service.go
@@ -219,14 +219,14 @@ func (s *service) newCommand(ctx context.Context, containerdBinary, containerdAd
 	return cmd, nil
 }
 
-func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (string, error) {
-	log.L.Debugf("StartShim, id: %s, binary: %q, address: %q", id, containerdBinary, containerdAddress)
+func (s *service) StartShim(ctx context.Context, opts shim.StartOpts) (string, error) {
+	log.L.Debugf("StartShim, id: %s, binary: %q, address: %q", opts.ID, opts.ContainerdBinary, opts.Address)
 
-	cmd, err := s.newCommand(ctx, containerdBinary, containerdAddress)
+	cmd, err := s.newCommand(ctx, opts.ContainerdBinary, opts.Address)
 	if err != nil {
 		return "", err
 	}
-	address, err := shim.SocketAddress(ctx, containerdAddress, id)
+	address, err := shim.SocketAddress(ctx, opts.Address, opts.ID)
 	if err != nil {
 		return "", err
 	}
-- 
2.44.0

Places

File golang-gvisor-startshim.patch of Package golang-gvisor

Places