Merge pull request #1423 from saschagrunert/sigs-k8s-io

k8s-ci-robot · web-flow · commit f4fe266178a4 · 2024-05-07T08:11:49.000-07:00
Move project under `sigs.k8s.io` namespace
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ export GO_BUILD=GOARCH=$(GOARCH) GOOS=$(GOOS) $(GO) build
 export GO_TEST=GOARCH=$(GOARCH) GOOS=$(GOOS) $(GO) test
 endif
 
-PROJECT := github.com/kubernetes-sigs/cri-tools
+PROJECT := sigs.k8s.io/cri-tools
 BINDIR ?= /usr/local/bin
 
 VERSION ?= $(shell git describe --tags --dirty --always | sed 's/^v//')
diff --git a/cmd/crictl/config.go b/cmd/crictl/config.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/common"
 )
 
 var configCommand = &cli.Command{
diff --git a/cmd/crictl/main.go b/cmd/crictl/main.go
@@ -34,9 +34,9 @@ import (
 	internalapi "k8s.io/cri-api/pkg/apis"
 	"k8s.io/kubernetes/pkg/kubelet/cri/remote"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/tracing"
-	"github.com/kubernetes-sigs/cri-tools/pkg/version"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/tracing"
+	"sigs.k8s.io/cri-tools/pkg/version"
 )
 
 const defaultTimeout = 2 * time.Second
diff --git a/cmd/critest/cri_test.go b/cmd/critest/cri_test.go
@@ -30,11 +30,11 @@ import (
 	ginkgotypes "github.com/onsi/ginkgo/v2/types"
 	"github.com/onsi/gomega"
 
-	_ "github.com/kubernetes-sigs/cri-tools/pkg/benchmark"
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
-	_ "github.com/kubernetes-sigs/cri-tools/pkg/validate"
-	versionconst "github.com/kubernetes-sigs/cri-tools/pkg/version"
+	_ "sigs.k8s.io/cri-tools/pkg/benchmark"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
+	_ "sigs.k8s.io/cri-tools/pkg/validate"
+	versionconst "sigs.k8s.io/cri-tools/pkg/version"
 )
 
 const (
diff --git a/docs/developer-guide.md b/docs/developer-guide.md
@@ -13,7 +13,7 @@ Start with the following guide to setup pre-requisites:
 - [Go](https://golang.org/doc/install)
 - [Build tools](https://github.com/containerd/cri#install-dependencies)
 
-_**Important Note**: `Go` dependencies tend to follow the GitHub project URL path structure, i.e. when installing and trying to use `cri-tools` locally, it should be installed under a folder structure as follows `go/src/github.com/kubernetes-sigs/cri-tools`. Kubernetes is the only exception which does not follow this structure for legacy reasons._
+_**Important Note**: `Go` dependencies tend to follow the GitHub project URL path structure, i.e. when installing and trying to use `cri-tools` locally, it should be installed under a folder structure as follows `go/src/sigs.k8s.io/cri-tools`. Kubernetes is the only exception which does not follow this structure for legacy reasons._
 
 Ensure the following after following the setup:
 
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/kubernetes-sigs/cri-tools
+module sigs.k8s.io/cri-tools
 
 go 1.22.0
 
diff --git a/hack/release.sh b/hack/release.sh
@@ -46,7 +46,7 @@ CRI_TEST_PLATFORMS=(
 )
 
 # Create releases output directory.
-PROJECT="github.com/kubernetes-sigs/cri-tools"
+PROJECT="sigs.k8s.io/cri-tools"
 CRI_TOOLS_ROOT="$GOPATH/src/$PROJECT"
 OUTPUTDIR=$CRI_TOOLS_ROOT/_output/releases
 mkdir -p "$OUTPUTDIR"
diff --git a/pkg/benchmark/container.go b/pkg/benchmark/container.go
@@ -22,10 +22,10 @@ import (
 	"path"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega/gmeasure"
diff --git a/pkg/benchmark/image.go b/pkg/benchmark/image.go
@@ -23,10 +23,10 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega/gmeasure"
diff --git a/pkg/benchmark/pod.go b/pkg/benchmark/pod.go
@@ -22,11 +22,11 @@ import (
 	"path"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega/gmeasure"
diff --git a/pkg/benchmark/pod_container.go b/pkg/benchmark/pod_container.go
@@ -19,10 +19,10 @@ package benchmark
 import (
 	"context"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/framework/util.go b/pkg/framework/util.go
@@ -26,11 +26,11 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/google/uuid"
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
 	"gopkg.in/yaml.v3"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"k8s.io/kubernetes/pkg/kubelet/cri/remote"
+	"sigs.k8s.io/cri-tools/pkg/common"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/apparmor_linux.go b/pkg/validate/apparmor_linux.go
@@ -24,11 +24,11 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	"github.com/opencontainers/runc/libcontainer/apparmor"
 	"github.com/sirupsen/logrus"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/consts.go b/pkg/validate/consts.go
@@ -19,8 +19,8 @@ package validate
 import (
 	"runtime"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 )
 
 // Container test constants
diff --git a/pkg/validate/container.go b/pkg/validate/container.go
@@ -27,9 +27,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/container_linux.go b/pkg/validate/container_linux.go
@@ -23,10 +23,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	"golang.org/x/sys/unix"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/image.go b/pkg/validate/image.go
@@ -22,9 +22,9 @@ import (
 	"runtime"
 	"sort"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/multi_container_linux.go b/pkg/validate/multi_container_linux.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/networking.go b/pkg/validate/networking.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/pod.go b/pkg/validate/pod.go
@@ -21,10 +21,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/pod_linux.go b/pkg/validate/pod_linux.go
@@ -21,10 +21,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/runtime_info.go b/pkg/validate/runtime_info.go
@@ -19,9 +19,9 @@ package validate
 import (
 	"context"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/security_context_linux.go b/pkg/validate/security_context_linux.go
@@ -26,10 +26,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/common"
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/common"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/selinux_linux.go b/pkg/validate/selinux_linux.go
@@ -22,10 +22,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	selinux "github.com/opencontainers/selinux/go-selinux"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/streaming.go b/pkg/validate/streaming.go
@@ -28,13 +28,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/portforward"
 	remoteclient "k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/transport/spdy"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/pkg/validate/streaming_linux.go b/pkg/validate/streaming_linux.go
@@ -19,9 +19,9 @@ package validate
 import (
 	"context"
 
-	"github.com/kubernetes-sigs/cri-tools/pkg/framework"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+	"sigs.k8s.io/cri-tools/pkg/framework"
 
 	. "github.com/onsi/ginkgo/v2"
 )
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -19,9 +19,9 @@ package e2e
 import (
 	"testing"
 
-	. "github.com/kubernetes-sigs/cri-tools/test/framework"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	. "sigs.k8s.io/cri-tools/test/framework"
 )
 
 // TestE2E runs the created specs

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`"github.com/urfave/cli/v2"`
`26`	`26`
`27`		`- "github.com/kubernetes-sigs/cri-tools/pkg/common"`
	`27`	`+ "sigs.k8s.io/cri-tools/pkg/common"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`var configCommand = &cli.Command{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/kubernetes-sigs/cri-tools`
	`1`	`+module sigs.k8s.io/cri-tools`
`2`	`2`
`3`	`3`	`go 1.22.0`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ CRI_TEST_PLATFORMS=(`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`# Create releases output directory.`
`49`		`-PROJECT="github.com/kubernetes-sigs/cri-tools"`
	`49`	`+PROJECT="sigs.k8s.io/cri-tools"`
`50`	`50`	`CRI_TOOLS_ROOT="$GOPATH/src/$PROJECT"`
`51`	`51`	`OUTPUTDIR=$CRI_TOOLS_ROOT/_output/releases`
`52`	`52`	`mkdir -p "$OUTPUTDIR"`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ package validate`
`19`	`19`	`import (`
`20`	`20`	`"runtime"`
`21`	`21`
`22`		`- "github.com/kubernetes-sigs/cri-tools/pkg/framework"`
`23`	`22`	`runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"`
	`23`	`+ "sigs.k8s.io/cri-tools/pkg/framework"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// Container test constants`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ package validate`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`	`21`
`22`		`- "github.com/kubernetes-sigs/cri-tools/pkg/framework"`
`23`	`22`	`internalapi "k8s.io/cri-api/pkg/apis"`
`24`	`23`	`runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"`
	`24`	`+ "sigs.k8s.io/cri-tools/pkg/framework"`
`25`	`25`
`26`	`26`	`. "github.com/onsi/ginkgo/v2"`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ package e2e`
`19`	`19`	`import (`
`20`	`20`	`"testing"`
`21`	`21`
`22`		`- . "github.com/kubernetes-sigs/cri-tools/test/framework"`
`23`	`22`	`. "github.com/onsi/ginkgo/v2"`
`24`	`23`	`. "github.com/onsi/gomega"`
	`24`	`+ . "sigs.k8s.io/cri-tools/test/framework"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// TestE2E runs the created specs`