Merge pull request #42759 from mtaufen/kubelet-apis-reorg

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 {

pkg/kubelet/api/v1alpha1/runtime/api.pb.go → pkg/kubelet/apis/cri/v1alpha1/api.pb.go

@@ -19,7 +19,7 @@ limitations under the License.
 // DO NOT EDIT!
 
 /*
-	Package runtime is a generated protocol buffer package.
+	Package v1alpha1 is a generated protocol buffer package.
 
 	It is generated from these files:
 		api.proto
@@ -111,7 +111,7 @@ limitations under the License.
 		FsInfo
 		ImageFsInfoResponse
 */
-package runtime
+package v1alpha1
 
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
@@ -309,7 +309,7 @@ func (m *DNSConfig) GetOptions() []string {
 // PortMapping specifies the port mapping configurations of a sandbox.
 type PortMapping struct {
 	// Protocol of the port mapping.
-	Protocol Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=runtime.Protocol" json:"protocol,omitempty"`
+	Protocol Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=v1alpha1.Protocol" json:"protocol,omitempty"`
 	// Port number within the container. Default: 0 (not specified).
 	ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"`
 	// Port number on the host. Default: 0 (not specified).
@@ -889,7 +889,7 @@ type PodSandboxStatus struct {
 	// Metadata of the sandbox.
 	Metadata *PodSandboxMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"`
 	// State of the sandbox.
-	State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.PodSandboxState" json:"state,omitempty"`
+	State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=v1alpha1.PodSandboxState" json:"state,omitempty"`
 	// Creation timestamp of the sandbox in nanoseconds. Must be > 0.
 	CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
 	// Network contains network status if network is handled by the runtime.
@@ -984,7 +984,7 @@ func (m *PodSandboxStatusResponse) GetStatus() *PodSandboxStatus {
 // PodSandboxStateValue is the wrapper of PodSandboxState.
 type PodSandboxStateValue struct {
 	// State of the sandbox.
-	State PodSandboxState `protobuf:"varint,1,opt,name=state,proto3,enum=runtime.PodSandboxState" json:"state,omitempty"`
+	State PodSandboxState `protobuf:"varint,1,opt,name=state,proto3,enum=v1alpha1.PodSandboxState" json:"state,omitempty"`
 }
 
 func (m *PodSandboxStateValue) Reset()                    { *m = PodSandboxStateValue{} }
@@ -1059,7 +1059,7 @@ type PodSandbox struct {
 	// Metadata of the PodSandbox.
 	Metadata *PodSandboxMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"`
 	// State of the PodSandbox.
-	State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.PodSandboxState" json:"state,omitempty"`
+	State PodSandboxState `protobuf:"varint,3,opt,name=state,proto3,enum=v1alpha1.PodSandboxState" json:"state,omitempty"`
 	// Creation timestamps of the PodSandbox in nanoseconds. Must be > 0.
 	CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
 	// Labels of the PodSandbox.
@@ -1813,7 +1813,7 @@ func (*RemoveContainerResponse) Descriptor() ([]byte, []int) { return fileDescri
 // ContainerStateValue is the wrapper of ContainerState.
 type ContainerStateValue struct {
 	// State of the container.
-	State ContainerState `protobuf:"varint,1,opt,name=state,proto3,enum=runtime.ContainerState" json:"state,omitempty"`
+	State ContainerState `protobuf:"varint,1,opt,name=state,proto3,enum=v1alpha1.ContainerState" json:"state,omitempty"`
 }
 
 func (m *ContainerStateValue) Reset()                    { *m = ContainerStateValue{} }
@@ -1905,7 +1905,7 @@ type Container struct {
 	// image ID.
 	ImageRef string `protobuf:"bytes,5,opt,name=image_ref,json=imageRef,proto3" json:"image_ref,omitempty"`
 	// State of the container.
-	State ContainerState `protobuf:"varint,6,opt,name=state,proto3,enum=runtime.ContainerState" json:"state,omitempty"`
+	State ContainerState `protobuf:"varint,6,opt,name=state,proto3,enum=v1alpha1.ContainerState" json:"state,omitempty"`
 	// Creation time of the container in nanoseconds.
 	CreatedAt int64 `protobuf:"varint,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
 	// Key-value pairs that may be used to scope and select individual resources.
@@ -2023,7 +2023,7 @@ type ContainerStatus struct {
 	// Metadata of the container.
 	Metadata *ContainerMetadata `protobuf:"bytes,2,opt,name=metadata" json:"metadata,omitempty"`
 	// Status of the container.
-	State ContainerState `protobuf:"varint,3,opt,name=state,proto3,enum=runtime.ContainerState" json:"state,omitempty"`
+	State ContainerState `protobuf:"varint,3,opt,name=state,proto3,enum=v1alpha1.ContainerState" json:"state,omitempty"`
 	// Creation time of the container in nanoseconds.
 	CreatedAt int64 `protobuf:"varint,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
 	// Start time of the container in nanoseconds. Default: 0 (not specified).
@@ -2944,94 +2944,94 @@ func (m *ImageFsInfoResponse) GetFsInfo() *FsInfo {
 }
 
 func init() {
-	proto.RegisterType((*VersionRequest)(nil), "runtime.VersionRequest")
-	proto.RegisterType((*VersionResponse)(nil), "runtime.VersionResponse")
-	proto.RegisterType((*DNSConfig)(nil), "runtime.DNSConfig")
-	proto.RegisterType((*PortMapping)(nil), "runtime.PortMapping")
-	proto.RegisterType((*Mount)(nil), "runtime.Mount")
-	proto.RegisterType((*NamespaceOption)(nil), "runtime.NamespaceOption")
-	proto.RegisterType((*Int64Value)(nil), "runtime.Int64Value")
-	proto.RegisterType((*LinuxSandboxSecurityContext)(nil), "runtime.LinuxSandboxSecurityContext")
-	proto.RegisterType((*LinuxPodSandboxConfig)(nil), "runtime.LinuxPodSandboxConfig")
-	proto.RegisterType((*PodSandboxMetadata)(nil), "runtime.PodSandboxMetadata")
-	proto.RegisterType((*PodSandboxConfig)(nil), "runtime.PodSandboxConfig")
-	proto.RegisterType((*RunPodSandboxRequest)(nil), "runtime.RunPodSandboxRequest")
-	proto.RegisterType((*RunPodSandboxResponse)(nil), "runtime.RunPodSandboxResponse")
-	proto.RegisterType((*StopPodSandboxRequest)(nil), "runtime.StopPodSandboxRequest")
-	proto.RegisterType((*StopPodSandboxResponse)(nil), "runtime.StopPodSandboxResponse")
-	proto.RegisterType((*RemovePodSandboxRequest)(nil), "runtime.RemovePodSandboxRequest")
-	proto.RegisterType((*RemovePodSandboxResponse)(nil), "runtime.RemovePodSandboxResponse")
-	proto.RegisterType((*PodSandboxStatusRequest)(nil), "runtime.PodSandboxStatusRequest")
-	proto.RegisterType((*PodSandboxNetworkStatus)(nil), "runtime.PodSandboxNetworkStatus")
-	proto.RegisterType((*Namespace)(nil), "runtime.Namespace")
-	proto.RegisterType((*LinuxPodSandboxStatus)(nil), "runtime.LinuxPodSandboxStatus")
-	proto.RegisterType((*PodSandboxStatus)(nil), "runtime.PodSandboxStatus")
-	proto.RegisterType((*PodSandboxStatusResponse)(nil), "runtime.PodSandboxStatusResponse")
-	proto.RegisterType((*PodSandboxStateValue)(nil), "runtime.PodSandboxStateValue")
-	proto.RegisterType((*PodSandboxFilter)(nil), "runtime.PodSandboxFilter")
-	proto.RegisterType((*ListPodSandboxRequest)(nil), "runtime.ListPodSandboxRequest")
-	proto.RegisterType((*PodSandbox)(nil), "runtime.PodSandbox")
-	proto.RegisterType((*ListPodSandboxResponse)(nil), "runtime.ListPodSandboxResponse")
-	proto.RegisterType((*ImageSpec)(nil), "runtime.ImageSpec")
-	proto.RegisterType((*KeyValue)(nil), "runtime.KeyValue")
-	proto.RegisterType((*LinuxContainerResources)(nil), "runtime.LinuxContainerResources")
-	proto.RegisterType((*SELinuxOption)(nil), "runtime.SELinuxOption")
-	proto.RegisterType((*Capability)(nil), "runtime.Capability")
-	proto.RegisterType((*LinuxContainerSecurityContext)(nil), "runtime.LinuxContainerSecurityContext")
-	proto.RegisterType((*LinuxContainerConfig)(nil), "runtime.LinuxContainerConfig")
-	proto.RegisterType((*ContainerMetadata)(nil), "runtime.ContainerMetadata")
-	proto.RegisterType((*Device)(nil), "runtime.Device")
-	proto.RegisterType((*ContainerConfig)(nil), "runtime.ContainerConfig")
-	proto.RegisterType((*CreateContainerRequest)(nil), "runtime.CreateContainerRequest")
-	proto.RegisterType((*CreateContainerResponse)(nil), "runtime.CreateContainerResponse")
-	proto.RegisterType((*StartContainerRequest)(nil), "runtime.StartContainerRequest")
-	proto.RegisterType((*StartContainerResponse)(nil), "runtime.StartContainerResponse")
-	proto.RegisterType((*StopContainerRequest)(nil), "runtime.StopContainerRequest")
-	proto.RegisterType((*StopContainerResponse)(nil), "runtime.StopContainerResponse")
-	proto.RegisterType((*RemoveContainerRequest)(nil), "runtime.RemoveContainerRequest")
-	proto.RegisterType((*RemoveContainerResponse)(nil), "runtime.RemoveContainerResponse")
-	proto.RegisterType((*ContainerStateValue)(nil), "runtime.ContainerStateValue")
-	proto.RegisterType((*ContainerFilter)(nil), "runtime.ContainerFilter")
-	proto.RegisterType((*ListContainersRequest)(nil), "runtime.ListContainersRequest")
-	proto.RegisterType((*Container)(nil), "runtime.Container")
-	proto.RegisterType((*ListContainersResponse)(nil), "runtime.ListContainersResponse")
-	proto.RegisterType((*ContainerStatusRequest)(nil), "runtime.ContainerStatusRequest")
-	proto.RegisterType((*ContainerStatus)(nil), "runtime.ContainerStatus")
-	proto.RegisterType((*ContainerStatusResponse)(nil), "runtime.ContainerStatusResponse")
-	proto.RegisterType((*ExecSyncRequest)(nil), "runtime.ExecSyncRequest")
-	proto.RegisterType((*ExecSyncResponse)(nil), "runtime.ExecSyncResponse")
-	proto.RegisterType((*ExecRequest)(nil), "runtime.ExecRequest")
-	proto.RegisterType((*ExecResponse)(nil), "runtime.ExecResponse")
-	proto.RegisterType((*AttachRequest)(nil), "runtime.AttachRequest")
-	proto.RegisterType((*AttachResponse)(nil), "runtime.AttachResponse")
-	proto.RegisterType((*PortForwardRequest)(nil), "runtime.PortForwardRequest")
-	proto.RegisterType((*PortForwardResponse)(nil), "runtime.PortForwardResponse")
-	proto.RegisterType((*ImageFilter)(nil), "runtime.ImageFilter")
-	proto.RegisterType((*ListImagesRequest)(nil), "runtime.ListImagesRequest")
-	proto.RegisterType((*Image)(nil), "runtime.Image")
-	proto.RegisterType((*ListImagesResponse)(nil), "runtime.ListImagesResponse")
-	proto.RegisterType((*ImageStatusRequest)(nil), "runtime.ImageStatusRequest")
-	proto.RegisterType((*ImageStatusResponse)(nil), "runtime.ImageStatusResponse")
-	proto.RegisterType((*AuthConfig)(nil), "runtime.AuthConfig")
-	proto.RegisterType((*PullImageRequest)(nil), "runtime.PullImageRequest")
-	proto.RegisterType((*PullImageResponse)(nil), "runtime.PullImageResponse")
-	proto.RegisterType((*RemoveImageRequest)(nil), "runtime.RemoveImageRequest")
-	proto.RegisterType((*RemoveImageResponse)(nil), "runtime.RemoveImageResponse")
-	proto.RegisterType((*NetworkConfig)(nil), "runtime.NetworkConfig")
-	proto.RegisterType((*RuntimeConfig)(nil), "runtime.RuntimeConfig")
-	proto.RegisterType((*UpdateRuntimeConfigRequest)(nil), "runtime.UpdateRuntimeConfigRequest")
-	proto.RegisterType((*UpdateRuntimeConfigResponse)(nil), "runtime.UpdateRuntimeConfigResponse")
-	proto.RegisterType((*RuntimeCondition)(nil), "runtime.RuntimeCondition")
-	proto.RegisterType((*RuntimeStatus)(nil), "runtime.RuntimeStatus")
-	proto.RegisterType((*StatusRequest)(nil), "runtime.StatusRequest")
-	proto.RegisterType((*StatusResponse)(nil), "runtime.StatusResponse")
-	proto.RegisterType((*ImageFsInfoRequest)(nil), "runtime.ImageFsInfoRequest")
-	proto.RegisterType((*UInt64Value)(nil), "runtime.UInt64Value")
-	proto.RegisterType((*FsInfo)(nil), "runtime.FsInfo")
-	proto.RegisterType((*ImageFsInfoResponse)(nil), "runtime.ImageFsInfoResponse")
-	proto.RegisterEnum("runtime.Protocol", Protocol_name, Protocol_value)
-	proto.RegisterEnum("runtime.PodSandboxState", PodSandboxState_name, PodSandboxState_value)
-	proto.RegisterEnum("runtime.ContainerState", ContainerState_name, ContainerState_value)
+	proto.RegisterType((*VersionRequest)(nil), "v1alpha1.VersionRequest")
+	proto.RegisterType((*VersionResponse)(nil), "v1alpha1.VersionResponse")
+	proto.RegisterType((*DNSConfig)(nil), "v1alpha1.DNSConfig")
+	proto.RegisterType((*PortMapping)(nil), "v1alpha1.PortMapping")
+	proto.RegisterType((*Mount)(nil), "v1alpha1.Mount")
+	proto.RegisterType((*NamespaceOption)(nil), "v1alpha1.NamespaceOption")
+	proto.RegisterType((*Int64Value)(nil), "v1alpha1.Int64Value")
+	proto.RegisterType((*LinuxSandboxSecurityContext)(nil), "v1alpha1.LinuxSandboxSecurityContext")
+	proto.RegisterType((*LinuxPodSandboxConfig)(nil), "v1alpha1.LinuxPodSandboxConfig")
+	proto.RegisterType((*PodSandboxMetadata)(nil), "v1alpha1.PodSandboxMetadata")
+	proto.RegisterType((*PodSandboxConfig)(nil), "v1alpha1.PodSandboxConfig")
+	proto.RegisterType((*RunPodSandboxRequest)(nil), "v1alpha1.RunPodSandboxRequest")
+	proto.RegisterType((*RunPodSandboxResponse)(nil), "v1alpha1.RunPodSandboxResponse")
+	proto.RegisterType((*StopPodSandboxRequest)(nil), "v1alpha1.StopPodSandboxRequest")
+	proto.RegisterType((*StopPodSandboxResponse)(nil), "v1alpha1.StopPodSandboxResponse")
+	proto.RegisterType((*RemovePodSandboxRequest)(nil), "v1alpha1.RemovePodSandboxRequest")
+	proto.RegisterType((*RemovePodSandboxResponse)(nil), "v1alpha1.RemovePodSandboxResponse")
+	proto.RegisterType((*PodSandboxStatusRequest)(nil), "v1alpha1.PodSandboxStatusRequest")
+	proto.RegisterType((*PodSandboxNetworkStatus)(nil), "v1alpha1.PodSandboxNetworkStatus")
+	proto.RegisterType((*Namespace)(nil), "v1alpha1.Namespace")
+	proto.RegisterType((*LinuxPodSandboxStatus)(nil), "v1alpha1.LinuxPodSandboxStatus")
+	proto.RegisterType((*PodSandboxStatus)(nil), "v1alpha1.PodSandboxStatus")
+	proto.RegisterType((*PodSandboxStatusResponse)(nil), "v1alpha1.PodSandboxStatusResponse")
+	proto.RegisterType((*PodSandboxStateValue)(nil), "v1alpha1.PodSandboxStateValue")
+	proto.RegisterType((*PodSandboxFilter)(nil), "v1alpha1.PodSandboxFilter")
+	proto.RegisterType((*ListPodSandboxRequest)(nil), "v1alpha1.ListPodSandboxRequest")
+	proto.RegisterType((*PodSandbox)(nil), "v1alpha1.PodSandbox")
+	proto.RegisterType((*ListPodSandboxResponse)(nil), "v1alpha1.ListPodSandboxResponse")
+	proto.RegisterType((*ImageSpec)(nil), "v1alpha1.ImageSpec")
+	proto.RegisterType((*KeyValue)(nil), "v1alpha1.KeyValue")
+	proto.RegisterType((*LinuxContainerResources)(nil), "v1alpha1.LinuxContainerResources")
+	proto.RegisterType((*SELinuxOption)(nil), "v1alpha1.SELinuxOption")
+	proto.RegisterType((*Capability)(nil), "v1alpha1.Capability")
+	proto.RegisterType((*LinuxContainerSecurityContext)(nil), "v1alpha1.LinuxContainerSecurityContext")
+	proto.RegisterType((*LinuxContainerConfig)(nil), "v1alpha1.LinuxContainerConfig")
+	proto.RegisterType((*ContainerMetadata)(nil), "v1alpha1.ContainerMetadata")
+	proto.RegisterType((*Device)(nil), "v1alpha1.Device")
+	proto.RegisterType((*ContainerConfig)(nil), "v1alpha1.ContainerConfig")
+	proto.RegisterType((*CreateContainerRequest)(nil), "v1alpha1.CreateContainerRequest")
+	proto.RegisterType((*CreateContainerResponse)(nil), "v1alpha1.CreateContainerResponse")
+	proto.RegisterType((*StartContainerRequest)(nil), "v1alpha1.StartContainerRequest")
+	proto.RegisterType((*StartContainerResponse)(nil), "v1alpha1.StartContainerResponse")
+	proto.RegisterType((*StopContainerRequest)(nil), "v1alpha1.StopContainerRequest")
+	proto.RegisterType((*StopContainerResponse)(nil), "v1alpha1.StopContainerResponse")
+	proto.RegisterType((*RemoveContainerRequest)(nil), "v1alpha1.RemoveContainerRequest")
+	proto.RegisterType((*RemoveContainerResponse)(nil), "v1alpha1.RemoveContainerResponse")
+	proto.RegisterType((*ContainerStateValue)(nil), "v1alpha1.ContainerStateValue")
+	proto.RegisterType((*ContainerFilter)(nil), "v1alpha1.ContainerFilter")
+	proto.RegisterType((*ListContainersRequest)(nil), "v1alpha1.ListContainersRequest")
+	proto.RegisterType((*Container)(nil), "v1alpha1.Container")
+	proto.RegisterType((*ListContainersResponse)(nil), "v1alpha1.ListContainersResponse")
+	proto.RegisterType((*ContainerStatusRequest)(nil), "v1alpha1.ContainerStatusRequest")
+	proto.RegisterType((*ContainerStatus)(nil), "v1alpha1.ContainerStatus")
+	proto.RegisterType((*ContainerStatusResponse)(nil), "v1alpha1.ContainerStatusResponse")
+	proto.RegisterType((*ExecSyncRequest)(nil), "v1alpha1.ExecSyncRequest")
+	proto.RegisterType((*ExecSyncResponse)(nil), "v1alpha1.ExecSyncResponse")
+	proto.RegisterType((*ExecRequest)(nil), "v1alpha1.ExecRequest")
+	proto.RegisterType((*ExecResponse)(nil), "v1alpha1.ExecResponse")
+	proto.RegisterType((*AttachRequest)(nil), "v1alpha1.AttachRequest")
+	proto.RegisterType((*AttachResponse)(nil), "v1alpha1.AttachResponse")
+	proto.RegisterType((*PortForwardRequest)(nil), "v1alpha1.PortForwardRequest")
+	proto.RegisterType((*PortForwardResponse)(nil), "v1alpha1.PortForwardResponse")
+	proto.RegisterType((*ImageFilter)(nil), "v1alpha1.ImageFilter")
+	proto.RegisterType((*ListImagesRequest)(nil), "v1alpha1.ListImagesRequest")
+	proto.RegisterType((*Image)(nil), "v1alpha1.Image")
+	proto.RegisterType((*ListImagesResponse)(nil), "v1alpha1.ListImagesResponse")
+	proto.RegisterType((*ImageStatusRequest)(nil), "v1alpha1.ImageStatusRequest")
+	proto.RegisterType((*ImageStatusResponse)(nil), "v1alpha1.ImageStatusResponse")
+	proto.RegisterType((*AuthConfig)(nil), "v1alpha1.AuthConfig")
+	proto.RegisterType((*PullImageRequest)(nil), "v1alpha1.PullImageRequest")
+	proto.RegisterType((*PullImageResponse)(nil), "v1alpha1.PullImageResponse")
+	proto.RegisterType((*RemoveImageRequest)(nil), "v1alpha1.RemoveImageRequest")
+	proto.RegisterType((*RemoveImageResponse)(nil), "v1alpha1.RemoveImageResponse")
+	proto.RegisterType((*NetworkConfig)(nil), "v1alpha1.NetworkConfig")
+	proto.RegisterType((*RuntimeConfig)(nil), "v1alpha1.RuntimeConfig")
+	proto.RegisterType((*UpdateRuntimeConfigRequest)(nil), "v1alpha1.UpdateRuntimeConfigRequest")
+	proto.RegisterType((*UpdateRuntimeConfigResponse)(nil), "v1alpha1.UpdateRuntimeConfigResponse")
+	proto.RegisterType((*RuntimeCondition)(nil), "v1alpha1.RuntimeCondition")
+	proto.RegisterType((*RuntimeStatus)(nil), "v1alpha1.RuntimeStatus")
+	proto.RegisterType((*StatusRequest)(nil), "v1alpha1.StatusRequest")
+	proto.RegisterType((*StatusResponse)(nil), "v1alpha1.StatusResponse")
+	proto.RegisterType((*ImageFsInfoRequest)(nil), "v1alpha1.ImageFsInfoRequest")
+	proto.RegisterType((*UInt64Value)(nil), "v1alpha1.UInt64Value")
+	proto.RegisterType((*FsInfo)(nil), "v1alpha1.FsInfo")
+	proto.RegisterType((*ImageFsInfoResponse)(nil), "v1alpha1.ImageFsInfoResponse")
+	proto.RegisterEnum("v1alpha1.Protocol", Protocol_name, Protocol_value)
+	proto.RegisterEnum("v1alpha1.PodSandboxState", PodSandboxState_name, PodSandboxState_value)
+	proto.RegisterEnum("v1alpha1.ContainerState", ContainerState_name, ContainerState_value)
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3113,7 +3113,7 @@ func NewRuntimeServiceClient(cc *grpc.ClientConn) RuntimeServiceClient {
 
 func (c *runtimeServiceClient) Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionResponse, error) {
 	out := new(VersionResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/Version", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/Version", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3122,7 +3122,7 @@ func (c *runtimeServiceClient) Version(ctx context.Context, in *VersionRequest,
 
 func (c *runtimeServiceClient) RunPodSandbox(ctx context.Context, in *RunPodSandboxRequest, opts ...grpc.CallOption) (*RunPodSandboxResponse, error) {
 	out := new(RunPodSandboxResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/RunPodSandbox", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/RunPodSandbox", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3131,7 +3131,7 @@ func (c *runtimeServiceClient) RunPodSandbox(ctx context.Context, in *RunPodSand
 
 func (c *runtimeServiceClient) StopPodSandbox(ctx context.Context, in *StopPodSandboxRequest, opts ...grpc.CallOption) (*StopPodSandboxResponse, error) {
 	out := new(StopPodSandboxResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/StopPodSandbox", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/StopPodSandbox", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3140,7 +3140,7 @@ func (c *runtimeServiceClient) StopPodSandbox(ctx context.Context, in *StopPodSa
 
 func (c *runtimeServiceClient) RemovePodSandbox(ctx context.Context, in *RemovePodSandboxRequest, opts ...grpc.CallOption) (*RemovePodSandboxResponse, error) {
 	out := new(RemovePodSandboxResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/RemovePodSandbox", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/RemovePodSandbox", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3149,7 +3149,7 @@ func (c *runtimeServiceClient) RemovePodSandbox(ctx context.Context, in *RemoveP
 
 func (c *runtimeServiceClient) PodSandboxStatus(ctx context.Context, in *PodSandboxStatusRequest, opts ...grpc.CallOption) (*PodSandboxStatusResponse, error) {
 	out := new(PodSandboxStatusResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/PodSandboxStatus", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/PodSandboxStatus", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3158,7 +3158,7 @@ func (c *runtimeServiceClient) PodSandboxStatus(ctx context.Context, in *PodSand
 
 func (c *runtimeServiceClient) ListPodSandbox(ctx context.Context, in *ListPodSandboxRequest, opts ...grpc.CallOption) (*ListPodSandboxResponse, error) {
 	out := new(ListPodSandboxResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/ListPodSandbox", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/ListPodSandbox", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3167,7 +3167,7 @@ func (c *runtimeServiceClient) ListPodSandbox(ctx context.Context, in *ListPodSa
 
 func (c *runtimeServiceClient) CreateContainer(ctx context.Context, in *CreateContainerRequest, opts ...grpc.CallOption) (*CreateContainerResponse, error) {
 	out := new(CreateContainerResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/CreateContainer", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/CreateContainer", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3176,7 +3176,7 @@ func (c *runtimeServiceClient) CreateContainer(ctx context.Context, in *CreateCo
 
 func (c *runtimeServiceClient) StartContainer(ctx context.Context, in *StartContainerRequest, opts ...grpc.CallOption) (*StartContainerResponse, error) {
 	out := new(StartContainerResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/StartContainer", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/StartContainer", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3185,7 +3185,7 @@ func (c *runtimeServiceClient) StartContainer(ctx context.Context, in *StartCont
 
 func (c *runtimeServiceClient) StopContainer(ctx context.Context, in *StopContainerRequest, opts ...grpc.CallOption) (*StopContainerResponse, error) {
 	out := new(StopContainerResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/StopContainer", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/StopContainer", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3194,7 +3194,7 @@ func (c *runtimeServiceClient) StopContainer(ctx context.Context, in *StopContai
 
 func (c *runtimeServiceClient) RemoveContainer(ctx context.Context, in *RemoveContainerRequest, opts ...grpc.CallOption) (*RemoveContainerResponse, error) {
 	out := new(RemoveContainerResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/RemoveContainer", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/RemoveContainer", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3203,7 +3203,7 @@ func (c *runtimeServiceClient) RemoveContainer(ctx context.Context, in *RemoveCo
 
 func (c *runtimeServiceClient) ListContainers(ctx context.Context, in *ListContainersRequest, opts ...grpc.CallOption) (*ListContainersResponse, error) {
 	out := new(ListContainersResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/ListContainers", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/ListContainers", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3212,7 +3212,7 @@ func (c *runtimeServiceClient) ListContainers(ctx context.Context, in *ListConta
 
 func (c *runtimeServiceClient) ContainerStatus(ctx context.Context, in *ContainerStatusRequest, opts ...grpc.CallOption) (*ContainerStatusResponse, error) {
 	out := new(ContainerStatusResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/ContainerStatus", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/ContainerStatus", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3221,7 +3221,7 @@ func (c *runtimeServiceClient) ContainerStatus(ctx context.Context, in *Containe
 
 func (c *runtimeServiceClient) ExecSync(ctx context.Context, in *ExecSyncRequest, opts ...grpc.CallOption) (*ExecSyncResponse, error) {
 	out := new(ExecSyncResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/ExecSync", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/ExecSync", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3230,7 +3230,7 @@ func (c *runtimeServiceClient) ExecSync(ctx context.Context, in *ExecSyncRequest
 
 func (c *runtimeServiceClient) Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (*ExecResponse, error) {
 	out := new(ExecResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/Exec", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/Exec", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3239,7 +3239,7 @@ func (c *runtimeServiceClient) Exec(ctx context.Context, in *ExecRequest, opts .
 
 func (c *runtimeServiceClient) Attach(ctx context.Context, in *AttachRequest, opts ...grpc.CallOption) (*AttachResponse, error) {
 	out := new(AttachResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/Attach", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/Attach", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3248,7 +3248,7 @@ func (c *runtimeServiceClient) Attach(ctx context.Context, in *AttachRequest, op
 
 func (c *runtimeServiceClient) PortForward(ctx context.Context, in *PortForwardRequest, opts ...grpc.CallOption) (*PortForwardResponse, error) {
 	out := new(PortForwardResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/PortForward", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/PortForward", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3257,7 +3257,7 @@ func (c *runtimeServiceClient) PortForward(ctx context.Context, in *PortForwardR
 
 func (c *runtimeServiceClient) UpdateRuntimeConfig(ctx context.Context, in *UpdateRuntimeConfigRequest, opts ...grpc.CallOption) (*UpdateRuntimeConfigResponse, error) {
 	out := new(UpdateRuntimeConfigResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/UpdateRuntimeConfig", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/UpdateRuntimeConfig", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3266,7 +3266,7 @@ func (c *runtimeServiceClient) UpdateRuntimeConfig(ctx context.Context, in *Upda
 
 func (c *runtimeServiceClient) Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*StatusResponse, error) {
 	out := new(StatusResponse)
-	err := grpc.Invoke(ctx, "/runtime.RuntimeService/Status", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.RuntimeService/Status", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3348,7 +3348,7 @@ func _RuntimeService_Version_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/Version",
+		FullMethod: "/v1alpha1.RuntimeService/Version",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).Version(ctx, req.(*VersionRequest))
@@ -3366,7 +3366,7 @@ func _RuntimeService_RunPodSandbox_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/RunPodSandbox",
+		FullMethod: "/v1alpha1.RuntimeService/RunPodSandbox",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).RunPodSandbox(ctx, req.(*RunPodSandboxRequest))
@@ -3384,7 +3384,7 @@ func _RuntimeService_StopPodSandbox_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/StopPodSandbox",
+		FullMethod: "/v1alpha1.RuntimeService/StopPodSandbox",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).StopPodSandbox(ctx, req.(*StopPodSandboxRequest))
@@ -3402,7 +3402,7 @@ func _RuntimeService_RemovePodSandbox_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/RemovePodSandbox",
+		FullMethod: "/v1alpha1.RuntimeService/RemovePodSandbox",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).RemovePodSandbox(ctx, req.(*RemovePodSandboxRequest))
@@ -3420,7 +3420,7 @@ func _RuntimeService_PodSandboxStatus_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/PodSandboxStatus",
+		FullMethod: "/v1alpha1.RuntimeService/PodSandboxStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).PodSandboxStatus(ctx, req.(*PodSandboxStatusRequest))
@@ -3438,7 +3438,7 @@ func _RuntimeService_ListPodSandbox_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/ListPodSandbox",
+		FullMethod: "/v1alpha1.RuntimeService/ListPodSandbox",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).ListPodSandbox(ctx, req.(*ListPodSandboxRequest))
@@ -3456,7 +3456,7 @@ func _RuntimeService_CreateContainer_Handler(srv interface{}, ctx context.Contex
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/CreateContainer",
+		FullMethod: "/v1alpha1.RuntimeService/CreateContainer",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).CreateContainer(ctx, req.(*CreateContainerRequest))
@@ -3474,7 +3474,7 @@ func _RuntimeService_StartContainer_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/StartContainer",
+		FullMethod: "/v1alpha1.RuntimeService/StartContainer",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).StartContainer(ctx, req.(*StartContainerRequest))
@@ -3492,7 +3492,7 @@ func _RuntimeService_StopContainer_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/StopContainer",
+		FullMethod: "/v1alpha1.RuntimeService/StopContainer",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).StopContainer(ctx, req.(*StopContainerRequest))
@@ -3510,7 +3510,7 @@ func _RuntimeService_RemoveContainer_Handler(srv interface{}, ctx context.Contex
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/RemoveContainer",
+		FullMethod: "/v1alpha1.RuntimeService/RemoveContainer",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).RemoveContainer(ctx, req.(*RemoveContainerRequest))
@@ -3528,7 +3528,7 @@ func _RuntimeService_ListContainers_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/ListContainers",
+		FullMethod: "/v1alpha1.RuntimeService/ListContainers",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).ListContainers(ctx, req.(*ListContainersRequest))
@@ -3546,7 +3546,7 @@ func _RuntimeService_ContainerStatus_Handler(srv interface{}, ctx context.Contex
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/ContainerStatus",
+		FullMethod: "/v1alpha1.RuntimeService/ContainerStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).ContainerStatus(ctx, req.(*ContainerStatusRequest))
@@ -3564,7 +3564,7 @@ func _RuntimeService_ExecSync_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/ExecSync",
+		FullMethod: "/v1alpha1.RuntimeService/ExecSync",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).ExecSync(ctx, req.(*ExecSyncRequest))
@@ -3582,7 +3582,7 @@ func _RuntimeService_Exec_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/Exec",
+		FullMethod: "/v1alpha1.RuntimeService/Exec",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).Exec(ctx, req.(*ExecRequest))
@@ -3600,7 +3600,7 @@ func _RuntimeService_Attach_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/Attach",
+		FullMethod: "/v1alpha1.RuntimeService/Attach",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).Attach(ctx, req.(*AttachRequest))
@@ -3618,7 +3618,7 @@ func _RuntimeService_PortForward_Handler(srv interface{}, ctx context.Context, d
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/PortForward",
+		FullMethod: "/v1alpha1.RuntimeService/PortForward",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).PortForward(ctx, req.(*PortForwardRequest))
@@ -3636,7 +3636,7 @@ func _RuntimeService_UpdateRuntimeConfig_Handler(srv interface{}, ctx context.Co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/UpdateRuntimeConfig",
+		FullMethod: "/v1alpha1.RuntimeService/UpdateRuntimeConfig",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).UpdateRuntimeConfig(ctx, req.(*UpdateRuntimeConfigRequest))
@@ -3654,7 +3654,7 @@ func _RuntimeService_Status_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.RuntimeService/Status",
+		FullMethod: "/v1alpha1.RuntimeService/Status",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RuntimeServiceServer).Status(ctx, req.(*StatusRequest))
@@ -3663,7 +3663,7 @@ func _RuntimeService_Status_Handler(srv interface{}, ctx context.Context, dec fu
 }
 
 var _RuntimeService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "runtime.RuntimeService",
+	ServiceName: "v1alpha1.RuntimeService",
 	HandlerType: (*RuntimeServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -3772,7 +3772,7 @@ func NewImageServiceClient(cc *grpc.ClientConn) ImageServiceClient {
 
 func (c *imageServiceClient) ListImages(ctx context.Context, in *ListImagesRequest, opts ...grpc.CallOption) (*ListImagesResponse, error) {
 	out := new(ListImagesResponse)
-	err := grpc.Invoke(ctx, "/runtime.ImageService/ListImages", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.ImageService/ListImages", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3781,7 +3781,7 @@ func (c *imageServiceClient) ListImages(ctx context.Context, in *ListImagesReque
 
 func (c *imageServiceClient) ImageStatus(ctx context.Context, in *ImageStatusRequest, opts ...grpc.CallOption) (*ImageStatusResponse, error) {
 	out := new(ImageStatusResponse)
-	err := grpc.Invoke(ctx, "/runtime.ImageService/ImageStatus", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.ImageService/ImageStatus", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3790,7 +3790,7 @@ func (c *imageServiceClient) ImageStatus(ctx context.Context, in *ImageStatusReq
 
 func (c *imageServiceClient) PullImage(ctx context.Context, in *PullImageRequest, opts ...grpc.CallOption) (*PullImageResponse, error) {
 	out := new(PullImageResponse)
-	err := grpc.Invoke(ctx, "/runtime.ImageService/PullImage", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.ImageService/PullImage", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3799,7 +3799,7 @@ func (c *imageServiceClient) PullImage(ctx context.Context, in *PullImageRequest
 
 func (c *imageServiceClient) RemoveImage(ctx context.Context, in *RemoveImageRequest, opts ...grpc.CallOption) (*RemoveImageResponse, error) {
 	out := new(RemoveImageResponse)
-	err := grpc.Invoke(ctx, "/runtime.ImageService/RemoveImage", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.ImageService/RemoveImage", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3808,7 +3808,7 @@ func (c *imageServiceClient) RemoveImage(ctx context.Context, in *RemoveImageReq
 
 func (c *imageServiceClient) ImageFsInfo(ctx context.Context, in *ImageFsInfoRequest, opts ...grpc.CallOption) (*ImageFsInfoResponse, error) {
 	out := new(ImageFsInfoResponse)
-	err := grpc.Invoke(ctx, "/runtime.ImageService/ImageFsInfo", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/v1alpha1.ImageService/ImageFsInfo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -3848,7 +3848,7 @@ func _ImageService_ListImages_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.ImageService/ListImages",
+		FullMethod: "/v1alpha1.ImageService/ListImages",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ImageServiceServer).ListImages(ctx, req.(*ListImagesRequest))
@@ -3866,7 +3866,7 @@ func _ImageService_ImageStatus_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.ImageService/ImageStatus",
+		FullMethod: "/v1alpha1.ImageService/ImageStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ImageServiceServer).ImageStatus(ctx, req.(*ImageStatusRequest))
@@ -3884,7 +3884,7 @@ func _ImageService_PullImage_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.ImageService/PullImage",
+		FullMethod: "/v1alpha1.ImageService/PullImage",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ImageServiceServer).PullImage(ctx, req.(*PullImageRequest))
@@ -3902,7 +3902,7 @@ func _ImageService_RemoveImage_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.ImageService/RemoveImage",
+		FullMethod: "/v1alpha1.ImageService/RemoveImage",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ImageServiceServer).RemoveImage(ctx, req.(*RemoveImageRequest))
@@ -3920,7 +3920,7 @@ func _ImageService_ImageFsInfo_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/runtime.ImageService/ImageFsInfo",
+		FullMethod: "/v1alpha1.ImageService/ImageFsInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ImageServiceServer).ImageFsInfo(ctx, req.(*ImageFsInfoRequest))
@@ -3929,7 +3929,7 @@ func _ImageService_ImageFsInfo_Handler(srv interface{}, ctx context.Context, dec
 }
 
 var _ImageService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "runtime.ImageService",
+	ServiceName: "v1alpha1.ImageService",
 	HandlerType: (*ImageServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -21597,239 +21597,240 @@ var (
 func init() { proto.RegisterFile("api.proto", fileDescriptorApi) }
 
 var fileDescriptorApi = []byte{
-	// 3740 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x3b, 0x4d, 0x73, 0x1b, 0x47,
-	0x76, 0x04, 0x40, 0x82, 0xc0, 0x03, 0x01, 0x82, 0x4d, 0x8a, 0x84, 0x40, 0x89, 0xa2, 0xc6, 0x92,
-	0x2c, 0xc9, 0x16, 0x2d, 0x51, 0xb6, 0x14, 0x4b, 0x96, 0x64, 0x98, 0xa4, 0x5c, 0xb4, 0x24, 0x8a,
-	0x1e, 0x48, 0x8e, 0x1d, 0x1f, 0x26, 0x43, 0x4c, 0x13, 0x1c, 0x09, 0x98, 0x1e, 0xcf, 0x0c, 0x68,
-	0x31, 0xa7, 0xe4, 0x96, 0x4b, 0xaa, 0x9c, 0x63, 0xaa, 0x72, 0xc8, 0x21, 0x55, 0xae, 0x24, 0x55,
-	0x39, 0xec, 0x69, 0x7f, 0x82, 0xab, 0xb6, 0xb6, 0x6a, 0x0f, 0x7b, 0xd8, 0xbd, 0xad, 0xb5, 0xf7,
-	0xfd, 0x0d, 0x5b, 0xfd, 0x35, 0xd3, 0xf3, 0x45, 0x91, 0xb2, 0x6b, 0xad, 0x13, 0xa6, 0x5f, 0xbf,
-	0xf7, 0xfa, 0xf5, 0xeb, 0xd7, 0xaf, 0xdf, 0x7b, 0xdd, 0x80, 0xaa, 0xe9, 0xda, 0x2b, 0xae, 0x47,
-	0x02, 0x82, 0x26, 0xbd, 0x91, 0x13, 0xd8, 0x43, 0xdc, 0xbe, 0xd2, 0xb7, 0x83, 0xbd, 0xd1, 0xce,
-	0x4a, 0x8f, 0x0c, 0xdf, 0xeb, 0x93, 0x3e, 0x79, 0x8f, 0xf5, 0xef, 0x8c, 0x76, 0x59, 0x8b, 0x35,
-	0xd8, 0x17, 0xa7, 0xd3, 0x2e, 0x43, 0xe3, 0x0b, 0xec, 0xf9, 0x36, 0x71, 0x74, 0xfc, 0xcd, 0x08,
-	0xfb, 0x01, 0x6a, 0xc1, 0xe4, 0x3e, 0x87, 0xb4, 0x0a, 0xcb, 0x85, 0x8b, 0x55, 0x5d, 0x36, 0xb5,
-	0xef, 0x0b, 0x30, 0x1d, 0x22, 0xfb, 0x2e, 0x71, 0x7c, 0x9c, 0x8f, 0x8d, 0xce, 0xc2, 0x94, 0x90,
-	0xc9, 0x70, 0xcc, 0x21, 0x6e, 0x15, 0x59, 0x77, 0x4d, 0xc0, 0xb6, 0xcc, 0x21, 0x46, 0x6f, 0xc3,
-	0xb4, 0x44, 0x91, 0x4c, 0x4a, 0x0c, 0xab, 0x21, 0xc0, 0x62, 0x34, 0xb4, 0x02, 0xb3, 0x12, 0xd1,
-	0x74, 0xed, 0x10, 0x79, 0x9c, 0x21, 0xcf, 0x88, 0xae, 0x8e, 0x6b, 0x0b, 0x7c, 0xed, 0x6b, 0xa8,
-	0xae, 0x6f, 0x75, 0xd7, 0x88, 0xb3, 0x6b, 0xf7, 0xa9, 0x88, 0x3e, 0xf6, 0x28, 0x4d, 0xab, 0xb0,
-	0x5c, 0xa2, 0x22, 0x8a, 0x26, 0x6a, 0x43, 0xc5, 0xc7, 0xa6, 0xd7, 0xdb, 0xc3, 0x7e, 0xab, 0xc8,
-	0xba, 0xc2, 0x36, 0xa5, 0x22, 0x6e, 0x60, 0x13, 0xc7, 0x6f, 0x95, 0x38, 0x95, 0x68, 0x6a, 0xff,
-	0x51, 0x80, 0xda, 0x36, 0xf1, 0x82, 0x47, 0xa6, 0xeb, 0xda, 0x4e, 0x1f, 0x5d, 0x81, 0x0a, 0xd3,
-	0x65, 0x8f, 0x0c, 0x98, 0x0e, 0x1a, 0xab, 0x33, 0x2b, 0x42, 0xa4, 0x95, 0x6d, 0xd1, 0xa1, 0x87,
-	0x28, 0xe8, 0x3c, 0x34, 0x7a, 0xc4, 0x09, 0x4c, 0xdb, 0xc1, 0x9e, 0xe1, 0x12, 0x2f, 0x60, 0x9a,
-	0x99, 0xd0, 0xeb, 0x21, 0x94, 0x32, 0x47, 0x8b, 0x50, 0xdd, 0x23, 0x7e, 0xc0, 0x31, 0x4a, 0x0c,
-	0xa3, 0x42, 0x01, 0xac, 0x73, 0x01, 0x26, 0x59, 0xa7, 0xed, 0x0a, 0x1d, 0x94, 0x69, 0x73, 0xd3,
-	0xd5, 0xbe, 0x2b, 0xc0, 0xc4, 0x23, 0x32, 0x72, 0x82, 0xc4, 0x30, 0x66, 0xb0, 0x27, 0xd6, 0x47,
-	0x19, 0xc6, 0x0c, 0xf6, 0xa2, 0x61, 0x28, 0x06, 0x5f, 0x22, 0x3e, 0x0c, 0xed, 0x6c, 0x43, 0xc5,
-	0xc3, 0xa6, 0x45, 0x9c, 0xc1, 0x01, 0x13, 0xa1, 0xa2, 0x87, 0x6d, 0xba, 0x76, 0x3e, 0x1e, 0xd8,
-	0xce, 0xe8, 0x85, 0xe1, 0xe1, 0x81, 0xb9, 0x83, 0x07, 0x4c, 0x94, 0x8a, 0xde, 0x10, 0x60, 0x9d,
-	0x43, 0xb5, 0x67, 0x30, 0x4d, 0x17, 0xdb, 0x77, 0xcd, 0x1e, 0x7e, 0xcc, 0x54, 0x48, 0x4d, 0x83,
-	0x0d, 0xea, 0xe0, 0xe0, 0x5b, 0xe2, 0x3d, 0x67, 0x92, 0x55, 0xf4, 0x1a, 0x85, 0x6d, 0x71, 0x10,
-	0x3a, 0x09, 0x15, 0x2e, 0x97, 0x6d, 0x31, 0xb1, 0x2a, 0x3a, 0x9b, 0xf1, 0xb6, 0x6d, 0x85, 0x5d,
-	0xb6, 0xdb, 0x13, 0x52, 0x4d, 0xf2, 0xd9, 0xf7, 0x34, 0x0d, 0x60, 0xd3, 0x09, 0x6e, 0xbc, 0xff,
-	0x85, 0x39, 0x18, 0x61, 0x34, 0x07, 0x13, 0xfb, 0xf4, 0x83, 0xf1, 0x2f, 0xe9, 0xbc, 0xa1, 0xfd,
-	0xbe, 0x08, 0x8b, 0x0f, 0xa9, 0x80, 0x5d, 0xd3, 0xb1, 0x76, 0xc8, 0x8b, 0x2e, 0xee, 0x8d, 0x3c,
-	0x3b, 0x38, 0x58, 0x23, 0x4e, 0x80, 0x5f, 0x04, 0x68, 0x03, 0x66, 0x1c, 0x29, 0xaf, 0x21, 0x4d,
-	0x80, 0x72, 0xa8, 0xad, 0xb6, 0xc2, 0x75, 0x4d, 0xcc, 0x48, 0x6f, 0x3a, 0x71, 0x80, 0x8f, 0xee,
-	0x45, 0xfa, 0x91, 0x4c, 0x8a, 0x8c, 0xc9, 0x7c, 0xc8, 0xa4, 0xbb, 0xc1, 0xe4, 0x10, 0x2c, 0xa4,
-	0xde, 0x24, 0x83, 0xeb, 0x40, 0xf7, 0x8a, 0x61, 0xfa, 0xc6, 0xc8, 0xc7, 0x1e, 0x9b, 0x69, 0x6d,
-	0x75, 0x36, 0x24, 0x8e, 0xe6, 0xa9, 0x57, 0xbd, 0x91, 0xd3, 0xf1, 0x9f, 0xfa, 0xd8, 0x63, 0x3b,
-	0x4a, 0xac, 0x90, 0xe1, 0x11, 0x12, 0xec, 0xfa, 0x72, 0x55, 0x24, 0x58, 0x67, 0x50, 0xf4, 0x1e,
-	0xcc, 0xfa, 0x23, 0xd7, 0x1d, 0xe0, 0x21, 0x76, 0x02, 0x73, 0x60, 0xf4, 0x3d, 0x32, 0x72, 0xfd,
-	0xd6, 0xc4, 0x72, 0xe9, 0x62, 0x49, 0x47, 0x6a, 0xd7, 0xa7, 0xac, 0x07, 0x2d, 0x01, 0xb8, 0x9e,
-	0xbd, 0x6f, 0x0f, 0x70, 0x1f, 0x5b, 0xad, 0x32, 0x63, 0xaa, 0x40, 0xb4, 0x7f, 0x2b, 0xc0, 0x09,
-	0x36, 0x9d, 0x6d, 0x62, 0x09, 0xcd, 0x8a, 0xfd, 0xf7, 0x16, 0xd4, 0x7b, 0x8c, 0xbd, 0xe1, 0x9a,
-	0x1e, 0x76, 0x02, 0x61, 0x88, 0x53, 0x1c, 0xb8, 0xcd, 0x60, 0xe8, 0x31, 0x34, 0x7d, 0xb1, 0x10,
-	0x46, 0x8f, 0xaf, 0x84, 0xd0, 0xd7, 0xb9, 0x70, 0xca, 0x87, 0xac, 0x9a, 0x3e, 0xed, 0xc7, 0x01,
-	0x9a, 0x07, 0x28, 0x92, 0xe4, 0x11, 0x0e, 0x4c, 0xcb, 0x0c, 0x4c, 0x84, 0x60, 0x9c, 0x39, 0x23,
-	0x2e, 0x02, 0xfb, 0x46, 0x4d, 0x28, 0x8d, 0x84, 0x95, 0x55, 0x75, 0xfa, 0x89, 0x4e, 0x41, 0x35,
-	0x5c, 0x4f, 0xe1, 0x91, 0x22, 0x00, 0xf5, 0x0c, 0x66, 0x10, 0xe0, 0xa1, 0x1b, 0x30, 0xdd, 0xd6,
-	0x75, 0xd9, 0xd4, 0x7e, 0x3d, 0x0e, 0xcd, 0xd4, 0xf4, 0x6f, 0x42, 0x65, 0x28, 0x86, 0x17, 0x66,
-	0xb4, 0x18, 0xb9, 0x87, 0x94, 0x84, 0x7a, 0x88, 0x4c, 0x77, 0x1f, 0xb5, 0x6b, 0xc5, 0x79, 0x86,
-	0x6d, 0xaa, 0xd3, 0x01, 0xe9, 0x1b, 0x96, 0xed, 0xe1, 0x5e, 0x40, 0xbc, 0x03, 0x21, 0xe5, 0xd4,
-	0x80, 0xf4, 0xd7, 0x25, 0x0c, 0x5d, 0x03, 0xb0, 0x1c, 0x9f, 0xaa, 0x73, 0xd7, 0xee, 0x33, 0x59,
-	0x6b, 0xab, 0x28, 0x1c, 0x3b, 0x74, 0x90, 0x7a, 0xd5, 0x72, 0x7c, 0x21, 0xec, 0x87, 0x50, 0xa7,
-	0x0e, 0xc7, 0x18, 0x72, 0xdf, 0xc6, 0x0d, 0xa2, 0xb6, 0x3a, 0xa7, 0x48, 0x1c, 0x3a, 0x3e, 0x7d,
-	0xca, 0x8d, 0x1a, 0x3e, 0xba, 0x03, 0x65, 0xb6, 0xe1, 0xfd, 0x56, 0x99, 0xd1, 0x9c, 0xcf, 0x98,
-	0x25, 0x1f, 0x65, 0xe5, 0x21, 0xc3, 0xdb, 0x70, 0x02, 0xef, 0x40, 0x17, 0x44, 0xe8, 0x21, 0xd4,
-	0x4c, 0xc7, 0x21, 0x81, 0xc9, 0xf7, 0xca, 0x24, 0xe3, 0x71, 0x39, 0x9f, 0x47, 0x27, 0x42, 0xe6,
-	0x8c, 0x54, 0x72, 0xf4, 0x3e, 0x4c, 0xb0, 0xcd, 0xd4, 0xaa, 0xb0, 0x59, 0x2f, 0xc5, 0x6d, 0x28,
-	0xc9, 0x4c, 0xe7, 0xc8, 0xed, 0x0f, 0xa1, 0xa6, 0x88, 0x46, 0x0d, 0xe3, 0x39, 0x3e, 0x10, 0xb6,
-	0x42, 0x3f, 0x23, 0x8f, 0xc2, 0xd7, 0x83, 0x37, 0x6e, 0x15, 0xff, 0xae, 0xd0, 0xbe, 0x0b, 0xcd,
-	0xa4, 0x44, 0xc7, 0xa1, 0xd7, 0x36, 0x61, 0x4e, 0x1f, 0x39, 0x91, 0x60, 0xf2, 0x34, 0xbe, 0x06,
-	0x65, 0xb1, 0x7e, 0xdc, 0x76, 0x4e, 0xe6, 0x6a, 0x44, 0x17, 0x88, 0xda, 0x1d, 0x38, 0x91, 0x60,
-	0x25, 0xce, 0xea, 0x73, 0xd0, 0x70, 0x89, 0x65, 0xf8, 0x1c, 0x6c, 0xd8, 0x96, 0xdc, 0x89, 0x6e,
-	0x88, 0xbb, 0x69, 0x51, 0xf2, 0x6e, 0x40, 0xdc, 0xb4, 0x28, 0x47, 0x23, 0x6f, 0xc1, 0x7c, 0x92,
-	0x9c, 0x0f, 0xaf, 0xdd, 0x83, 0x05, 0x1d, 0x0f, 0xc9, 0x3e, 0x7e, 0x5d, 0xd6, 0x6d, 0x68, 0xa5,
-	0x19, 0x44, 0xcc, 0x23, 0x68, 0x37, 0x30, 0x83, 0x91, 0x7f, 0x3c, 0xe6, 0x97, 0x54, 0x06, 0xe2,
-	0x14, 0xe2, 0x7c, 0x50, 0x03, 0x8a, 0xb6, 0x2b, 0x88, 0x8a, 0xb6, 0xab, 0xdd, 0x83, 0x6a, 0xe8,
-	0xff, 0xd1, 0x6a, 0x14, 0x27, 0x14, 0x5f, 0x71, 0x48, 0x84, 0x11, 0xc4, 0x83, 0x94, 0xab, 0x14,
-	0x23, 0xad, 0x02, 0x84, 0x7e, 0x46, 0x1e, 0x3a, 0x28, 0xcd, 0x4f, 0x57, 0xb0, 0xb4, 0xff, 0x8e,
-	0x39, 0x1d, 0x45, 0x64, 0x2b, 0x14, 0xd9, 0x8a, 0x39, 0xa1, 0xe2, 0x71, 0x9c, 0xd0, 0x0a, 0x4c,
-	0xf8, 0x81, 0x19, 0x70, 0x37, 0xd8, 0x50, 0x26, 0x17, 0x1f, 0x12, 0xeb, 0x1c, 0x0d, 0x9d, 0x06,
-	0xe8, 0x79, 0xd8, 0x0c, 0xb0, 0x65, 0x98, 0xdc, 0x3f, 0x96, 0xf4, 0xaa, 0x80, 0x74, 0x02, 0x74,
-	0x0b, 0x26, 0xe5, 0xa1, 0x3f, 0xc1, 0xc4, 0x58, 0xce, 0x60, 0x18, 0xd3, 0xbe, 0x2e, 0x09, 0xa2,
-	0x3d, 0x5d, 0x3e, 0x7c, 0x4f, 0x0b, 0x3a, 0x8e, 0xac, 0xb8, 0xa5, 0xc9, 0x5c, 0xb7, 0xc4, 0x29,
-	0x8e, 0xe2, 0x96, 0x2a, 0xb9, 0x6e, 0x49, 0xf0, 0x38, 0xd4, 0x2d, 0xfd, 0x92, 0x0e, 0xe6, 0x11,
-	0xb4, 0xd2, 0x1b, 0x44, 0x38, 0x86, 0x6b, 0x50, 0xf6, 0x19, 0xe4, 0x10, 0x27, 0x23, 0x48, 0x04,
-	0xa2, 0x76, 0x1f, 0xe6, 0x12, 0x16, 0xc0, 0x63, 0xae, 0xd0, 0x5e, 0x0a, 0x47, 0xb2, 0x17, 0xed,
-	0x2f, 0x05, 0xd5, 0x7a, 0xef, 0xdb, 0x83, 0x00, 0x7b, 0x29, 0xeb, 0xbd, 0x2e, 0x99, 0x72, 0xd3,
-	0x3d, 0x9d, 0xc7, 0x94, 0x87, 0x43, 0xc2, 0x12, 0xbb, 0xd0, 0x60, 0x6b, 0x68, 0xf8, 0x78, 0xc0,
-	0x0e, 0x44, 0x16, 0xc7, 0xd7, 0x56, 0xdf, 0xcd, 0xa0, 0xe6, 0xe3, 0x72, 0x03, 0xe8, 0x0a, 0x74,
-	0xbe, 0x7c, 0xf5, 0x81, 0x0a, 0x6b, 0x7f, 0x0c, 0x28, 0x8d, 0x74, 0xac, 0x75, 0xf8, 0x8c, 0xee,
-	0x7d, 0x1a, 0xc6, 0x67, 0x78, 0xfa, 0x5d, 0x26, 0xc6, 0x21, 0x8b, 0xc0, 0xe5, 0xd4, 0x05, 0xa2,
-	0xf6, 0x5f, 0x25, 0x80, 0xa8, 0xf3, 0x8d, 0xdd, 0xf4, 0x37, 0xc3, 0x2d, 0xc8, 0xa3, 0x89, 0x33,
-	0x19, 0xfc, 0x32, 0x37, 0xdf, 0xfd, 0xf8, 0xe6, 0xe3, 0x71, 0xc5, 0xb9, 0x2c, 0xea, 0x37, 0x76,
-	0xdb, 0xad, 0xc1, 0x7c, 0x72, 0xb9, 0xc5, 0xa6, 0xbb, 0x04, 0x13, 0x76, 0x80, 0x87, 0x3c, 0x29,
-	0x55, 0x23, 0x7b, 0x05, 0x97, 0x63, 0x68, 0x67, 0xa1, 0xba, 0x39, 0x34, 0xfb, 0xb8, 0xeb, 0xe2,
-	0x1e, 0x1d, 0xcb, 0xa6, 0x0d, 0x31, 0x3e, 0x6f, 0x68, 0xab, 0x50, 0x79, 0x80, 0x0f, 0xf8, 0x1e,
-	0x3c, 0xa2, 0x7c, 0xda, 0x6f, 0x0a, 0xb0, 0xc0, 0x7c, 0xe7, 0x9a, 0x4c, 0x09, 0x75, 0xec, 0x93,
-	0x91, 0xd7, 0xc3, 0x3e, 0x5b, 0x52, 0x77, 0x64, 0xb8, 0xd8, 0xb3, 0x89, 0x25, 0x12, 0xa8, 0x6a,
-	0xcf, 0x1d, 0x6d, 0x33, 0x00, 0x4d, 0x1b, 0x69, 0xf7, 0x37, 0x23, 0x22, 0x6c, 0xab, 0xa4, 0x57,
-	0x7a, 0xee, 0xe8, 0x73, 0xda, 0x96, 0xb4, 0xfe, 0x9e, 0xe9, 0x61, 0x9f, 0xd9, 0x10, 0xa7, 0xed,
-	0x32, 0x00, 0xba, 0x06, 0x27, 0x86, 0x78, 0x48, 0xbc, 0x03, 0x63, 0x60, 0x0f, 0xed, 0xc0, 0xb0,
-	0x1d, 0x63, 0xe7, 0x20, 0xc0, 0xbe, 0x30, 0x1c, 0xc4, 0x3b, 0x1f, 0xd2, 0xbe, 0x4d, 0xe7, 0x13,
-	0xda, 0x83, 0x34, 0xa8, 0x13, 0x32, 0x34, 0xfc, 0x1e, 0xf1, 0xb0, 0x61, 0x5a, 0xcf, 0xd8, 0xe1,
-	0x51, 0xd2, 0x6b, 0x84, 0x0c, 0xbb, 0x14, 0xd6, 0xb1, 0x9e, 0x69, 0x26, 0xd4, 0x63, 0x09, 0x15,
-	0x8d, 0xf5, 0x59, 0xe6, 0x24, 0x62, 0x7d, 0xfa, 0x4d, 0x61, 0x1e, 0x19, 0x48, 0x3d, 0xb0, 0x6f,
-	0x0a, 0x0b, 0x0e, 0x5c, 0x19, 0xe8, 0xb3, 0x6f, 0xaa, 0xb0, 0x01, 0xde, 0x17, 0x39, 0x6d, 0x55,
-	0xe7, 0x0d, 0xcd, 0x02, 0x58, 0x33, 0x5d, 0x73, 0xc7, 0x1e, 0xd8, 0xc1, 0x01, 0xba, 0x04, 0x4d,
-	0xd3, 0xb2, 0x8c, 0x9e, 0x84, 0xd8, 0x58, 0x16, 0x18, 0xa6, 0x4d, 0xcb, 0x5a, 0x53, 0xc0, 0xe8,
-	0x1d, 0x98, 0xb1, 0x3c, 0xe2, 0xc6, 0x71, 0x79, 0xc5, 0xa1, 0x49, 0x3b, 0x54, 0x64, 0xed, 0x65,
-	0x09, 0x4e, 0xc7, 0x97, 0x25, 0x99, 0xa2, 0xde, 0x84, 0xa9, 0xc4, 0xa8, 0xf1, 0xdc, 0x30, 0x12,
-	0x52, 0x8f, 0x21, 0x26, 0x92, 0xb8, 0x62, 0x32, 0x89, 0xcb, 0xce, 0x7d, 0x4b, 0x3f, 0x47, 0xee,
-	0x3b, 0xfe, 0x53, 0x72, 0xdf, 0x89, 0x23, 0xe5, 0xbe, 0x17, 0x58, 0x35, 0x49, 0x12, 0xb1, 0xb4,
-	0xa9, 0xcc, 0x4b, 0x1e, 0x21, 0x8e, 0x23, 0xab, 0x4e, 0x89, 0x1c, 0x79, 0xf2, 0x38, 0x39, 0x72,
-	0x25, 0x37, 0x47, 0xa6, 0x16, 0xe1, 0xba, 0xa6, 0x37, 0x24, 0x9e, 0xe1, 0x7a, 0x64, 0xd7, 0x1e,
-	0xe0, 0x56, 0x95, 0x89, 0x30, 0x2d, 0xe1, 0xdb, 0x1c, 0xac, 0xfd, 0x4f, 0x01, 0xe6, 0xe2, 0x8b,
-	0x2c, 0x32, 0xb0, 0xbb, 0x50, 0xf5, 0xe4, 0x2e, 0x14, 0x0b, 0xbb, 0x1c, 0x8f, 0x74, 0xd2, 0xbb,
-	0x55, 0x8f, 0x48, 0xd0, 0xe7, 0xb9, 0x89, 0xf4, 0x85, 0x1c, 0x36, 0xaf, 0x4c, 0xa5, 0x3b, 0x30,
-	0x13, 0x22, 0x1f, 0x9a, 0x49, 0x2b, 0x99, 0x71, 0x31, 0x9e, 0x19, 0x3b, 0x50, 0x5e, 0xc7, 0xfb,
-	0x76, 0x0f, 0xff, 0x2c, 0x75, 0xa9, 0x65, 0xa8, 0xb9, 0xd8, 0x1b, 0xda, 0xbe, 0x1f, 0x1a, 0x68,
-	0x55, 0x57, 0x41, 0xda, 0x1f, 0x27, 0x60, 0x3a, 0xa9, 0xd9, 0x1b, 0xa9, 0x44, 0xbc, 0x1d, 0xed,
-	0x98, 0xe4, 0xfc, 0x94, 0xd3, 0xf0, 0xa2, 0x74, 0xb8, 0xc5, 0x44, 0x3c, 0x1e, 0xfa, 0x64, 0xe1,
-	0x84, 0xe9, 0xfc, 0x7b, 0x64, 0x38, 0x34, 0x1d, 0x4b, 0xd6, 0x0c, 0x45, 0x93, 0x6a, 0xcb, 0xf4,
-	0xfa, 0x74, 0x1b, 0x50, 0x30, 0xfb, 0x46, 0x67, 0xa0, 0x46, 0xe3, 0x5a, 0xdb, 0x61, 0x79, 0x3c,
-	0x33, 0xf2, 0xaa, 0x0e, 0x02, 0xb4, 0x6e, 0x7b, 0xe8, 0x3c, 0x8c, 0x63, 0x67, 0x5f, 0x9e, 0x7b,
-	0x51, 0x51, 0x51, 0x3a, 0x7a, 0x9d, 0x75, 0xa3, 0x0b, 0x50, 0x1e, 0x92, 0x91, 0x13, 0xc8, 0x08,
-	0xb7, 0x11, 0x22, 0xb2, 0x4a, 0xa0, 0x2e, 0x7a, 0xd1, 0x25, 0x98, 0xb4, 0xd8, 0x1a, 0xc8, 0x30,
-	0x76, 0x3a, 0xaa, 0x05, 0x30, 0xb8, 0x2e, 0xfb, 0xd1, 0x47, 0xe1, 0x89, 0x5d, 0x4d, 0x9c, 0xb9,
-	0x09, 0xa5, 0x66, 0x1e, 0xdb, 0x0f, 0xe2, 0xc7, 0x36, 0x30, 0x16, 0x97, 0x72, 0x59, 0x1c, 0x9e,
-	0xc9, 0x9f, 0x84, 0xca, 0x80, 0xf4, 0xb9, 0x1d, 0xd4, 0x78, 0x85, 0x79, 0x40, 0xfa, 0xcc, 0x0c,
-	0xe6, 0x68, 0x98, 0x62, 0xd9, 0x4e, 0x6b, 0x8a, 0x6d, 0x5f, 0xde, 0xa0, 0xa7, 0x0f, 0xfb, 0x30,
-	0x88, 0xd3, 0xc3, 0xad, 0x3a, 0xeb, 0xaa, 0x32, 0xc8, 0x63, 0xa7, 0xc7, 0x0e, 0xc7, 0x20, 0x38,
-	0x68, 0x35, 0x18, 0x9c, 0x7e, 0xd2, 0xe8, 0x92, 0xe7, 0x15, 0xd3, 0x89, 0xe8, 0x32, 0x6b, 0x7f,
-	0xbe, 0x01, 0xa5, 0x82, 0x5f, 0x15, 0x60, 0x7e, 0x8d, 0x05, 0x57, 0x8a, 0x27, 0x38, 0x46, 0xaa,
-	0x8b, 0xae, 0x86, 0x35, 0x85, 0x64, 0xc6, 0x9a, 0x9c, 0xac, 0xc0, 0x43, 0x1f, 0x43, 0x43, 0xf2,
-	0x14, 0x94, 0xa5, 0x57, 0x55, 0x23, 0xea, 0xbe, 0xda, 0xd4, 0x3e, 0x82, 0x85, 0x94, 0xcc, 0x22,
-	0x10, 0x3a, 0x0b, 0x53, 0x91, 0x47, 0x08, 0x45, 0xae, 0x85, 0xb0, 0x4d, 0x4b, 0xbb, 0x05, 0x27,
-	0xba, 0x81, 0xe9, 0x05, 0xa9, 0x09, 0x1f, 0x81, 0x96, 0x15, 0x24, 0xe2, 0xb4, 0xa2, 0x66, 0xd0,
-	0x85, 0xb9, 0x6e, 0x40, 0xdc, 0xd7, 0x60, 0x4a, 0x77, 0x3a, 0x9d, 0x36, 0x19, 0x05, 0x22, 0xfa,
-	0x91, 0x4d, 0x6d, 0x81, 0x97, 0x4f, 0xd2, 0xa3, 0xdd, 0x86, 0x79, 0x5e, 0xbd, 0x78, 0x9d, 0x49,
-	0x9c, 0x94, 0xb5, 0x93, 0x34, 0xdf, 0x75, 0x98, 0x8d, 0x5c, 0x79, 0x94, 0x88, 0x5d, 0x89, 0x27,
-	0x62, 0x0b, 0xe9, 0x35, 0x8e, 0xe5, 0x61, 0xff, 0x5e, 0x54, 0x1c, 0x66, 0x4e, 0x1a, 0xb6, 0x1a,
-	0x4f, 0xc3, 0x4e, 0xe5, 0xb0, 0x8c, 0x65, 0x61, 0x69, 0x8b, 0x2c, 0x65, 0x58, 0xa4, 0x9e, 0xca,
-	0xd5, 0xc6, 0x99, 0xd3, 0x78, 0x27, 0x3d, 0xc4, 0xdf, 0x30, 0x55, 0xdb, 0xe4, 0xa9, 0x5a, 0x38,
-	0x74, 0x58, 0x51, 0xba, 0x9a, 0x48, 0xd5, 0x5a, 0x79, 0x62, 0x86, 0x99, 0xda, 0xbf, 0x8e, 0x43,
-	0x35, 0xec, 0x4b, 0x29, 0x36, 0xad, 0xa4, 0x62, 0x86, 0x92, 0xd4, 0xf3, 0xab, 0xf4, 0x3a, 0xe7,
-	0xd7, 0xf8, 0xab, 0xce, 0xaf, 0x45, 0xa8, 0xb2, 0x0f, 0xc3, 0xc3, 0xbb, 0xe2, 0x3c, 0xaa, 0x30,
-	0x80, 0x8e, 0x77, 0x23, 0x83, 0x2a, 0x1f, 0xc5, 0xa0, 0x12, 0x39, 0xe1, 0x64, 0x32, 0x27, 0xbc,
-	0x11, 0x9e, 0x30, 0xfc, 0x2c, 0x5a, 0x4a, 0xb3, 0xcb, 0x3c, 0x5b, 0x36, 0xe2, 0x67, 0x0b, 0x3f,
-	0x9e, 0xde, 0xca, 0x20, 0x7e, 0x63, 0x33, 0xc2, 0x87, 0x3c, 0x23, 0x54, 0xad, 0x4a, 0x38, 0xc2,
-	0x55, 0x80, 0x70, 0xcf, 0xcb, 0xb4, 0x10, 0xa5, 0xa7, 0xa6, 0x2b, 0x58, 0xd4, 0xab, 0xc4, 0xf4,
-	0x1f, 0x95, 0x3d, 0x8f, 0xe0, 0x55, 0xfe, 0x4f, 0x8d, 0x92, 0x72, 0x2a, 0x87, 0x37, 0x52, 0x45,
-	0x84, 0xa3, 0x59, 0xdd, 0x95, 0x78, 0x0d, 0xe1, 0x78, 0xe6, 0x92, 0x2a, 0x21, 0xb0, 0x43, 0xdd,
-	0xf4, 0x44, 0x37, 0xcf, 0xfe, 0xaa, 0x02, 0xd2, 0x09, 0x68, 0x28, 0xb5, 0x6b, 0x3b, 0xb6, 0xbf,
-	0xc7, 0xfb, 0xcb, 0xac, 0x1f, 0x24, 0xa8, 0xc3, 0x6e, 0x53, 0xf1, 0x0b, 0x3b, 0x30, 0x7a, 0xc4,
-	0xc2, 0xcc, 0x18, 0x27, 0xf4, 0x0a, 0x05, 0xac, 0x11, 0x0b, 0x47, 0x1b, 0xa4, 0x72, 0xac, 0x0d,
-	0x52, 0x4d, 0x6c, 0x90, 0x79, 0x28, 0x7b, 0xd8, 0xf4, 0x89, 0xd3, 0x02, 0x7e, 0x27, 0xcb, 0x5b,
-	0xf4, 0xac, 0x18, 0x62, 0xdf, 0xa7, 0x03, 0x88, 0x00, 0x46, 0x34, 0x95, 0x30, 0x6b, 0x2a, 0x2f,
-	0xcc, 0x3a, 0xa4, 0x34, 0x99, 0x08, 0xb3, 0xea, 0x79, 0x61, 0xd6, 0x51, 0x2a, 0x93, 0x4a, 0x10,
-	0xd9, 0x38, 0x2c, 0x88, 0xfc, 0x25, 0x37, 0xce, 0x03, 0x58, 0x48, 0x99, 0xba, 0xd8, 0x39, 0x57,
-	0x13, 0x05, 0xcc, 0x56, 0x9e, 0x16, 0xc2, 0xfa, 0xe5, 0x3f, 0xc2, 0xf4, 0xc6, 0x0b, 0xdc, 0xeb,
-	0x1e, 0x38, 0xbd, 0x63, 0x1c, 0xfb, 0x4d, 0x28, 0xf5, 0x86, 0x96, 0xc8, 0xdc, 0xe9, 0xa7, 0x1a,
-	0x08, 0x94, 0xe2, 0x81, 0x80, 0x01, 0xcd, 0x68, 0x04, 0x21, 0xe7, 0x3c, 0x95, 0xd3, 0xa2, 0xc8,
-	0x94, 0xf9, 0x94, 0x2e, 0x5a, 0x02, 0x8e, 0x3d, 0x8f, 0xcd, 0x9a, 0xc3, 0xb1, 0xe7, 0xc5, 0xcd,
-	0xb6, 0x14, 0x37, 0x5b, 0xed, 0x19, 0xd4, 0xe8, 0x00, 0x3f, 0x49, 0x7c, 0x11, 0x0d, 0x97, 0xa2,
-	0x68, 0x38, 0x0c, 0xaa, 0xc7, 0x95, 0xa0, 0x5a, 0x5b, 0x86, 0x29, 0x3e, 0x96, 0x98, 0x48, 0x13,
-	0x4a, 0x23, 0x6f, 0x20, 0xd7, 0x6d, 0xe4, 0x0d, 0xb4, 0x7f, 0x80, 0x7a, 0x27, 0x08, 0xcc, 0xde,
-	0xde, 0x31, 0xe4, 0x09, 0xc7, 0x2a, 0xaa, 0x01, 0x7c, 0x4a, 0x26, 0x4d, 0x83, 0x86, 0xe4, 0x9d,
-	0x3b, 0xfe, 0x16, 0xa0, 0x6d, 0xe2, 0x05, 0xf7, 0x89, 0xf7, 0xad, 0xe9, 0x59, 0xc7, 0x0b, 0x88,
-	0x11, 0x8c, 0x8b, 0x87, 0x18, 0xa5, 0x8b, 0x13, 0x3a, 0xfb, 0xd6, 0xde, 0x86, 0xd9, 0x18, 0xbf,
-	0xdc, 0x81, 0x6f, 0x42, 0x8d, 0xf9, 0x09, 0x11, 0x34, 0x5d, 0x54, 0xcb, 0x73, 0x87, 0x39, 0x13,
-	0x9a, 0x56, 0xd3, 0x83, 0x80, 0xc1, 0x43, 0xaf, 0xfd, 0x6e, 0x22, 0xb4, 0x98, 0x8b, 0xd3, 0x27,
-	0xc2, 0x8a, 0xff, 0x2f, 0xc0, 0x04, 0x83, 0xa7, 0xdc, 0xf6, 0x22, 0x54, 0x3d, 0xec, 0x12, 0x23,
-	0x30, 0xfb, 0xe1, 0xdb, 0x16, 0x0a, 0x78, 0x62, 0xf6, 0x7d, 0xf6, 0x34, 0x87, 0x76, 0x5a, 0x76,
-	0x1f, 0xfb, 0x81, 0x7c, 0xe0, 0x52, 0xa3, 0xb0, 0x75, 0x0e, 0xa2, 0x2a, 0xf1, 0xed, 0x7f, 0xe2,
-	0x31, 0xc3, 0xb8, 0xce, 0xbe, 0xd1, 0x79, 0x7e, 0x51, 0x7e, 0x48, 0x35, 0x86, 0xdd, 0x9e, 0xb7,
-	0xa1, 0x92, 0x28, 0xc0, 0x84, 0x6d, 0xed, 0x23, 0x40, 0xea, 0x9c, 0x85, 0x52, 0x2f, 0x40, 0x99,
-	0xa9, 0x44, 0x1e, 0x7a, 0x8d, 0xf8, 0xa4, 0x75, 0xd1, 0xab, 0xdd, 0x05, 0xc4, 0xb5, 0x18, 0x3b,
-	0xe8, 0x8e, 0xae, 0xf1, 0xdb, 0x30, 0x1b, 0xa3, 0x0f, 0xef, 0x45, 0x63, 0x0c, 0x92, 0xa3, 0x0b,
-	0xe2, 0xdf, 0x16, 0x00, 0x3a, 0xa3, 0x60, 0x4f, 0x54, 0x13, 0xd4, 0x59, 0x16, 0xe2, 0xb3, 0xa4,
-	0x7d, 0xae, 0xe9, 0xfb, 0xdf, 0x12, 0x4f, 0x46, 0x72, 0x61, 0x9b, 0x55, 0x02, 0x46, 0xc1, 0x9e,
-	0xac, 0x36, 0xd2, 0x6f, 0x74, 0x1e, 0x1a, 0xfc, 0x49, 0x92, 0x61, 0x5a, 0x96, 0x87, 0x7d, 0x5f,
-	0x94, 0x1d, 0xeb, 0x1c, 0xda, 0xe1, 0x40, 0x8a, 0x66, 0x5b, 0xd8, 0x09, 0xec, 0xe0, 0xc0, 0x08,
-	0xc8, 0x73, 0xec, 0x88, 0x18, 0xad, 0x2e, 0xa1, 0x4f, 0x28, 0x90, 0xa2, 0x79, 0xb8, 0x6f, 0xfb,
-	0x81, 0x27, 0xd1, 0x64, 0x19, 0x4c, 0x40, 0x19, 0x9a, 0xf6, 0x7d, 0x01, 0x9a, 0xdb, 0xa3, 0xc1,
-	0x80, 0x4f, 0xf2, 0xb8, 0xba, 0x44, 0x6f, 0x8b, 0x79, 0x14, 0x13, 0xd6, 0x10, 0xa9, 0x48, 0x4c,
-	0xee, 0xa7, 0xe7, 0x8e, 0x57, 0x61, 0x46, 0x11, 0x54, 0x2c, 0x5a, 0xec, 0x28, 0x2e, 0xc4, 0x8f,
-	0x62, 0x6a, 0x28, 0x3c, 0x5d, 0x7a, 0xbd, 0xc9, 0x69, 0x27, 0x60, 0x36, 0x46, 0x2f, 0x52, 0xad,
-	0xcb, 0x50, 0x17, 0x77, 0x93, 0xc2, 0x08, 0x4e, 0x42, 0x85, 0xba, 0x97, 0x9e, 0x6d, 0xc9, 0x32,
-	0xf3, 0xa4, 0x4b, 0xac, 0x35, 0xdb, 0xf2, 0xb4, 0x2d, 0xa8, 0xeb, 0x9c, 0xbd, 0xc0, 0xbd, 0x03,
-	0x0d, 0x71, 0x93, 0x69, 0xc4, 0x6e, 0xf4, 0xa3, 0x9a, 0x68, 0x8c, 0xb7, 0x5e, 0x77, 0xd4, 0xa6,
-	0xf6, 0x35, 0xb4, 0x9f, 0xba, 0x16, 0x8d, 0x98, 0x54, 0xae, 0x72, 0x6a, 0x77, 0x40, 0x3e, 0x99,
-	0xcb, 0x63, 0x1e, 0x27, 0xab, 0x7b, 0x6a, 0x53, 0x3b, 0x0d, 0x8b, 0x99, 0xcc, 0xc5, 0xbc, 0x5d,
-	0x68, 0x46, 0x1d, 0x96, 0x2d, 0xab, 0xeb, 0xac, 0x6a, 0x5e, 0x50, 0xaa, 0xe6, 0xf3, 0xe1, 0x31,
-	0xcc, 0x1d, 0xba, 0x68, 0x29, 0x91, 0x51, 0x29, 0x2f, 0x32, 0x1a, 0x8f, 0x45, 0x46, 0xda, 0x67,
-	0xa1, 0xf6, 0x44, 0x58, 0xfa, 0x21, 0x8b, 0x8d, 0xf9, 0xd8, 0xd2, 0x4d, 0x9c, 0xcc, 0x98, 0x1c,
-	0xc7, 0xd0, 0x15, 0x64, 0x6d, 0x1a, 0xea, 0x31, 0x87, 0xa1, 0x7d, 0x0c, 0x8d, 0x84, 0x07, 0x58,
-	0x49, 0xc4, 0x0f, 0x29, 0xb5, 0x25, 0xa2, 0x87, 0x39, 0xe1, 0x88, 0xee, 0xfb, 0x9b, 0xce, 0x2e,
-	0x91, 0x7c, 0xdf, 0x82, 0xda, 0xd3, 0xbc, 0xe7, 0x67, 0xe3, 0xf2, 0xd2, 0xe5, 0x3f, 0x4b, 0x50,
-	0xe6, 0x64, 0x54, 0x2d, 0xbc, 0xe0, 0x26, 0x94, 0x28, 0x5a, 0xec, 0x38, 0x8a, 0xca, 0x9e, 0xec,
-	0x1b, 0xdd, 0x86, 0x46, 0xcf, 0x74, 0xcd, 0x1e, 0xdd, 0xfb, 0xfc, 0xb6, 0xa4, 0x94, 0x38, 0x1f,
-	0x94, 0xa1, 0xf5, 0xba, 0xc4, 0xe5, 0xd7, 0x27, 0x77, 0x60, 0xda, 0xdc, 0x37, 0xed, 0x81, 0xb9,
-	0x33, 0xc0, 0xca, 0x5d, 0x4b, 0x1e, 0x75, 0x23, 0x44, 0xe6, 0xe4, 0xd7, 0x01, 0x46, 0x3e, 0xb6,
-	0x04, 0xe5, 0xc4, 0x21, 0x94, 0x55, 0x8a, 0x17, 0x8e, 0x69, 0x3b, 0xc4, 0xc2, 0xbe, 0x21, 0x65,
-	0x11, 0xf7, 0xf6, 0x39, 0x63, 0x72, 0xe4, 0x35, 0x81, 0x8b, 0xee, 0x41, 0x53, 0x90, 0x87, 0xc2,
-	0xb0, 0xb8, 0x3d, 0x8f, 0x5e, 0x0c, 0xd6, 0x91, 0xc8, 0xe8, 0x03, 0xa8, 0x09, 0x06, 0x54, 0x26,
-	0x11, 0xda, 0x67, 0xd3, 0x02, 0x47, 0x7c, 0xea, 0x63, 0x4b, 0xbb, 0x27, 0x8e, 0x08, 0xb9, 0xb2,
-	0xc2, 0x40, 0x2e, 0xc2, 0xe4, 0xae, 0x6f, 0xd8, 0xce, 0x2e, 0x11, 0x16, 0x12, 0xd5, 0x4e, 0x05,
-	0x66, 0x79, 0x97, 0xfd, 0x5e, 0x3e, 0x05, 0x15, 0xf9, 0xe8, 0x13, 0x4d, 0x42, 0xe9, 0xc9, 0xda,
-	0x76, 0x73, 0x8c, 0x7e, 0x3c, 0x5d, 0xdf, 0x6e, 0x16, 0x2e, 0xdf, 0x82, 0xe9, 0xc4, 0x1d, 0x2a,
-	0x9a, 0x81, 0x7a, 0xb7, 0xb3, 0xb5, 0xfe, 0xc9, 0xe3, 0x2f, 0x0d, 0x7d, 0xa3, 0xb3, 0xfe, 0x55,
-	0x73, 0x0c, 0xcd, 0x41, 0x53, 0x82, 0xb6, 0x1e, 0x3f, 0xe1, 0xd0, 0xc2, 0xe5, 0xe7, 0xd0, 0x88,
-	0xe7, 0x4e, 0xe8, 0x04, 0xcc, 0xac, 0x3d, 0xde, 0x7a, 0xd2, 0xd9, 0xdc, 0xda, 0xd0, 0x8d, 0x35,
-	0x7d, 0xa3, 0xf3, 0x64, 0x63, 0xbd, 0x39, 0x16, 0x07, 0xeb, 0x4f, 0xb7, 0xb6, 0x36, 0xb7, 0x3e,
-	0x6d, 0x16, 0x28, 0xd7, 0x08, 0xbc, 0xf1, 0xe5, 0x26, 0x45, 0x2e, 0xc6, 0x91, 0x9f, 0x6e, 0x3d,
-	0xd8, 0x7a, 0xfc, 0xf7, 0x5b, 0xcd, 0xd2, 0xea, 0xff, 0xd6, 0xa0, 0x21, 0x6d, 0x1f, 0x7b, 0xcc,
-	0x2c, 0xef, 0xc2, 0xa4, 0x7c, 0x8f, 0x1b, 0x65, 0x73, 0xf1, 0xc7, 0xc3, 0xed, 0x56, 0xba, 0x43,
-	0xf8, 0x90, 0x31, 0xb4, 0xcd, 0xf6, 0xb4, 0x72, 0x5f, 0x7d, 0x5a, 0xdd, 0x65, 0xa9, 0x0b, 0xf1,
-	0xf6, 0x52, 0x5e, 0x77, 0xc8, 0xb1, 0x4b, 0x37, 0xb2, 0xfa, 0xd6, 0x08, 0x45, 0x34, 0x99, 0x6f,
-	0x98, 0xda, 0x67, 0x72, 0xfb, 0x43, 0xa6, 0x5f, 0x41, 0x33, 0xf9, 0xca, 0x08, 0x45, 0x37, 0x30,
-	0x39, 0x2f, 0x98, 0xda, 0x67, 0x0f, 0xc1, 0x50, 0x59, 0xa7, 0x5e, 0xea, 0x2c, 0xe7, 0xbf, 0xb5,
-	0x48, 0xb1, 0xce, 0x7b, 0xc0, 0xc1, 0x55, 0x11, 0xbf, 0x67, 0x46, 0xea, 0xfb, 0x98, 0x8c, 0xf7,
-	0x06, 0x8a, 0x2a, 0xb2, 0x2f, 0xa8, 0xb5, 0x31, 0xf4, 0x05, 0x4c, 0x27, 0x8a, 0xb6, 0x28, 0xa2,
-	0xca, 0x2e, 0x41, 0xb7, 0x97, 0xf3, 0x11, 0xe2, 0xeb, 0xa6, 0x96, 0x64, 0x63, 0xeb, 0x96, 0x51,
-	0xe7, 0x8d, 0xad, 0x5b, 0x66, 0x2d, 0x97, 0x99, 0x57, 0xac, 0xf0, 0xaa, 0x98, 0x57, 0x56, 0x95,
-	0xb7, 0xbd, 0x94, 0xd7, 0xad, 0x4e, 0x3f, 0x51, 0x74, 0x55, 0xa6, 0x9f, 0x5d, 0xcb, 0x6d, 0x2f,
-	0xe7, 0x23, 0x24, 0xd7, 0x2a, 0xaa, 0x00, 0x25, 0xd6, 0x2a, 0x55, 0x70, 0x4c, 0xac, 0x55, 0xba,
-	0x74, 0x24, 0xd6, 0x2a, 0x51, 0xca, 0x39, 0x93, 0x9b, 0x05, 0xa7, 0xd7, 0x2a, 0x3b, 0xb1, 0xd6,
-	0xc6, 0x50, 0x07, 0x2a, 0x32, 0x8d, 0x45, 0xd1, 0xee, 0x4e, 0xe4, 0xce, 0xed, 0x93, 0x19, 0x3d,
-	0x21, 0x8b, 0x0f, 0x60, 0x9c, 0x42, 0xd1, 0x5c, 0x0c, 0x49, 0x92, 0x9e, 0x48, 0x40, 0x43, 0xb2,
-	0xdb, 0x50, 0xe6, 0x59, 0x1f, 0x8a, 0x8e, 0xe3, 0x58, 0x8a, 0xd9, 0x5e, 0x48, 0xc1, 0x43, 0xe2,
-	0xcf, 0xf8, 0x1b, 0x7d, 0x91, 0xbe, 0xa1, 0xc5, 0xd8, 0x03, 0xd6, 0x78, 0x92, 0xd8, 0x3e, 0x95,
-	0xdd, 0x19, 0xf2, 0xda, 0x81, 0xd9, 0x8c, 0xe8, 0x08, 0x45, 0x55, 0xc7, 0xfc, 0xc0, 0xac, 0x7d,
-	0xee, 0x70, 0x24, 0x75, 0xb2, 0x62, 0xd5, 0xe6, 0x55, 0x53, 0x57, 0x16, 0x6b, 0x21, 0x05, 0x97,
-	0xc4, 0xab, 0xff, 0x52, 0x82, 0x29, 0x1e, 0xc3, 0x0a, 0x57, 0xfd, 0x29, 0x40, 0x94, 0x66, 0xa1,
-	0x76, 0xcc, 0x7a, 0x62, 0xf9, 0x66, 0x7b, 0x31, 0xb3, 0x4f, 0x55, 0xa3, 0x92, 0x31, 0x29, 0x6a,
-	0x4c, 0xe7, 0x61, 0x8a, 0x1a, 0x33, 0x92, 0x2c, 0x6d, 0x0c, 0xad, 0x43, 0x35, 0x0c, 0xe3, 0x91,
-	0x12, 0xfd, 0x27, 0x72, 0x90, 0x76, 0x3b, 0xab, 0x4b, 0x95, 0x48, 0x09, 0xcd, 0x15, 0x89, 0xd2,
-	0x01, 0xbf, 0x22, 0x51, 0x56, 0x34, 0x1f, 0xcd, 0x4e, 0xc4, 0x63, 0x89, 0xd9, 0xc5, 0x82, 0xbb,
-	0xe4, 0xec, 0xe2, 0xf1, 0x81, 0x36, 0xf6, 0xc9, 0xa9, 0x1f, 0x7e, 0x5c, 0x2a, 0xfc, 0xe1, 0xc7,
-	0xa5, 0xb1, 0x7f, 0x7e, 0xb9, 0x54, 0xf8, 0xe1, 0xe5, 0x52, 0xe1, 0x77, 0x2f, 0x97, 0x0a, 0x7f,
-	0x7a, 0xb9, 0x54, 0xf8, 0xee, 0xcf, 0x4b, 0x63, 0x3b, 0x65, 0xf6, 0xf7, 0x8f, 0xeb, 0x7f, 0x0d,
-	0x00, 0x00, 0xff, 0xff, 0x9d, 0x48, 0xd9, 0xb0, 0xb2, 0x33, 0x00, 0x00,
+	// 3747 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x3b, 0xcd, 0x6f, 0x1b, 0xd7,
+	0xf1, 0x22, 0x29, 0x51, 0xe4, 0x50, 0xa4, 0xa8, 0xa7, 0x2f, 0x8a, 0xb2, 0x65, 0x69, 0x13, 0xc7,
+	0xb6, 0xf2, 0x8b, 0xfc, 0xb3, 0xec, 0xc6, 0xae, 0x13, 0x3b, 0xa6, 0x25, 0xd9, 0x50, 0x6c, 0xcb,
+	0xea, 0xd2, 0x4a, 0xd3, 0xa6, 0xc0, 0x76, 0xc5, 0x7d, 0xa2, 0xd6, 0x26, 0x77, 0x37, 0xbb, 0x4b,
+	0xc5, 0xea, 0xa9, 0xf7, 0xa2, 0x45, 0x80, 0xde, 0x7a, 0x2c, 0x0a, 0x14, 0x48, 0x0f, 0x45, 0x81,
+	0x9e, 0x7b, 0x0e, 0x50, 0xb4, 0xe8, 0xad, 0x3d, 0x36, 0x2e, 0xd0, 0x73, 0xff, 0x84, 0xe2, 0x7d,
+	0xed, 0xbe, 0xfd, 0xa2, 0x25, 0x27, 0x68, 0x7c, 0xd2, 0xbe, 0x79, 0x33, 0xf3, 0xe6, 0xcd, 0xcc,
+	0x9b, 0x37, 0x33, 0x7c, 0x82, 0xb2, 0xee, 0x98, 0x6b, 0x8e, 0x6b, 0xfb, 0x36, 0x2a, 0x1d, 0x5d,
+	0xd1, 0x7b, 0xce, 0xa1, 0x7e, 0xa5, 0xf9, 0x4e, 0xd7, 0xf4, 0x0f, 0x07, 0xfb, 0x6b, 0x1d, 0xbb,
+	0x7f, 0xb9, 0x6b, 0x77, 0xed, 0xcb, 0x14, 0x61, 0x7f, 0x70, 0x40, 0x47, 0x74, 0x40, 0xbf, 0x18,
+	0xa1, 0xb2, 0x0a, 0xb5, 0x8f, 0xb0, 0xeb, 0x99, 0xb6, 0xa5, 0xe2, 0x4f, 0x07, 0xd8, 0xf3, 0x51,
+	0x03, 0xc6, 0x8f, 0x18, 0xa4, 0x91, 0x5b, 0xce, 0x5d, 0x2c, 0xab, 0x62, 0xa8, 0xfc, 0x36, 0x07,
+	0x93, 0x01, 0xb2, 0xe7, 0xd8, 0x96, 0x87, 0xb3, 0xb1, 0xd1, 0x0a, 0x4c, 0xb8, 0x03, 0xcb, 0x37,
+	0xfb, 0x58, 0xb3, 0xf4, 0x3e, 0x6e, 0xe4, 0xe9, 0x74, 0x85, 0xc3, 0x76, 0xf4, 0x3e, 0x46, 0x17,
+	0x60, 0x52, 0xa0, 0x08, 0x26, 0x05, 0x8a, 0x55, 0xe3, 0x60, 0xbe, 0x1a, 0x5a, 0x83, 0x69, 0x81,
+	0xa8, 0x3b, 0x66, 0x80, 0x3c, 0x4a, 0x91, 0xa7, 0xf8, 0x54, 0xcb, 0x31, 0x39, 0xbe, 0xf2, 0x09,
+	0x94, 0x37, 0x77, 0xda, 0x1b, 0xb6, 0x75, 0x60, 0x76, 0x89, 0x88, 0x1e, 0x76, 0x09, 0x4d, 0x23,
+	0xb7, 0x5c, 0x20, 0x22, 0xf2, 0x21, 0x6a, 0x42, 0xc9, 0xc3, 0xba, 0xdb, 0x39, 0xc4, 0x5e, 0x23,
+	0x4f, 0xa7, 0x82, 0x31, 0xa1, 0xb2, 0x1d, 0xdf, 0xb4, 0x2d, 0xaf, 0x51, 0x60, 0x54, 0x7c, 0xa8,
+	0xfc, 0x2a, 0x07, 0x95, 0x5d, 0xdb, 0xf5, 0x1f, 0xe9, 0x8e, 0x63, 0x5a, 0x5d, 0xb4, 0x06, 0x25,
+	0xaa, 0xcb, 0x8e, 0xdd, 0xa3, 0x3a, 0xa8, 0xad, 0xa3, 0x35, 0x61, 0x8e, 0xb5, 0x5d, 0x3e, 0xa3,
+	0x06, 0x38, 0xe8, 0x3c, 0xd4, 0x3a, 0xb6, 0xe5, 0xeb, 0xa6, 0x85, 0x5d, 0xcd, 0xb1, 0x5d, 0x9f,
+	0xaa, 0x66, 0x4c, 0xad, 0x06, 0x50, 0xc2, 0x1d, 0x2d, 0x42, 0xf9, 0xd0, 0xf6, 0x7c, 0x86, 0x51,
+	0xa0, 0x18, 0x25, 0x02, 0xa0, 0x93, 0xf3, 0x30, 0x4e, 0x27, 0x4d, 0x87, 0x2b, 0xa1, 0x48, 0x86,
+	0xdb, 0x8e, 0xf2, 0x79, 0x0e, 0xc6, 0x1e, 0xd9, 0x03, 0xcb, 0x8f, 0x2d, 0xa3, 0xfb, 0x87, 0xdc,
+	0x40, 0xd2, 0x32, 0xba, 0x7f, 0x18, 0x2e, 0x43, 0x30, 0x98, 0x8d, 0xd8, 0x32, 0x64, 0xb2, 0x09,
+	0x25, 0x17, 0xeb, 0x86, 0x6d, 0xf5, 0x8e, 0xa9, 0x08, 0x25, 0x35, 0x18, 0x13, 0xe3, 0x79, 0xb8,
+	0x67, 0x5a, 0x83, 0xe7, 0x9a, 0x8b, 0x7b, 0xfa, 0x3e, 0xee, 0x51, 0x51, 0x4a, 0x6a, 0x8d, 0x83,
+	0x55, 0x06, 0x55, 0x9e, 0xc2, 0x24, 0xb1, 0xb6, 0xe7, 0xe8, 0x1d, 0xfc, 0x98, 0xea, 0x90, 0xf8,
+	0x06, 0x5d, 0xd4, 0xc2, 0xfe, 0x67, 0xb6, 0xfb, 0x8c, 0x4a, 0x56, 0x52, 0x2b, 0x04, 0xb6, 0xc3,
+	0x40, 0x68, 0x01, 0x4a, 0x4c, 0x2e, 0xd3, 0xa0, 0x62, 0x95, 0x54, 0xba, 0xe3, 0x5d, 0xd3, 0x08,
+	0xa6, 0x4c, 0xa7, 0xc3, 0xa5, 0x1a, 0x67, 0xbb, 0xef, 0x28, 0x0a, 0xc0, 0xb6, 0xe5, 0xbf, 0x7b,
+	0xed, 0x23, 0xbd, 0x37, 0xc0, 0x68, 0x06, 0xc6, 0x8e, 0xc8, 0x07, 0xe5, 0x5f, 0x50, 0xd9, 0x40,
+	0xf9, 0x7b, 0x1e, 0x16, 0x1f, 0x12, 0x01, 0xdb, 0xba, 0x65, 0xec, 0xdb, 0xcf, 0xdb, 0xb8, 0x33,
+	0x70, 0x4d, 0xff, 0x78, 0xc3, 0xb6, 0x7c, 0xfc, 0xdc, 0x47, 0xf7, 0x60, 0xca, 0x12, 0xf2, 0x6a,
+	0xc2, 0x07, 0x08, 0x87, 0xca, 0xfa, 0x42, 0x68, 0xd8, 0xd8, 0x96, 0xd4, 0xba, 0x15, 0x05, 0x78,
+	0xe8, 0x4e, 0xa8, 0x20, 0xc1, 0x25, 0x4f, 0xb9, 0xcc, 0x87, 0x5c, 0xda, 0x5b, 0x54, 0x12, 0xce,
+	0x43, 0x68, 0x4e, 0x70, 0xb8, 0x06, 0xe4, 0xb8, 0x68, 0xba, 0xa7, 0x0d, 0x3c, 0xec, 0xd2, 0xbd,
+	0x56, 0xd6, 0x67, 0x42, 0xea, 0x70, 0xab, 0x6a, 0xd9, 0x1d, 0x58, 0x2d, 0x6f, 0xcf, 0xc3, 0x2e,
+	0x3d, 0x55, 0xdc, 0x48, 0x9a, 0x6b, 0xdb, 0xfe, 0x81, 0x27, 0x0c, 0x23, 0xc0, 0x2a, 0x85, 0xa2,
+	0xcb, 0x30, 0xed, 0x0d, 0x1c, 0xa7, 0x87, 0xfb, 0xd8, 0xf2, 0xf5, 0x9e, 0xd6, 0x75, 0xed, 0x81,
+	0xe3, 0x35, 0xc6, 0x96, 0x0b, 0x17, 0x0b, 0x2a, 0x92, 0xa7, 0xee, 0xd3, 0x19, 0xb4, 0x04, 0xe0,
+	0xb8, 0xe6, 0x91, 0xd9, 0xc3, 0x5d, 0x6c, 0x34, 0x8a, 0x94, 0xa9, 0x04, 0x51, 0x7e, 0x91, 0x83,
+	0x59, 0xba, 0x9f, 0x5d, 0xdb, 0xe0, 0xca, 0xe5, 0x67, 0xf0, 0x0d, 0xa8, 0x76, 0x28, 0x7b, 0xcd,
+	0xd1, 0x5d, 0x6c, 0xf9, 0xdc, 0x17, 0x27, 0x18, 0x70, 0x97, 0xc2, 0xd0, 0x2e, 0xd4, 0x3d, 0x6e,
+	0x0b, 0xad, 0xc3, 0x8c, 0xc1, 0x35, 0x76, 0x3e, 0xdc, 0xf3, 0x10, 0xcb, 0xa9, 0x93, 0x5e, 0x14,
+	0xa0, 0xb8, 0x80, 0x42, 0x51, 0x1e, 0x61, 0x5f, 0x37, 0x74, 0x5f, 0x47, 0x08, 0x46, 0x69, 0x44,
+	0x62, 0x32, 0xd0, 0x6f, 0x54, 0x87, 0xc2, 0x80, 0x7b, 0x5a, 0x59, 0x25, 0x9f, 0xe8, 0x0c, 0x94,
+	0x03, 0x93, 0xf2, 0xb0, 0x14, 0x02, 0x48, 0x78, 0xd0, 0x7d, 0x1f, 0xf7, 0x1d, 0x9f, 0x2a, 0xb7,
+	0xaa, 0x8a, 0xa1, 0xf2, 0xa7, 0x51, 0xa8, 0x27, 0xf6, 0x7f, 0x03, 0x4a, 0x7d, 0xbe, 0x3c, 0x77,
+	0xa5, 0x33, 0x52, 0x8c, 0x48, 0x88, 0xa8, 0x06, 0xd8, 0xe4, 0x08, 0x12, 0xe7, 0x96, 0x42, 0x68,
+	0x30, 0x26, 0x5a, 0xed, 0xd9, 0x5d, 0xcd, 0x30, 0x5d, 0xdc, 0xf1, 0x6d, 0xf7, 0x98, 0x8b, 0x39,
+	0xd1, 0xb3, 0xbb, 0x9b, 0x02, 0x86, 0xd6, 0x01, 0x0c, 0xcb, 0x23, 0x0a, 0x3d, 0x30, 0xbb, 0x54,
+	0xd8, 0xca, 0xfa, 0x74, 0xb8, 0x78, 0x10, 0x27, 0xd5, 0xb2, 0x61, 0x79, 0x5c, 0xdc, 0x9b, 0x50,
+	0x25, 0x61, 0x47, 0xeb, 0xb3, 0x10, 0xc7, 0x7c, 0xa2, 0xb2, 0x3e, 0x2b, 0xcb, 0x1c, 0x04, 0x40,
+	0x75, 0xc2, 0x09, 0x07, 0x1e, 0xba, 0x0d, 0x45, 0x7a, 0xee, 0xbd, 0x46, 0x91, 0x12, 0xbd, 0x95,
+	0xb6, 0x51, 0xb6, 0xce, 0xda, 0x43, 0x8a, 0xb8, 0x65, 0xf9, 0xee, 0xb1, 0xca, 0xa9, 0xd0, 0x23,
+	0xa8, 0xe8, 0x96, 0x65, 0xfb, 0x3a, 0x3b, 0x32, 0xe3, 0x94, 0xc9, 0xdb, 0x43, 0x98, 0xb4, 0x42,
+	0x6c, 0xc6, 0x49, 0xa6, 0x47, 0xdf, 0x81, 0x31, 0x7a, 0xa6, 0x1a, 0x25, 0xba, 0xf3, 0x73, 0x31,
+	0x4f, 0x8a, 0x73, 0x53, 0x19, 0x76, 0xf3, 0xbb, 0x50, 0x91, 0x84, 0x23, 0xee, 0xf1, 0x0c, 0x1f,
+	0x73, 0x8f, 0x21, 0x9f, 0x61, 0x6c, 0x61, 0x46, 0x61, 0x83, 0x9b, 0xf9, 0x1b, 0xb9, 0xe6, 0x6d,
+	0xa8, 0xc7, 0x45, 0x3a, 0x0d, 0xbd, 0xf2, 0x21, 0xcc, 0xa8, 0x03, 0x2b, 0x14, 0x4c, 0x5c, 0xcc,
+	0xeb, 0x50, 0xe4, 0x46, 0x64, 0x1e, 0xd4, 0xcc, 0xd6, 0x89, 0xca, 0x31, 0x95, 0x5b, 0x30, 0x1b,
+	0xe3, 0xc5, 0xef, 0xed, 0x37, 0xa1, 0xe6, 0xd8, 0x86, 0xe6, 0x31, 0xb0, 0x66, 0x1a, 0xe2, 0x44,
+	0x3a, 0x01, 0xee, 0xb6, 0x41, 0xc8, 0xdb, 0xbe, 0xed, 0x24, 0x65, 0x39, 0x19, 0x79, 0x03, 0xe6,
+	0xe2, 0xe4, 0x6c, 0x79, 0xe5, 0x03, 0x98, 0x57, 0x71, 0xdf, 0x3e, 0xc2, 0xaf, 0xca, 0xba, 0x09,
+	0x8d, 0x24, 0x83, 0x90, 0x79, 0x08, 0x6d, 0xfb, 0xba, 0x3f, 0xf0, 0x4e, 0xc7, 0xfc, 0x92, 0xcc,
+	0x80, 0x5f, 0x48, 0x8c, 0x0f, 0xaa, 0x41, 0xde, 0x74, 0x38, 0x51, 0xde, 0x74, 0x94, 0x3b, 0x50,
+	0x0e, 0x6e, 0x02, 0x74, 0x35, 0xcc, 0x19, 0xf2, 0x2f, 0xbb, 0x2f, 0x82, 0x74, 0xe2, 0x61, 0x22,
+	0x66, 0xf2, 0xa5, 0xae, 0x02, 0x04, 0xf1, 0x46, 0x5c, 0x40, 0xd3, 0x29, 0x0c, 0x55, 0x09, 0x4d,
+	0xf9, 0x22, 0x12, 0x7d, 0x24, 0xa1, 0x8d, 0x40, 0x68, 0x23, 0x12, 0x8d, 0xf2, 0xa7, 0x8a, 0x46,
+	0x97, 0x61, 0xcc, 0xf3, 0x75, 0x9f, 0x05, 0xc4, 0x9a, 0xbc, 0xbf, 0xe8, 0xa2, 0x58, 0x65, 0x78,
+	0xe8, 0x2c, 0x40, 0xc7, 0xc5, 0xba, 0x8f, 0x0d, 0x4d, 0x67, 0xa1, 0xb2, 0xa0, 0x96, 0x39, 0xa4,
+	0xe5, 0xa3, 0xf7, 0x60, 0x5c, 0xe4, 0x00, 0x63, 0x54, 0x90, 0x95, 0x34, 0x8e, 0x11, 0x13, 0xa8,
+	0x82, 0x22, 0x3c, 0xda, 0xc5, 0x97, 0x1c, 0x6d, 0x4e, 0xc8, 0xb0, 0xa5, 0x00, 0x35, 0x9e, 0x1d,
+	0xa0, 0x18, 0xc9, 0x49, 0x02, 0x54, 0x29, 0x3b, 0x40, 0x71, 0x26, 0x43, 0x03, 0xd4, 0xb7, 0x19,
+	0x69, 0x76, 0xa0, 0x91, 0x3c, 0x28, 0x3c, 0x40, 0xac, 0x43, 0xd1, 0xa3, 0x90, 0x61, 0xd1, 0x86,
+	0xd3, 0x70, 0x4c, 0xe5, 0x3e, 0xcc, 0xc4, 0xdc, 0x80, 0xe5, 0x61, 0x81, 0xd7, 0xe4, 0x4e, 0xe6,
+	0x35, 0xca, 0x7f, 0x72, 0xb2, 0x17, 0xdf, 0x33, 0x7b, 0x3e, 0x76, 0x13, 0x5e, 0x7c, 0x4d, 0x70,
+	0x65, 0x2e, 0xbc, 0x94, 0xc9, 0x95, 0x65, 0x48, 0xdc, 0x21, 0x9f, 0x40, 0x8d, 0xda, 0x51, 0xf3,
+	0x70, 0x8f, 0xde, 0x90, 0x34, 0xbd, 0xaf, 0xac, 0xbf, 0x93, 0x46, 0xce, 0x56, 0x66, 0x5e, 0xd0,
+	0xe6, 0xf8, 0xcc, 0x84, 0xd5, 0x9e, 0x0c, 0x6b, 0xde, 0x01, 0x94, 0x44, 0x3a, 0x95, 0x2d, 0x1e,
+	0x90, 0x30, 0x40, 0xb2, 0xfb, 0x94, 0xb0, 0x7f, 0x40, 0xc5, 0x18, 0x66, 0x08, 0x26, 0xa8, 0xca,
+	0x31, 0x95, 0xdf, 0x14, 0x00, 0xc2, 0xc9, 0xd7, 0xf8, 0xfc, 0xdf, 0x08, 0xce, 0x22, 0xcb, 0x30,
+	0x96, 0xd3, 0x18, 0xa6, 0x9e, 0xc2, 0xfb, 0xd1, 0x53, 0xc8, 0x72, 0x8d, 0xf3, 0xa9, 0xe4, 0xaf,
+	0xed, 0xf9, 0xdb, 0x84, 0xb9, 0xb8, 0xcd, 0xf9, 0xe9, 0x5b, 0x85, 0x31, 0xd3, 0xc7, 0x7d, 0x56,
+	0xb1, 0x46, 0x72, 0x7e, 0x09, 0x99, 0xa1, 0x28, 0x2b, 0x50, 0xde, 0xee, 0xeb, 0x5d, 0xdc, 0x76,
+	0x70, 0x87, 0x2c, 0x66, 0x92, 0x01, 0x17, 0x80, 0x0d, 0x94, 0x75, 0x28, 0x3d, 0xc0, 0xc7, 0xec,
+	0x30, 0x9e, 0x50, 0x40, 0xe5, 0xcf, 0x39, 0x98, 0xa7, 0x71, 0x74, 0x43, 0xd4, 0x8b, 0x2a, 0xf6,
+	0xec, 0x81, 0xdb, 0xc1, 0x1e, 0xb5, 0xaa, 0x33, 0xd0, 0x1c, 0xec, 0x9a, 0xb6, 0xc1, 0xab, 0xab,
+	0x72, 0xc7, 0x19, 0xec, 0x52, 0x00, 0xa9, 0x29, 0xc9, 0xf4, 0xa7, 0x03, 0x9b, 0x3b, 0x58, 0x41,
+	0x2d, 0x75, 0x9c, 0xc1, 0xf7, 0xc8, 0x58, 0xd0, 0x7a, 0x87, 0xba, 0x8b, 0x3d, 0xea, 0x47, 0x8c,
+	0xb6, 0x4d, 0x01, 0xe8, 0x0a, 0xcc, 0xf6, 0x71, 0xdf, 0x76, 0x8f, 0xb5, 0x9e, 0xd9, 0x37, 0x7d,
+	0xcd, 0xb4, 0xb4, 0xfd, 0x63, 0x1f, 0x7b, 0xdc, 0x77, 0x10, 0x9b, 0x7c, 0x48, 0xe6, 0xb6, 0xad,
+	0xbb, 0x64, 0x06, 0x29, 0x50, 0xb5, 0xed, 0xbe, 0xe6, 0x75, 0x6c, 0x17, 0x6b, 0xba, 0xf1, 0x94,
+	0x5e, 0x25, 0x05, 0xb5, 0x62, 0xdb, 0xfd, 0x36, 0x81, 0xb5, 0x8c, 0xa7, 0x8a, 0x0e, 0xd5, 0x48,
+	0xad, 0x45, 0x8a, 0x00, 0x5a, 0x54, 0xf1, 0x22, 0x80, 0x7c, 0x13, 0x98, 0x6b, 0xf7, 0x84, 0x1e,
+	0xe8, 0x37, 0x81, 0xf9, 0xc7, 0x8e, 0xa8, 0x00, 0xe8, 0x37, 0x51, 0x58, 0x0f, 0x1f, 0xf1, 0x82,
+	0xb7, 0xac, 0xb2, 0x81, 0x62, 0x00, 0x6c, 0xe8, 0x8e, 0xbe, 0x6f, 0xf6, 0x4c, 0xff, 0x18, 0x5d,
+	0x82, 0xba, 0x6e, 0x18, 0x5a, 0x47, 0x40, 0x4c, 0x2c, 0xda, 0x0f, 0x93, 0xba, 0x61, 0x6c, 0x48,
+	0x60, 0xf4, 0x36, 0x4c, 0x19, 0xae, 0xed, 0x44, 0x71, 0x59, 0x3f, 0xa2, 0x4e, 0x26, 0x64, 0x64,
+	0xe5, 0xdf, 0x05, 0x38, 0x1b, 0x35, 0x4b, 0xbc, 0x7e, 0xbd, 0x01, 0x13, 0xb1, 0x55, 0x63, 0x65,
+	0x63, 0x28, 0xa5, 0x1a, 0xc1, 0x8c, 0xd5, 0x77, 0xf9, 0x78, 0x7d, 0x97, 0x5e, 0x19, 0x17, 0xbe,
+	0x91, 0xca, 0x78, 0xf4, 0x6b, 0x55, 0xc6, 0x63, 0x27, 0xab, 0x8c, 0xdf, 0xa2, 0xfd, 0x26, 0x41,
+	0x45, 0x4b, 0xaa, 0x22, 0xeb, 0x89, 0x04, 0x38, 0x96, 0xe8, 0x4b, 0xc5, 0x2a, 0xe8, 0xf1, 0xd3,
+	0x54, 0xd0, 0xa5, 0xcc, 0x0a, 0x9a, 0x78, 0x85, 0xe3, 0xe8, 0x6e, 0xdf, 0x76, 0x35, 0xc7, 0xb5,
+	0x0f, 0xcc, 0x1e, 0x6e, 0x94, 0xa9, 0x08, 0x93, 0x02, 0xbe, 0xcb, 0xc0, 0xca, 0xef, 0x72, 0x30,
+	0x13, 0x35, 0x34, 0x2f, 0xce, 0x3e, 0x80, 0xb2, 0x2b, 0x4e, 0x22, 0x37, 0xee, 0x4a, 0x2c, 0xf5,
+	0x49, 0x1e, 0x59, 0x35, 0xa4, 0x41, 0x6a, 0x66, 0x9d, 0x7d, 0x21, 0x8b, 0xcf, 0x4b, 0x2b, 0xed,
+	0x16, 0x4c, 0x05, 0xc8, 0x43, 0x0b, 0x6d, 0xa9, 0x70, 0xce, 0x47, 0x0b, 0x67, 0x0b, 0x8a, 0x9b,
+	0xf8, 0xc8, 0xec, 0xe0, 0x6f, 0xa4, 0x75, 0xb5, 0x0c, 0x15, 0x07, 0xbb, 0x7d, 0xd3, 0xf3, 0x02,
+	0x2f, 0x2d, 0xab, 0x32, 0x48, 0xf9, 0x6a, 0x0c, 0x26, 0xe3, 0xba, 0xbd, 0x9e, 0xa8, 0xd3, 0x17,
+	0xa5, 0x73, 0x13, 0xdf, 0xa0, 0x74, 0x31, 0x5e, 0x12, 0x71, 0x37, 0x1f, 0xcf, 0xd3, 0x83, 0xd8,
+	0xcc, 0x83, 0x31, 0xd1, 0x40, 0xc7, 0xee, 0xf7, 0x75, 0xcb, 0x10, 0x9d, 0x45, 0x3e, 0x24, 0xfa,
+	0xd2, 0xdd, 0x2e, 0x39, 0x0c, 0x04, 0x4c, 0xbf, 0xd1, 0x39, 0xa8, 0x90, 0x64, 0xd7, 0xb4, 0x68,
+	0x9d, 0x4f, 0x3d, 0xbd, 0xac, 0x02, 0x07, 0x6d, 0x9a, 0xc4, 0xa9, 0x47, 0xb1, 0x75, 0x24, 0x6e,
+	0x40, 0xa9, 0xf5, 0x28, 0x22, 0xbe, 0x4a, 0xe7, 0xd1, 0x05, 0x28, 0xf6, 0xed, 0x81, 0xe5, 0x8b,
+	0xb4, 0x77, 0x32, 0xc4, 0xa4, 0x0d, 0x43, 0x95, 0x4f, 0xa3, 0x55, 0x18, 0x37, 0xa8, 0x1d, 0x44,
+	0x6e, 0x5b, 0x97, 0xba, 0x05, 0x74, 0x42, 0x15, 0x08, 0xe8, 0x56, 0x70, 0x7f, 0x97, 0xe3, 0x17,
+	0x70, 0x4c, 0xb5, 0xa9, 0x97, 0xf8, 0xc3, 0xe8, 0x25, 0x0e, 0x94, 0xc7, 0x6a, 0x36, 0x8f, 0xe1,
+	0xa5, 0xfe, 0x02, 0x94, 0x7a, 0x76, 0x97, 0xb9, 0x43, 0x85, 0x35, 0xa3, 0x7b, 0x76, 0x97, 0x7a,
+	0xc3, 0x0c, 0xc9, 0x5b, 0x0c, 0xd3, 0x6a, 0x4c, 0xd0, 0x73, 0xcc, 0x06, 0xe4, 0x2a, 0xa2, 0x1f,
+	0x9a, 0x6d, 0x75, 0x70, 0xa3, 0x4a, 0xa7, 0xca, 0x14, 0xf2, 0xd8, 0xea, 0xd0, 0x9b, 0xd2, 0xf7,
+	0x8f, 0x1b, 0x35, 0x0a, 0x27, 0x9f, 0x24, 0xe5, 0x64, 0x15, 0xc7, 0x64, 0x3c, 0xe5, 0x4c, 0x3b,
+	0xa9, 0xaf, 0x41, 0x2f, 0xe1, 0x8f, 0x39, 0x98, 0xdb, 0xa0, 0xd9, 0x96, 0x14, 0x12, 0x4e, 0x51,
+	0x0a, 0xa3, 0x2b, 0x41, 0xd3, 0x21, 0x51, 0xd1, 0xc6, 0x77, 0xcb, 0x11, 0x51, 0x0b, 0x6a, 0x82,
+	0x29, 0x27, 0x2d, 0xbc, 0xb4, 0x5f, 0x51, 0xf5, 0xe4, 0xa1, 0xf2, 0x3e, 0xcc, 0x27, 0xa4, 0xe6,
+	0x99, 0xd1, 0x0a, 0x4c, 0x84, 0xb1, 0x21, 0x10, 0xba, 0x12, 0xc0, 0xb6, 0x0d, 0xe5, 0x26, 0xcc,
+	0xb6, 0x7d, 0xdd, 0xf5, 0x13, 0x5b, 0x3e, 0x01, 0x2d, 0x6d, 0x59, 0x44, 0x69, 0x79, 0x57, 0xa1,
+	0x0d, 0x33, 0x6d, 0xdf, 0x76, 0x5e, 0x81, 0x29, 0x39, 0xf1, 0xbe, 0xd9, 0xc7, 0xf6, 0xc0, 0xe7,
+	0xd9, 0x90, 0x18, 0x2a, 0xf3, 0xac, 0xc1, 0x92, 0x5c, 0xed, 0x3d, 0x98, 0x63, 0xfd, 0x8d, 0x57,
+	0xd9, 0xc4, 0x82, 0xe8, 0xae, 0x24, 0xf9, 0x6e, 0xc1, 0x74, 0x18, 0xd4, 0xc3, 0x0a, 0x6d, 0x2d,
+	0x5a, 0xa1, 0x35, 0x52, 0xac, 0x1c, 0x29, 0xd0, 0x7e, 0x99, 0x97, 0x62, 0x67, 0x46, 0x7d, 0x76,
+	0x35, 0x5a, 0x9f, 0x9d, 0xcd, 0xe2, 0x19, 0x29, 0xcf, 0x92, 0x5e, 0x59, 0x48, 0xf1, 0xca, 0x76,
+	0xa2, 0x88, 0x1b, 0xa5, 0xa1, 0xe3, 0xff, 0x52, 0xd6, 0xf8, 0x1f, 0xd6, 0x70, 0x1f, 0xb2, 0x1a,
+	0x2e, 0x58, 0x3a, 0x68, 0x3b, 0x5d, 0x89, 0xd5, 0x70, 0x0b, 0x99, 0x72, 0x06, 0x25, 0xdc, 0xcf,
+	0x47, 0xa1, 0x1c, 0xcc, 0x25, 0x74, 0x9b, 0x54, 0x53, 0x3e, 0x45, 0x4d, 0xf2, 0x6d, 0x56, 0x78,
+	0xa5, 0xdb, 0x6c, 0xf4, 0xa5, 0xb7, 0xd9, 0x22, 0x94, 0xe9, 0x87, 0xe6, 0xe2, 0x03, 0x7e, 0x3b,
+	0x95, 0x28, 0x40, 0xc5, 0x07, 0xa1, 0x5b, 0x15, 0x4f, 0xe4, 0x56, 0xb1, 0x6a, 0x71, 0x3c, 0x5e,
+	0x2d, 0x5e, 0x0f, 0x6e, 0x1b, 0x76, 0x31, 0x9d, 0x4b, 0xe1, 0x97, 0x7a, 0xcf, 0xdc, 0x8b, 0xde,
+	0x33, 0xec, 0xae, 0x7a, 0x33, 0x8d, 0xfa, 0xb5, 0xad, 0x15, 0x1f, 0xb1, 0x5a, 0x51, 0xf6, 0x2d,
+	0x1e, 0x11, 0xaf, 0x02, 0x04, 0x87, 0x5f, 0x14, 0x8c, 0xd3, 0x29, 0x7b, 0x53, 0x25, 0x34, 0x12,
+	0x5f, 0x22, 0x26, 0x08, 0x5b, 0xa4, 0x27, 0x88, 0x2f, 0x7f, 0x90, 0x33, 0xa7, 0x8c, 0x1e, 0xe3,
+	0xf5, 0x44, 0x8f, 0xe1, 0x84, 0xbe, 0xb7, 0x16, 0x6d, 0x31, 0x9c, 0xd2, 0x67, 0x12, 0x1d, 0x06,
+	0x7a, 0xc7, 0xeb, 0x2e, 0x9f, 0x66, 0x95, 0x61, 0x99, 0x43, 0x5a, 0x3e, 0x49, 0xaf, 0x0e, 0x4c,
+	0xcb, 0xf4, 0x0e, 0xd9, 0x7c, 0x91, 0xce, 0x83, 0x00, 0xb5, 0xe8, 0xcf, 0xb0, 0xf8, 0xb9, 0xe9,
+	0x6b, 0x1d, 0xdb, 0xc0, 0xd4, 0x23, 0xc7, 0xd4, 0x12, 0x01, 0x6c, 0xd8, 0x06, 0x0e, 0xcf, 0x49,
+	0xe9, 0x74, 0xe7, 0xa4, 0x1c, 0x3b, 0x27, 0x73, 0x50, 0x74, 0xb1, 0xee, 0xd9, 0x56, 0x03, 0xd8,
+	0xaf, 0xb9, 0x6c, 0x44, 0x2e, 0x8e, 0x3e, 0xf6, 0x3c, 0xb2, 0x02, 0x4f, 0x68, 0xf8, 0x50, 0x4a,
+	0xbc, 0x26, 0x32, 0x13, 0xaf, 0x21, 0x3d, 0xcc, 0x58, 0xe2, 0x55, 0xcd, 0x4c, 0xbc, 0x4e, 0xd2,
+	0xc2, 0x94, 0x52, 0xcb, 0xda, 0xd0, 0xd4, 0xf2, 0xdb, 0x3c, 0x3f, 0x0f, 0x61, 0x3e, 0xe1, 0xf0,
+	0xfc, 0x00, 0x5d, 0x89, 0xb5, 0x3a, 0x17, 0x32, 0xf5, 0x10, 0x74, 0x3a, 0x7f, 0x0c, 0x93, 0x5b,
+	0xcf, 0x71, 0xa7, 0x7d, 0x6c, 0x75, 0x4e, 0x91, 0x07, 0xd4, 0xa1, 0xd0, 0xe9, 0x1b, 0xbc, 0xb4,
+	0x27, 0x9f, 0x72, 0x66, 0x50, 0x88, 0x66, 0x06, 0x1a, 0xd4, 0xc3, 0x15, 0xb8, 0xa0, 0x73, 0x44,
+	0x50, 0x83, 0x20, 0x13, 0xe6, 0x13, 0x2a, 0x1f, 0x71, 0x38, 0x76, 0x5d, 0xba, 0x6d, 0x06, 0xc7,
+	0xae, 0x1b, 0xf5, 0xdd, 0x42, 0xd4, 0x77, 0x95, 0xa7, 0x50, 0x21, 0x0b, 0x7c, 0x2d, 0xf1, 0x79,
+	0x86, 0x5c, 0x08, 0x33, 0xe4, 0x20, 0xd1, 0x1e, 0x95, 0x12, 0x6d, 0x65, 0x19, 0x26, 0xd8, 0x5a,
+	0x7c, 0x23, 0x75, 0x28, 0x0c, 0xdc, 0x9e, 0x30, 0xdc, 0xc0, 0xed, 0x29, 0x3f, 0x84, 0x6a, 0xcb,
+	0xf7, 0xf5, 0xce, 0xe1, 0x29, 0xe4, 0x09, 0xd6, 0xca, 0xcb, 0x49, 0x7d, 0x42, 0x26, 0x45, 0x81,
+	0x9a, 0xe0, 0x9d, 0xb9, 0xfe, 0x0e, 0xa0, 0x5d, 0xdb, 0xf5, 0xef, 0xd9, 0xee, 0x67, 0xba, 0x6b,
+	0x9c, 0x2e, 0x47, 0x46, 0x30, 0xca, 0x9f, 0x71, 0x14, 0x2e, 0x8e, 0xa9, 0xf4, 0x5b, 0xb9, 0x00,
+	0xd3, 0x11, 0x7e, 0x99, 0x0b, 0xdf, 0x80, 0x0a, 0x8d, 0x15, 0x3c, 0x89, 0xba, 0x24, 0xf7, 0xef,
+	0x86, 0x46, 0x14, 0xe5, 0x2e, 0x4c, 0x91, 0x1b, 0x81, 0xc2, 0x83, 0xe8, 0xfd, 0x4e, 0x2c, 0xd3,
+	0x98, 0x8d, 0x31, 0x88, 0x65, 0x19, 0xbf, 0xcf, 0xc1, 0x18, 0x85, 0x27, 0xe2, 0xf7, 0x22, 0x94,
+	0x5d, 0xec, 0xd8, 0x9a, 0xaf, 0x77, 0x83, 0xc7, 0x31, 0x04, 0xf0, 0x44, 0xef, 0x7a, 0xf4, 0x6d,
+	0x0f, 0x99, 0x34, 0xcc, 0x2e, 0xf6, 0x7c, 0xf1, 0x42, 0xa6, 0x42, 0x60, 0x9b, 0x0c, 0x44, 0x94,
+	0xe2, 0x99, 0x3f, 0x61, 0x19, 0xc4, 0xa8, 0x4a, 0xbf, 0xd1, 0x5b, 0xec, 0x47, 0xf6, 0x61, 0xdd,
+	0x1a, 0xfa, 0xd3, 0x7b, 0x13, 0x4a, 0xb1, 0x06, 0x4d, 0x30, 0x56, 0x6e, 0x01, 0x92, 0x77, 0xcd,
+	0xf5, 0x7a, 0x01, 0x8a, 0x54, 0x29, 0xe2, 0xfe, 0x9b, 0x8c, 0x6d, 0x5b, 0xe5, 0xd3, 0xca, 0x07,
+	0x80, 0x98, 0x22, 0x23, 0x77, 0xde, 0x29, 0xb4, 0xfe, 0x3e, 0x4c, 0x47, 0x18, 0x70, 0x01, 0xce,
+	0x47, 0x39, 0x24, 0xd6, 0xe7, 0xd4, 0x7f, 0xc9, 0x01, 0xb4, 0x06, 0xfe, 0x21, 0x6f, 0x37, 0xc8,
+	0x1b, 0xcd, 0x45, 0x37, 0x4a, 0xe6, 0x1c, 0xdd, 0xf3, 0x3e, 0xb3, 0x5d, 0x91, 0xdc, 0x05, 0x63,
+	0xda, 0x28, 0x18, 0xf8, 0x87, 0xa2, 0x29, 0x49, 0xbe, 0xd1, 0x79, 0xa8, 0xb1, 0x77, 0x4d, 0x9a,
+	0x6e, 0x18, 0x2e, 0xf6, 0x3c, 0xde, 0x9d, 0xac, 0x32, 0x68, 0x8b, 0x01, 0x09, 0x9a, 0x69, 0x60,
+	0xcb, 0x37, 0xfd, 0x63, 0xcd, 0xb7, 0x9f, 0x61, 0x8b, 0x27, 0x6d, 0x55, 0x01, 0x7d, 0x42, 0x80,
+	0x04, 0xcd, 0xc5, 0x5d, 0xd3, 0xf3, 0x5d, 0x81, 0x26, 0x3a, 0x65, 0x1c, 0x4a, 0xd1, 0x94, 0x2f,
+	0x72, 0x50, 0xdf, 0x1d, 0xf4, 0x7a, 0x6c, 0x93, 0xa7, 0xd6, 0x26, 0xba, 0xc8, 0x37, 0x92, 0x8f,
+	0xbb, 0x44, 0xa8, 0x24, 0xbe, 0xbd, 0x6f, 0xa0, 0xaa, 0xfc, 0x7f, 0x98, 0x92, 0x64, 0xe5, 0x86,
+	0x8b, 0xdc, 0xcb, 0xb9, 0xe8, 0xbd, 0x4c, 0xbc, 0x85, 0x15, 0x52, 0xaf, 0xb8, 0x3f, 0x65, 0x16,
+	0xa6, 0x23, 0x0c, 0x78, 0x15, 0xb6, 0x0a, 0x55, 0xfe, 0x9b, 0x26, 0x77, 0x84, 0x05, 0x28, 0x91,
+	0x40, 0xd3, 0x31, 0x0d, 0xd1, 0x91, 0x1e, 0x77, 0x6c, 0x63, 0xc3, 0x34, 0x5c, 0xe5, 0x31, 0x54,
+	0x55, 0xf6, 0xc0, 0x8d, 0xe3, 0xde, 0x86, 0x1a, 0xff, 0x05, 0x54, 0x8b, 0xbc, 0x07, 0x90, 0x9a,
+	0xa7, 0x11, 0xe6, 0x6a, 0xd5, 0x92, 0x87, 0xca, 0x8f, 0xa0, 0xb9, 0xe7, 0x18, 0x24, 0x83, 0x92,
+	0xd9, 0x8a, 0xcd, 0xdd, 0x06, 0xf1, 0xf8, 0x2e, 0x93, 0x7b, 0x94, 0xae, 0xea, 0xca, 0x43, 0xe5,
+	0x2c, 0x2c, 0xa6, 0x72, 0xe7, 0x3b, 0x77, 0xa0, 0x1e, 0x4e, 0x18, 0xa6, 0x68, 0xc5, 0xd3, 0x16,
+	0x7b, 0x4e, 0x6a, 0xb1, 0xcf, 0x05, 0x77, 0x32, 0x0b, 0xee, 0x7c, 0x24, 0x65, 0x4a, 0x85, 0xac,
+	0x4c, 0x69, 0x34, 0x92, 0x29, 0x29, 0x0f, 0x02, 0xfd, 0xf1, 0x4c, 0xf5, 0x26, 0xcd, 0x97, 0xd9,
+	0xda, 0x22, 0x5e, 0x34, 0xd3, 0x76, 0xc7, 0x50, 0x54, 0x09, 0x5b, 0x99, 0x84, 0x6a, 0x24, 0x72,
+	0x28, 0x2d, 0xa8, 0xc5, 0x22, 0xc1, 0xe5, 0x58, 0x36, 0x91, 0x54, 0x5c, 0x2c, 0x97, 0x98, 0xe1,
+	0x21, 0xe9, 0x9e, 0xb7, 0x6d, 0x1d, 0xd8, 0x82, 0xf1, 0x1b, 0x50, 0xd9, 0xcb, 0x7a, 0xca, 0x36,
+	0x2a, 0x7e, 0xa3, 0xf9, 0x75, 0x01, 0x8a, 0x8c, 0x8c, 0x28, 0x86, 0x35, 0xe5, 0xb8, 0x1a, 0xf9,
+	0x88, 0x5e, 0x4e, 0x61, 0x7f, 0x94, 0x7e, 0xa3, 0xf7, 0xa1, 0xd6, 0xd1, 0x1d, 0xbd, 0x43, 0x62,
+	0x00, 0xfb, 0x71, 0xa5, 0x10, 0xbf, 0x2c, 0xa4, 0xb5, 0xd5, 0xaa, 0x40, 0x66, 0x3f, 0xb7, 0xdc,
+	0x86, 0x49, 0xfd, 0x48, 0x37, 0x7b, 0xfa, 0x7e, 0x0f, 0x4b, 0xbf, 0xcd, 0x64, 0x92, 0xd7, 0x02,
+	0x6c, 0x46, 0x7f, 0x0d, 0x60, 0xe0, 0x61, 0x83, 0x93, 0x8e, 0x0d, 0x23, 0x2d, 0x13, 0xc4, 0x60,
+	0x55, 0xd3, 0xb2, 0x0d, 0xec, 0x69, 0x42, 0x1a, 0xfe, 0xb3, 0x7f, 0xd6, 0xaa, 0x0c, 0x7b, 0x83,
+	0x23, 0xa3, 0x3b, 0x50, 0xe7, 0xf4, 0x81, 0x38, 0x34, 0x9d, 0xcf, 0x64, 0xc0, 0x97, 0x6b, 0x09,
+	0x6c, 0xf4, 0x2e, 0x54, 0x38, 0x07, 0x22, 0x15, 0x4f, 0xf9, 0x33, 0x88, 0x81, 0x61, 0xee, 0x79,
+	0xd8, 0x50, 0xee, 0xf0, 0x1b, 0x43, 0xd8, 0x97, 0xfb, 0xc9, 0x25, 0x18, 0x3f, 0xf0, 0x34, 0xd3,
+	0x3a, 0xb0, 0xb9, 0xa3, 0x48, 0x6d, 0x56, 0x8e, 0x5a, 0x3c, 0xa0, 0x7f, 0x57, 0xcf, 0x40, 0x49,
+	0xbc, 0x23, 0x45, 0xe3, 0x50, 0x78, 0xb2, 0xb1, 0x5b, 0x1f, 0x21, 0x1f, 0x7b, 0x9b, 0xbb, 0xf5,
+	0xdc, 0xea, 0x4d, 0x98, 0x8c, 0xfd, 0xf8, 0x8a, 0xa6, 0xa0, 0xda, 0x6e, 0xed, 0x6c, 0xde, 0x7d,
+	0xfc, 0xb1, 0xa6, 0x6e, 0xb5, 0x36, 0x7f, 0x50, 0x1f, 0x41, 0x33, 0x50, 0x17, 0xa0, 0x9d, 0xc7,
+	0x4f, 0x18, 0x34, 0xb7, 0xfa, 0x0c, 0x6a, 0xd1, 0xaa, 0x0a, 0xcd, 0xc2, 0xd4, 0xc6, 0xe3, 0x9d,
+	0x27, 0xad, 0xed, 0x9d, 0x2d, 0x55, 0xdb, 0x50, 0xb7, 0x5a, 0x4f, 0xb6, 0x36, 0xeb, 0x23, 0x51,
+	0xb0, 0xba, 0xb7, 0xb3, 0xb3, 0xbd, 0x73, 0xbf, 0x9e, 0x23, 0x5c, 0x43, 0xf0, 0xd6, 0xc7, 0xdb,
+	0x04, 0x39, 0x1f, 0x45, 0xde, 0xdb, 0x79, 0xb0, 0xf3, 0xf8, 0xfb, 0x3b, 0xf5, 0xc2, 0xfa, 0x5f,
+	0x2b, 0x50, 0x13, 0x47, 0x00, 0xbb, 0xd4, 0x3b, 0xef, 0xc0, 0xb8, 0x78, 0xe3, 0x2b, 0x15, 0x7a,
+	0xd1, 0x17, 0xc9, 0xcd, 0x85, 0x94, 0x19, 0x1e, 0x4e, 0x46, 0x90, 0x4a, 0x8f, 0xb7, 0xf4, 0x63,
+	0xf7, 0x52, 0xe4, 0xbc, 0x25, 0x7e, 0x4f, 0x6f, 0x9e, 0xcb, 0x9c, 0x0f, 0x78, 0xee, 0x91, 0x43,
+	0x2d, 0xbf, 0x5b, 0x42, 0x12, 0x51, 0xea, 0x83, 0xa8, 0xe6, 0x72, 0x36, 0x42, 0xc0, 0xf6, 0x13,
+	0xa8, 0xc7, 0xdf, 0x2c, 0x21, 0xe9, 0x97, 0x9b, 0x8c, 0x07, 0x51, 0x4d, 0x65, 0x18, 0x8a, 0xcc,
+	0x3c, 0xf1, 0xee, 0x67, 0x65, 0xc8, 0x9b, 0x8d, 0x24, 0xf3, 0xac, 0xa7, 0x20, 0x4c, 0x21, 0xd1,
+	0x1f, 0xaa, 0x51, 0xe4, 0xb1, 0x4d, 0xca, 0xb3, 0x05, 0x59, 0x21, 0xe9, 0xbf, 0x71, 0x2b, 0x23,
+	0xe8, 0x63, 0x98, 0x8c, 0xb5, 0x79, 0x91, 0x44, 0x96, 0xde, 0xb7, 0x6e, 0xae, 0x0c, 0xc1, 0x88,
+	0x5a, 0x50, 0x6e, 0xe3, 0x46, 0x2d, 0x98, 0xd2, 0x1c, 0x8e, 0x5a, 0x30, 0xb5, 0x03, 0x4c, 0x9d,
+	0x2d, 0xd2, 0xae, 0x95, 0x9d, 0x2d, 0xad, 0x39, 0xdc, 0x3c, 0x97, 0x39, 0x2f, 0x2b, 0x21, 0xd6,
+	0xac, 0x95, 0x95, 0x90, 0xde, 0x04, 0x6e, 0xae, 0x0c, 0xc1, 0x88, 0x5b, 0x2d, 0x6c, 0x19, 0xc5,
+	0xad, 0x96, 0x68, 0x54, 0xc6, 0xad, 0x96, 0xec, 0x36, 0x71, 0xab, 0xc5, 0x9a, 0x3f, 0xcb, 0xd9,
+	0x15, 0x73, 0x8a, 0xd5, 0xd2, 0xcb, 0x70, 0x65, 0x04, 0x6d, 0x40, 0x49, 0xd4, 0xbc, 0x48, 0x3a,
+	0xf4, 0xb1, 0x4a, 0xbb, 0xd9, 0x4c, 0x9b, 0x0a, 0x98, 0x5c, 0x87, 0x51, 0x02, 0x45, 0xb3, 0x51,
+	0x2c, 0x41, 0x3c, 0x17, 0x07, 0x07, 0x84, 0xb7, 0xa0, 0xc8, 0xca, 0x44, 0x24, 0x5d, 0xd9, 0x91,
+	0xa2, 0xb4, 0xd9, 0x48, 0x4e, 0x04, 0xe4, 0x0f, 0xd9, 0x7f, 0x05, 0xf0, 0x8a, 0x0f, 0x9d, 0x89,
+	0xbe, 0x95, 0x8d, 0x16, 0x96, 0xcd, 0xb3, 0x19, 0xb3, 0x01, 0x37, 0x03, 0xa6, 0x53, 0xd2, 0x28,
+	0x24, 0xf5, 0x2c, 0xb3, 0x73, 0xb8, 0xe6, 0xf9, 0x97, 0x60, 0xc9, 0x5b, 0xe6, 0x16, 0x9c, 0x8f,
+	0x78, 0xbf, 0x64, 0xb8, 0x46, 0x72, 0x42, 0x90, 0xaf, 0xff, 0xac, 0x00, 0x13, 0x2c, 0xe5, 0xe5,
+	0xe1, 0x7c, 0x1b, 0x20, 0x2c, 0xce, 0xd0, 0x62, 0xd4, 0x99, 0x22, 0x85, 0x6a, 0xf3, 0x4c, 0xfa,
+	0xa4, 0xac, 0x4e, 0xa9, 0xce, 0x92, 0xd5, 0x99, 0xac, 0xdf, 0x64, 0x75, 0xa6, 0x14, 0x67, 0xca,
+	0x08, 0xba, 0x07, 0xe5, 0x20, 0xf5, 0x47, 0x72, 0xc9, 0x10, 0xab, 0x5d, 0x9a, 0x8b, 0xa9, 0x73,
+	0xb2, 0x54, 0x52, 0x3e, 0x2f, 0x4b, 0x95, 0xac, 0x13, 0x64, 0xa9, 0xd2, 0x8a, 0x80, 0x70, 0x8f,
+	0x3c, 0x85, 0x8b, 0xef, 0x31, 0x92, 0x10, 0x26, 0xf6, 0x18, 0x4d, 0x27, 0x94, 0x91, 0xbb, 0x67,
+	0xbe, 0xfc, 0x6a, 0x29, 0xf7, 0x8f, 0xaf, 0x96, 0x46, 0x7e, 0xfa, 0x62, 0x29, 0xf7, 0xe5, 0x8b,
+	0xa5, 0xdc, 0xdf, 0x5e, 0x2c, 0xe5, 0xfe, 0xf9, 0x62, 0x29, 0xf7, 0xf9, 0xbf, 0x96, 0x46, 0xf6,
+	0x8b, 0xf4, 0xff, 0x4f, 0xae, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x48, 0xd7, 0x88, 0x56, 0x35,
+	0x34, 0x00, 0x00,
 }

pkg/kubelet/api/v1alpha1/runtime/api.proto → pkg/kubelet/apis/cri/v1alpha1/api.proto

 // To regenerate api.pb.go run hack/update-generated-runtime.sh
 syntax = 'proto3';
 
-package runtime;
+package v1alpha1;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 

pkg/kubelet/api/v1alpha1/runtime/constants.go → pkg/kubelet/apis/cri/v1alpha1/constants.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package runtime
+package v1alpha1
 
 // This file contains all constants defined in CRI.
 

pkg/kubelet/api/v1alpha1/stats/types.go → pkg/kubelet/apis/stats/v1alpha1/types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package stats
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -58,7 +58,7 @@ type NodeStats struct {
 	Runtime *RuntimeStats `json:"runtime,omitempty"`
 }
 
-// Stats pertaining to the underlying container runtime.
+// RuntimeStats are stats pertaining to the underlying container runtime.
 type RuntimeStats struct {
 	// Stats about the underlying filesystem where container images are stored.
 	// This filesystem could be the same as the primary (root) filesystem.
@@ -68,11 +68,11 @@ type RuntimeStats struct {
 }
 
 const (
-	// Container name for the system container tracking Kubelet usage.
+	// SystemContainerKubelet is the container name for the system container tracking Kubelet usage.
 	SystemContainerKubelet = "kubelet"
-	// Container name for the system container tracking the runtime (e.g. docker or rkt) usage.
+	// SystemContainerRuntime is the container name for the system container tracking the runtime (e.g. docker or rkt) usage.
 	SystemContainerRuntime = "runtime"
-	// Container name for the system container tracking non-kubernetes processes.
+	// SystemContainerMisc is the container name for the system container tracking non-kubernetes processes.
 	SystemContainerMisc = "misc"
 )
 
@@ -228,13 +228,13 @@ type FsStats struct {
 type UserDefinedMetricType string
 
 const (
-	// Instantaneous value. May increase or decrease.
+	// MetricGauge is an instantaneous value. May increase or decrease.
 	MetricGauge UserDefinedMetricType = "gauge"
 
-	// A counter-like value that is only expected to increase.
+	// MetricCumulative is a counter-like value that is only expected to increase.
 	MetricCumulative UserDefinedMetricType = "cumulative"
 
-	// Rate over a time period.
+	// MetricDelta is a rate over a time period.
 	MetricDelta UserDefinedMetricType = "delta"
 )
 

pkg/kubelet/container/BUILD

@@ -30,7 +30,7 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/ref:go_default_library",
         "//pkg/client/unversioned/remotecommand:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/events:go_default_library",
         "//pkg/kubelet/util/format:go_default_library",
         "//pkg/kubelet/util/ioutils:go_default_library",

pkg/kubelet/container/helpers.go

@@ -32,7 +32,7 @@ import (
 	clientv1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/events"
 	"k8s.io/kubernetes/pkg/kubelet/util/format"
 	"k8s.io/kubernetes/pkg/kubelet/util/ioutils"

pkg/kubelet/container/runtime.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/volume"
 )
 

pkg/kubelet/dockershim/BUILD

@@ -33,8 +33,8 @@ go_library(
         "//pkg/api/v1/helper:go_default_library",
         "//pkg/apis/componentconfig:go_default_library",
         "//pkg/client/unversioned/remotecommand:go_default_library",
-        "//pkg/kubelet/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/dockershim/cm:go_default_library",
@@ -93,7 +93,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api/v1:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/container/testing:go_default_library",
         "//pkg/kubelet/dockershim/errors:go_default_library",

pkg/kubelet/dockershim/convert.go

@@ -23,7 +23,7 @@ import (
 
 	dockertypes "github.com/docker/engine-api/types"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 )
 

pkg/kubelet/dockershim/convert_test.go

@@ -22,7 +22,7 @@ import (
 	dockertypes "github.com/docker/engine-api/types"
 	"github.com/stretchr/testify/assert"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 func TestConvertDockerStatusToRuntimeAPIState(t *testing.T) {

pkg/kubelet/dockershim/doc.go

@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Docker integration using pkg/kubelet/api/v1alpha1/runtime/v1.pb.go.
+// Docker integration using pkg/kubelet/apis/cri/v1alpha1/api.pb.go
 package dockershim

pkg/kubelet/dockershim/docker_container.go

@@ -28,7 +28,7 @@ import (
 	dockerstrslice "github.com/docker/engine-api/types/strslice"
 	"github.com/golang/glog"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 )
 

pkg/kubelet/dockershim/docker_container_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 )
 

pkg/kubelet/dockershim/docker_image.go

@@ -23,7 +23,7 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 	dockertypes "github.com/docker/engine-api/types"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 )
 

pkg/kubelet/dockershim/docker_image_test.go

@@ -24,7 +24,7 @@ import (
 	dockertypes "github.com/docker/engine-api/types"
 	"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/dockershim/libdocker"
 )
 

pkg/kubelet/dockershim/docker_legacy.go

@@ -28,7 +28,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 	"k8s.io/kubernetes/pkg/kubelet/leaky"

pkg/kubelet/dockershim/docker_sandbox.go

@@ -27,7 +27,7 @@ import (
 	"github.com/golang/glog"
 
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/errors"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"

pkg/kubelet/dockershim/docker_sandbox_test.go

@@ -25,7 +25,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"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 	"k8s.io/kubernetes/pkg/kubelet/network"

pkg/kubelet/dockershim/docker_service.go

@@ -30,8 +30,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecm "k8s.io/kubernetes/pkg/kubelet/cm"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/cm"

pkg/kubelet/dockershim/docker_service_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"k8s.io/client-go/util/clock"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 	"k8s.io/kubernetes/pkg/kubelet/network"

pkg/kubelet/dockershim/docker_streaming.go

@@ -28,7 +28,7 @@ import (
 	dockertypes "github.com/docker/engine-api/types"
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/server/streaming"
 	"k8s.io/kubernetes/pkg/kubelet/util/ioutils"

pkg/kubelet/dockershim/helpers.go

@@ -35,7 +35,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api/v1"
 	v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/types"
 	"k8s.io/kubernetes/pkg/security/apparmor"
 

pkg/kubelet/dockershim/helpers_test.go

@@ -28,7 +28,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/security/apparmor"
 
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"

pkg/kubelet/dockershim/naming.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/leaky"
 )
 

pkg/kubelet/dockershim/naming_test.go

@@ -21,7 +21,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"
 )
 
 func TestSandboxNameRoundTrip(t *testing.T) {

pkg/kubelet/dockershim/remote/BUILD

@@ -15,8 +15,8 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/kubelet/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/dockershim:go_default_library",
         "//pkg/util/exec:go_default_library",
         "//pkg/util/interrupt:go_default_library",

pkg/kubelet/dockershim/remote/docker_server.go

@@ -25,7 +25,7 @@ import (
 	"github.com/golang/glog"
 	"google.golang.org/grpc"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim"
 	"k8s.io/kubernetes/pkg/util/interrupt"
 )

pkg/kubelet/dockershim/remote/docker_service.go

@@ -22,8 +22,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim"
 	utilexec "k8s.io/kubernetes/pkg/util/exec"
 )

pkg/kubelet/dockershim/security_context.go

@@ -25,7 +25,7 @@ import (
 	dockercontainer "github.com/docker/engine-api/types/container"
 
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
 	knetwork "k8s.io/kubernetes/pkg/kubelet/network"
 )

pkg/kubelet/dockershim/security_context_test.go

@@ -25,7 +25,7 @@ import (
 	dockercontainer "github.com/docker/engine-api/types/container"
 	"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/dockershim/securitycontext"
 )
 

pkg/kubelet/eviction/BUILD

@@ -32,7 +32,7 @@ go_test(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/eviction/api:go_default_library",
         "//pkg/kubelet/lifecycle:go_default_library",
@@ -62,7 +62,7 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/features:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/eviction/api:go_default_library",
         "//pkg/kubelet/lifecycle:go_default_library",

pkg/kubelet/eviction/eviction_manager_test.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/util/clock"
 	kubeapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
-	statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
 	"k8s.io/kubernetes/pkg/kubelet/lifecycle"
 	kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"

pkg/kubelet/eviction/helpers.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
-	statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
 	evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
 	"k8s.io/kubernetes/pkg/kubelet/qos"

pkg/kubelet/eviction/helpers_test.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
-	statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
 	evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
 	"k8s.io/kubernetes/pkg/quota"

pkg/kubelet/eviction/types.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
-	statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
 )
 

pkg/kubelet/kubelet.go

@@ -57,7 +57,7 @@ import (
 	corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	"k8s.io/kubernetes/pkg/features"
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
 	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
 	"k8s.io/kubernetes/pkg/kubelet/config"

pkg/kubelet/kuberuntime/BUILD

@@ -31,8 +31,8 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/ref:go_default_library",
         "//pkg/credentialprovider:go_default_library",
-        "//pkg/kubelet/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/events:go_default_library",
         "//pkg/kubelet/images:go_default_library",
@@ -82,8 +82,8 @@ go_test(
     deps = [
         "//pkg/api/v1:go_default_library",
         "//pkg/credentialprovider:go_default_library",
-        "//pkg/kubelet/api/testing:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/testing:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/container/testing:go_default_library",
         "//vendor/github.com/golang/mock/gomock:go_default_library",

pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/credentialprovider"
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/images"
 	"k8s.io/kubernetes/pkg/kubelet/lifecycle"

pkg/kubelet/kuberuntime/helpers.go

@@ -24,7 +24,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 )
 

pkg/kubelet/kuberuntime/instrumented_services.go

@@ -19,8 +19,8 @@ package kuberuntime
 import (
 	"time"
 
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/metrics"
 )
 

pkg/kubelet/kuberuntime/kuberuntime_container.go

@@ -35,7 +35,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/events"
 	"k8s.io/kubernetes/pkg/kubelet/qos"

pkg/kubelet/kuberuntime/kuberuntime_container_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 )
 

pkg/kubelet/kuberuntime/kuberuntime_gc.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/types"
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 )
 

pkg/kubelet/kuberuntime/kuberuntime_gc_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 )

pkg/kubelet/kuberuntime/kuberuntime_image.go

@@ -21,7 +21,7 @@ import (
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/credentialprovider"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/util/parsers"
 )

pkg/kubelet/kuberuntime/kuberuntime_image_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/credentialprovider"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 )
 

pkg/kubelet/kuberuntime/kuberuntime_logs.go

@@ -32,7 +32,7 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/util/tail"
 )
 

pkg/kubelet/kuberuntime/kuberuntime_manager.go

@@ -34,8 +34,8 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/api/v1/ref"
 	"k8s.io/kubernetes/pkg/credentialprovider"
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/events"
 	"k8s.io/kubernetes/pkg/kubelet/images"

pkg/kubelet/kuberuntime/kuberuntime_manager_test.go

@@ -31,8 +31,8 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/credentialprovider"
-	apitest "k8s.io/kubernetes/pkg/kubelet/api/testing"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 )

pkg/kubelet/kuberuntime/kuberuntime_sandbox.go

@@ -25,7 +25,7 @@ import (
 	"github.com/golang/glog"
 	kubetypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/types"
 	"k8s.io/kubernetes/pkg/kubelet/util/format"

pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 )
 

pkg/kubelet/kuberuntime/security_context.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/security/apparmor"
 	"k8s.io/kubernetes/pkg/securitycontext"
 )

pkg/kubelet/remote/BUILD

@@ -17,8 +17,8 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/kubelet/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/util/exec:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/golang.org/x/net/context:go_default_library",

pkg/kubelet/remote/remote_image.go

@@ -24,8 +24,8 @@ import (
 	"github.com/golang/glog"
 	"google.golang.org/grpc"
 
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 // RemoteImageService is a gRPC implementation of internalapi.ImageManagerService.

pkg/kubelet/remote/remote_runtime.go

@@ -25,8 +25,8 @@ import (
 	"github.com/golang/glog"
 	"google.golang.org/grpc"
 
-	internalapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	utilexec "k8s.io/kubernetes/pkg/util/exec"
 )
 

pkg/kubelet/remote/utils.go

@@ -23,7 +23,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 // dial creates a net.Conn by unix socket addr.

pkg/kubelet/rktshim/BUILD

@@ -19,8 +19,8 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/kubelet/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/util/ioutils:go_default_library",
     ],
 )
@@ -30,7 +30,7 @@ go_test(
     srcs = ["imagestore_test.go"],
     library = ":go_default_library",
     tags = ["automanaged"],
-    deps = ["//pkg/kubelet/api/v1alpha1/runtime:go_default_library"],
+    deps = ["//pkg/kubelet/apis/cri/v1alpha1:go_default_library"],
 )
 
 filegroup(

pkg/kubelet/rktshim/app-interface.go

@@ -19,8 +19,8 @@ package rktshim
 import (
 	"time"
 
-	kubeletapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	kubeletapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 // Runtime provides an API for lifecycle, inspection and introspection

pkg/kubelet/rktshim/fake-app-interface.go

@@ -23,8 +23,8 @@ import (
 	"math/rand"
 	"time"
 
-	kubeletapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	kubeletapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
 )
 

pkg/kubelet/rktshim/imagestore.go

@@ -19,7 +19,7 @@ package rktshim
 import (
 	"errors"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 // TODO(tmrts): Move these errors to the container API for code re-use.

pkg/kubelet/rktshim/imagestore_test.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 var (

pkg/kubelet/rktshim/pod-level-interface.go

@@ -17,8 +17,8 @@ limitations under the License.
 package rktshim
 
 import (
-	kubeletapi "k8s.io/kubernetes/pkg/kubelet/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	kubeletapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 // PodSandboxManager provides basic operations to create/delete and examine

pkg/kubelet/server/portforward/websocket.go

@@ -46,7 +46,7 @@ const (
 // options contains details about which streams are required for
 // port forwarding.
 // All fields incldued in V4Options need to be expressed explicilty in the
-// CRI (pkg/kubelet/api/{version}/runtime/api.proto) PortForwardRequest.
+// CRI (pkg/kubelet/apis/cri/{version}/api.proto) PortForwardRequest.
 type V4Options struct {
 	Ports []int32
 }

pkg/kubelet/server/stats/BUILD

@@ -21,7 +21,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api/v1:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/leaky:go_default_library",
@@ -49,7 +49,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api/v1:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/leaky:go_default_library",

pkg/kubelet/server/stats/summary.go

@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubetypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
 	"k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/leaky"

pkg/kubelet/server/stats/summary_test.go

@@ -27,7 +27,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8sv1 "k8s.io/kubernetes/pkg/api/v1"
-	kubestats "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	kubestats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
 	"k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/leaky"

pkg/kubelet/server/stats/volume_stat_calculator.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/util/format"
 	"k8s.io/kubernetes/pkg/volume"
 

pkg/kubelet/server/streaming/BUILD

@@ -18,7 +18,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/client/unversioned/remotecommand:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/server/portforward:go_default_library",
         "//pkg/kubelet/server/remotecommand:go_default_library",
         "//vendor/github.com/emicklei/go-restful:go_default_library",
@@ -41,7 +41,7 @@ go_test(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/client/unversioned/remotecommand:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/server/portforward:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/github.com/stretchr/testify/require:go_default_library",

pkg/kubelet/server/streaming/server.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/server/portforward"
 	remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
 )

pkg/kubelet/server/streaming/server_test.go

@@ -34,7 +34,7 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward"
 )
 

test/e2e/BUILD

@@ -143,7 +143,7 @@ go_library(
         "//pkg/controller/replication:go_default_library",
         "//pkg/kubectl:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/pod:go_default_library",
         "//pkg/master/ports:go_default_library",
         "//pkg/metrics:go_default_library",

test/e2e/framework/BUILD

@@ -69,7 +69,7 @@ go_library(
         "//pkg/controller/deployment/util:go_default_library",
         "//pkg/controller/node:go_default_library",
         "//pkg/kubectl:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/events:go_default_library",
         "//pkg/kubelet/metrics:go_default_library",
         "//pkg/kubelet/sysctl:go_default_library",

test/e2e/framework/kubelet_stats.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics"
 	"k8s.io/kubernetes/pkg/master/ports"
 	"k8s.io/kubernetes/pkg/metrics"

test/e2e/kubelet_perf.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/test/e2e/framework"
 	testutils "k8s.io/kubernetes/test/utils"
 

test/e2e_node/BUILD

@@ -31,9 +31,9 @@ go_library(
         "//pkg/apis/componentconfig/v1alpha1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
-        "//pkg/kubelet/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/remote:go_default_library",
         "//pkg/util/procfs:go_default_library",
         "//test/e2e/common:go_default_library",
@@ -98,7 +98,7 @@ go_test(
         "//pkg/apis/componentconfig:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/kubelet:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
+        "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/dockershim/libdocker:go_default_library",

test/e2e_node/density_test.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics"
 	"k8s.io/kubernetes/pkg/metrics"
 	"k8s.io/kubernetes/test/e2e/framework"

test/e2e_node/image_list.go

@@ -26,8 +26,8 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/kubernetes/pkg/kubelet/api"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/remote"
 	commontest "k8s.io/kubernetes/test/e2e/common"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -82,7 +82,7 @@ func (dp *dockerPuller) Pull(image string) ([]byte, error) {
 }
 
 type remotePuller struct {
-	imageService api.ImageManagerService
+	imageService internalapi.ImageManagerService
 }
 
 func (rp *remotePuller) Name() string {
@@ -91,7 +91,7 @@ func (rp *remotePuller) Name() string {
 
 func (rp *remotePuller) Pull(image string) ([]byte, error) {
 	// TODO(runcom): should we check if the image is already pulled with ImageStatus?
-	_, err := rp.imageService.PullImage(&runtime.ImageSpec{Image: image}, nil)
+	_, err := rp.imageService.PullImage(&runtimeapi.ImageSpec{Image: image}, nil)
 	return nil, err
 }
 

test/e2e_node/resource_collector.go

@@ -40,7 +40,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/pkg/util/procfs"
 	"k8s.io/kubernetes/test/e2e/framework"
 

test/e2e_node/resource_usage_test.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/test/e2e/framework"
 
 	. "github.com/onsi/ginkgo"

test/e2e_node/summary_test.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	"k8s.io/kubernetes/test/e2e/framework"
 
 	systemdutil "github.com/coreos/go-systemd/util"

test/e2e_node/util.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 	v1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
 	// utilconfig "k8s.io/kubernetes/pkg/util/config"
 	"k8s.io/kubernetes/test/e2e/framework"