Reorganize kubelet tree so apis can be independently versioned

hack/.linted_packages

@@ -185,7 +185,8 @@ pkg/fieldpath
 pkg/fields
 pkg/hyperkube
 pkg/kubectl/cmd/util/openapi
-pkg/kubelet/api
+pkg/kubelet/apis/cri
+pkg/kubelet/apis/stats/v1alpha1
 pkg/kubelet/container
 pkg/kubelet/envvars
 pkg/kubelet/eviction

hack/update-generated-runtime-dockerized.sh

@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/api/v1alpha1/runtime"
+KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/"
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env

hack/verify-flags/exceptions.txt

@@ -124,14 +124,14 @@ hack/test-update-storage-objects.sh:  local storage_media_type=${3:-""}
 hack/test-update-storage-objects.sh:  local storage_versions=${2:-""}
 hack/test-update-storage-objects.sh:  source_file=${test_data[0]}
 hack/test-update-storage-objects.sh:# source_file,resource,namespace,name,old_version,new_version
-pkg/kubelet/api/v1alpha1/runtime/api.pb.go:	ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"`
-pkg/kubelet/api/v1alpha1/runtime/api.pb.go:	OomScoreAdj int64 `protobuf:"varint,5,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"`
-pkg/kubelet/api/v1alpha1/runtime/api.pb.go:	PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"`
-pkg/kubelet/api/v1alpha1/runtime/api.pb.go:	RuntimeConfig *RuntimeConfig `protobuf:"bytes,1,opt,name=runtime_config,json=runtimeConfig" json:"runtime_config,omitempty"`
-pkg/kubelet/api/v1alpha1/runtime/api.proto:    RuntimeConfig runtime_config = 1;
-pkg/kubelet/api/v1alpha1/runtime/api.proto:    int32 container_port = 2;
-pkg/kubelet/api/v1alpha1/runtime/api.proto:    int64 oom_score_adj = 5;
-pkg/kubelet/api/v1alpha1/runtime/api.proto:    string pod_cidr = 1;
+pkg/kubelet/apis/cri/v1alpha1/api.pb.go:	ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"`
+pkg/kubelet/apis/cri/v1alpha1/api.pb.go:	OomScoreAdj int64 `protobuf:"varint,5,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"`
+pkg/kubelet/apis/cri/v1alpha1/api.pb.go:	PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"`
+pkg/kubelet/apis/cri/v1alpha1/api.pb.go:	RuntimeConfig *RuntimeConfig `protobuf:"bytes,1,opt,name=runtime_config,json=runtimeConfig" json:"runtime_config,omitempty"`
+pkg/kubelet/apis/cri/v1alpha1/api.proto:    RuntimeConfig runtime_config = 1;
+pkg/kubelet/apis/cri/v1alpha1/api.proto:    int32 container_port = 2;
+pkg/kubelet/apis/cri/v1alpha1/api.proto:    int64 oom_score_adj = 5;
+pkg/kubelet/apis/cri/v1alpha1/api.proto:    string pod_cidr = 1;
 pkg/kubelet/cm/container_manager_linux.go:		glog.V(3).Infof("Failed to apply oom_score_adj %d for pid %d: %v", oomScoreAdj, pid, err)
 pkg/kubelet/cm/container_manager_linux.go:	glog.V(5).Infof("attempting to apply oom_score_adj of %d to pid %d", oomScoreAdj, pid)
 pkg/kubelet/dockershim/docker_checkpoint.go:	ContainerPort *int32 `json:"container_port,omitempty"`

hack/verify-generated-runtime.sh

@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/api/v1alpha1/runtime"
+KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1"
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env

pkg/kubelet/BUILD

@@ -50,7 +50,7 @@ go_library(
         "//pkg/cloudprovider:go_default_library",
         "//pkg/features:go_default_library",
         "//pkg/fieldpath:go_default_library",
-        "//pkg/kubelet/api:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
         "//pkg/kubelet/cadvisor:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/config:go_default_library",
@@ -238,7 +238,8 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/kubelet/api:all-srcs",
+        "//pkg/kubelet/apis/cri:all-srcs",
+        "//pkg/kubelet/apis/stats/v1alpha1:all-srcs",
         "//pkg/kubelet/cadvisor:all-srcs",
         "//pkg/kubelet/certificate:all-srcs",
         "//pkg/kubelet/client:all-srcs",

pkg/kubelet/api/BUILD → pkg/kubelet/apis/cri/BUILD

@@ -11,7 +11,7 @@ go_library(
     name = "go_default_library",
     srcs = ["services.go"],
     tags = ["automanaged"],
-    deps = ["//pkg/kubelet/api/v1alpha1/runtime:go_default_library"],
+    deps = ["//pkg/kubelet/apis/cri/v1alpha1:go_default_library"],
 )
 
 filegroup(
@@ -25,9 +25,8 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/kubelet/api/testing:all-srcs",
-        "//pkg/kubelet/api/v1alpha1/runtime:all-srcs",
-        "//pkg/kubelet/api/v1alpha1/stats:all-srcs",
+        "//pkg/kubelet/apis/cri/testing:all-srcs",
+        "//pkg/kubelet/apis/cri/v1alpha1:all-srcs",
     ],
     tags = ["automanaged"],
 )

pkg/kubelet/api/services.go → pkg/kubelet/apis/cri/services.go

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package api
+package cri
 
 import (
 	"time"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 // RuntimeVersioner contains methods for runtime name, version and API version.

pkg/kubelet/api/testing/BUILD → pkg/kubelet/apis/cri/testing/BUILD

@@ -16,7 +16,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/util/sliceutils:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
     ],

pkg/kubelet/api/testing/fake_image_service.go → pkg/kubelet/apis/cri/testing/fake_image_service.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
 )
 

pkg/kubelet/api/testing/fake_runtime_service.go → pkg/kubelet/apis/cri/testing/fake_runtime_service.go

@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 var (

pkg/kubelet/api/testing/utils.go → pkg/kubelet/apis/cri/testing/utils.go

@@ -19,7 +19,7 @@ package testing
 import (
 	"fmt"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 func BuildContainerName(metadata *runtimeapi.ContainerMetadata, sandboxID string) string {