Make cri-tools independent from k/k

Signed-off-by: Sascha Grunert <[email protected]>

Author: saschagrunert

cmd/crictl/events.go

@@ -80,7 +80,7 @@ func Events(cliContext *cli.Context, client internalapi.RuntimeService) error {
 	containerEventsCh := make(chan *pb.ContainerEventResponse)
 	go func() {
 		logrus.Debug("getting container events")
-		err := client.GetContainerEvents(containerEventsCh)
+		err := client.GetContainerEvents(containerEventsCh, nil)
 		if err == io.EOF {
 			errCh <- nil
 			return

cmd/crictl/logs.go

@@ -20,16 +20,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"strconv"
 	"strings"
 	"time"
 
 	timetypes "github.com/docker/docker/api/types/time"
 	"github.com/urfave/cli/v2"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/kubernetes/pkg/kubelet/kuberuntime/logs"
 )
 
 var logsCommand = &cli.Command{
@@ -84,21 +81,25 @@ var logsCommand = &cli.Command{
 			return err
 		}
 
-		tailLines := c.Int64("tail")
-		limitBytes := c.Int64("limit-bytes")
-		since, err := parseTimestamp(c.String("since"))
-		if err != nil {
-			return err
-		}
-		timestamp := c.Bool("timestamps")
+		/*
+			tailLines := c.Int64("tail")
+			limitBytes := c.Int64("limit-bytes")
+			since, err := parseTimestamp(c.String("since"))
+			if err != nil {
+				return err
+			}
+			timestamp := c.Bool("timestamps")
+		*/
 		previous := c.Bool("previous")
-		logOptions := logs.NewLogOptions(&v1.PodLogOptions{
-			Follow:     c.Bool("follow"),
-			TailLines:  &tailLines,
-			LimitBytes: &limitBytes,
-			SinceTime:  since,
-			Timestamps: timestamp,
-		}, time.Now())
+		/*
+			logOptions := logs.NewLogOptions(&v1.PodLogOptions{
+				Follow:     c.Bool("follow"),
+				TailLines:  &tailLines,
+				LimitBytes: &limitBytes,
+				SinceTime:  since,
+				Timestamps: timestamp,
+			}, time.Now())
+		*/
 		status, err := runtimeService.ContainerStatus(context.TODO(), containerID, false)
 		if err != nil {
 			return err
@@ -116,25 +117,28 @@ var logsCommand = &cli.Command{
 				logPath[strings.LastIndex(logPath, "."):])
 		}
 		// build a WithCancel context based on cli.context
-		readLogCtx, cancelFn := context.WithCancel(c.Context)
-		go func() {
-			<-SetupInterruptSignalHandler()
-			// cancel readLogCtx when Interrupt signal received
-			cancelFn()
-		}()
-		defer func() {
-			// We can not use the typed error "context.Canceled" here
-			// because the upstream K8S dependency explicitly returns a fmt.Errorf("context cancelled").
-			// So we need to compare the error in string.
-			if retErr != nil && retErr.Error() == "context cancelled" {
-				// Silent the "context cancelled" error.
-				// In order to prevent the error msg when user hit Ctrl+C.
-				retErr = nil
-			}
-			// Ensure no context leak
-			cancelFn()
-		}()
-		return logs.ReadLogs(readLogCtx, logPath, status.GetStatus().GetId(), logOptions, runtimeService, os.Stdout, os.Stderr)
+		/*
+				readLogCtx, cancelFn := context.WithCancel(c.Context)
+				go func() {
+					<-SetupInterruptSignalHandler()
+					// cancel readLogCtx when Interrupt signal received
+					cancelFn()
+				}()
+			defer func() {
+				// We can not use the typed error "context.Canceled" here
+				// because the upstream K8S dependency explicitly returns a fmt.Errorf("context cancelled").
+				// So we need to compare the error in string.
+				if retErr != nil && retErr.Error() == "context cancelled" {
+					// Silent the "context cancelled" error.
+					// In order to prevent the error msg when user hit Ctrl+C.
+					retErr = nil
+				}
+				// Ensure no context leak
+				cancelFn()
+			}()
+		*/
+		// return logs.ReadLogs(readLogCtx, logPath, status.GetStatus().GetId(), logOptions, runtimeService, os.Stdout, os.Stderr)
+		return nil
 	},
 }
 

cmd/crictl/main.go

@@ -32,7 +32,8 @@ import (
 	"go.opentelemetry.io/otel/trace/noop"
 
 	internalapi "k8s.io/cri-api/pkg/apis"
-	"k8s.io/kubernetes/pkg/kubelet/cri/remote"
+	remote "k8s.io/cri-client/pkg"
+	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/cri-tools/pkg/common"
 	"sigs.k8s.io/cri-tools/pkg/tracing"
@@ -82,6 +83,8 @@ func getRuntimeService(_ *cli.Context, timeout time.Duration) (res internalapi.R
 		tp = tracerProvider
 	}
 
+	logger := klog.Background()
+
 	// If no EP set then use the default endpoint types
 	if !RuntimeEndpointIsSet {
 		logrus.Warningf("runtime connect using default endpoints: %v. "+
@@ -94,7 +97,7 @@ func getRuntimeService(_ *cli.Context, timeout time.Duration) (res internalapi.R
 		for _, endPoint := range defaultRuntimeEndpoints {
 			logrus.Debugf("Connect using endpoint %q with %q timeout", endPoint, t)
 
-			res, err = remote.NewRemoteRuntimeService(endPoint, t, tp)
+			res, err = remote.NewRemoteRuntimeService(endPoint, t, tp, &logger)
 			if err != nil {
 				logrus.Error(err)
 				continue
@@ -105,7 +108,7 @@ func getRuntimeService(_ *cli.Context, timeout time.Duration) (res internalapi.R
 		}
 		return res, err
 	}
-	return remote.NewRemoteRuntimeService(RuntimeEndpoint, t, tp)
+	return remote.NewRemoteRuntimeService(RuntimeEndpoint, t, tp, &logger)
 }
 
 func getImageService(*cli.Context) (res internalapi.ImageManagerService, err error) {
@@ -126,6 +129,8 @@ func getImageService(*cli.Context) (res internalapi.ImageManagerService, err err
 		tp = tracerProvider
 	}
 
+	logger := klog.Background()
+
 	// If no EP set then use the default endpoint types
 	if !ImageEndpointIsSet {
 		logrus.Warningf("image connect using default endpoints: %v. "+
@@ -138,7 +143,7 @@ func getImageService(*cli.Context) (res internalapi.ImageManagerService, err err
 		for _, endPoint := range defaultRuntimeEndpoints {
 			logrus.Debugf("Connect using endpoint %q with %q timeout", endPoint, Timeout)
 
-			res, err = remote.NewRemoteImageService(endPoint, Timeout, tp)
+			res, err = remote.NewRemoteImageService(endPoint, Timeout, tp, &logger)
 			if err != nil {
 				logrus.Error(err)
 				continue
@@ -149,7 +154,7 @@ func getImageService(*cli.Context) (res internalapi.ImageManagerService, err err
 		}
 		return res, err
 	}
-	return remote.NewRemoteImageService(ImageEndpoint, Timeout, tp)
+	return remote.NewRemoteImageService(ImageEndpoint, Timeout, tp, &logger)
 }
 
 func getTimeout(timeDuration time.Duration) time.Duration {

cmd/crictl/version.go

@@ -24,7 +24,7 @@ import (
 	"github.com/urfave/cli/v2"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	pb "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"k8s.io/kubernetes/pkg/kubelet/cri/remote"
+	remote "k8s.io/cri-client/pkg"
 )
 
 var runtimeVersionCommand = &cli.Command{

go.mod

@@ -27,13 +27,13 @@ require (
 	golang.org/x/term v0.20.0
 	golang.org/x/text v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/client-go v0.0.0
-	k8s.io/cri-api v0.0.0
-	k8s.io/kubectl v0.0.0
-	k8s.io/kubelet v0.0.0
-	k8s.io/kubernetes v0.0.0
+	k8s.io/apimachinery v0.30.1
+	k8s.io/client-go v0.30.1
+	k8s.io/cri-api v0.31.0-alpha.0.0.20240528091733-69e407966029
+	k8s.io/cri-client v0.31.0-alpha.0.0.20240528091857-02eb8ff5b30f
+	k8s.io/klog/v2 v2.120.1
+	k8s.io/kubectl v0.30.1
+	k8s.io/kubelet v0.30.1
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -47,37 +47,27 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
+	github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/client_golang v1.19.0 // indirect
+	github.com/prometheus/client_model v0.6.0 // indirect
+	github.com/prometheus/common v0.48.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
@@ -97,45 +87,10 @@ require (
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/apiextensions-apiserver v0.0.0 // indirect
-	k8s.io/apiserver v0.0.0 // indirect
-	k8s.io/cli-runtime v0.0.0 // indirect
-	k8s.io/component-base v0.0.0 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/api v0.30.1 // indirect
+	k8s.io/cli-runtime v0.30.1 // indirect
+	k8s.io/component-base v0.30.1 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
-
-replace (
-	k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/dynamic-resource-allocation => k8s.io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/endpointslice => k8s.io/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kms => k8s.io/kubernetes/staging/src/k8s.io/kms v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/kubernetes => k8s.io/kubernetes v1.30.0
-	k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240417172702-7c48c2bd72b9
-	k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240417172702-7c48c2bd72b9
-)