Rename sbserver to server

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>

contrib/fuzz/cri_fuzzer.go

@@ -24,8 +24,8 @@ import (
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	server "github.com/containerd/containerd/pkg/cri/sbserver"
-	"github.com/containerd/containerd/pkg/cri/sbserver/images"
+	"github.com/containerd/containerd/pkg/cri/server"
+	"github.com/containerd/containerd/pkg/cri/server/images"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )

contrib/fuzz/cri_sbserver_fuzzer.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	"github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 )
 
 func FuzzCRISandboxServer(data []byte) int {
@@ -37,7 +37,7 @@ func FuzzCRISandboxServer(data []byte) int {
 	}
 	defer client.Close()
 
-	c, err := sbserver.NewCRIService(criconfig.Config{}, client, nil)
+	c, err := server.NewCRIService(criconfig.Config{}, client, nil)
 	if err != nil {
 		panic(err)
 	}

contrib/fuzz/cri_server_fuzzer.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	server "github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 )
 
 func FuzzCRIServer(data []byte) int {

integration/image_pull_timeout_test.go

@@ -38,7 +38,7 @@ import (
 	"github.com/containerd/containerd/leases"
 	"github.com/containerd/containerd/namespaces"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	criserver "github.com/containerd/containerd/pkg/cri/sbserver"
+	criserver "github.com/containerd/containerd/pkg/cri/server"
 	"github.com/containerd/log"
 	"github.com/containerd/log/logtest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

integration/main_test.go

@@ -41,7 +41,7 @@ import (
 	dialer "github.com/containerd/containerd/integration/remote/util"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
 	"github.com/containerd/containerd/pkg/cri/constants"
-	server "github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 	"github.com/containerd/containerd/pkg/cri/util"
 	"github.com/containerd/log"
 	"github.com/opencontainers/selinux/go-selinux"

integration/sandbox_run_rollback_test.go

@@ -35,7 +35,7 @@ import (
 	"github.com/stretchr/testify/require"
 	criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	"github.com/containerd/containerd/pkg/cri/sbserver/podsandbox"
+	"github.com/containerd/containerd/pkg/cri/server/podsandbox"
 	"github.com/containerd/containerd/pkg/failpoint"
 )
 

pkg/cri/cri.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/pkg/cri/nri"
-	"github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 	nriservice "github.com/containerd/containerd/pkg/nri"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/plugin"
@@ -84,7 +84,7 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {
 		return nil, fmt.Errorf("failed to create containerd client: %w", err)
 	}
 
-	s, err := sbserver.NewCRIService(c, client, getNRIAPI(ic))
+	s, err := server.NewCRIService(c, client, getNRIAPI(ic))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create CRI service: %w", err)
 	}

pkg/cri/server/blockio_linux.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"

pkg/cri/server/blockio_stub.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 func (c *criService) blockIOClassFromAnnotations(containerName string, containerAnnotations, podAnnotations map[string]string) (string, error) {
 	return "", nil

pkg/cri/server/cni_conf_syncer.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"

pkg/cri/server/container_attach.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_checkpoint.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_create.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_create_linux.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"bufio"

pkg/cri/server/container_create_linux_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_create_other.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"

pkg/cri/server/container_create_other_test.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"

pkg/cri/server/container_create_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_create_windows.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"strconv"

pkg/cri/server/container_create_windows_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"

pkg/cri/server/container_events.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

pkg/cri/server/container_exec.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_execsync.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"bytes"

pkg/cri/server/container_execsync_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"bytes"

pkg/cri/server/container_list.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_list_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_log_reopen.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_remove.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_remove_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"

pkg/cri/server/container_start.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_start_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"

pkg/cri/server/container_stats.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_stats_list.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_stats_list_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_status.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/pkg/cri/sbserver/images"
+	"github.com/containerd/containerd/pkg/cri/server/images"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"

pkg/cri/server/container_status_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_stop.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_stop_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_update_resources.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_update_resources_linux.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_update_resources_linux_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_update_resources_other.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/container_update_resources_windows.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/events.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/events_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"

pkg/cri/server/fuzz.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"

pkg/cri/server/helpers.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/helpers_linux.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/helpers_other.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/helpers_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/helpers_windows.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/helpers_windows_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"

pkg/cri/server/list_metric_descriptors.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/list_pod_sandbox_metrics.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/metrics.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"github.com/docker/go-metrics"

pkg/cri/server/nri.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	criconfig "github.com/containerd/containerd/pkg/cri/config"

pkg/cri/server/nri_linux.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/nri_other.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"

pkg/cri/server/rdt.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"

pkg/cri/server/rdt_stub.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 func (c *criService) rdtClassFromAnnotations(containerName string, containerAnnotations, podAnnotations map[string]string) (string, error) {
 	return "", nil

pkg/cri/server/restart.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	containerdimages "github.com/containerd/containerd/images"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	"github.com/containerd/containerd/pkg/cri/sbserver/podsandbox"
+	"github.com/containerd/containerd/pkg/cri/server/podsandbox"
 	"github.com/containerd/containerd/pkg/netns"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/log"

pkg/cri/server/runtime_config.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"