extend cri apis for special needs

Signed-off-by: Starnop <[email protected]>

Author: starnop

vendor/k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime/BUILD renamed to cri/apis/v1alpha1/BUILD

@@ -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.
 

vendor/k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go renamed to cri/apis/v1alpha1/api.pb.go

@@ -13,6 +13,7 @@ import (
 
 	apitypes "github.com/alibaba/pouch/apis/types"
 	anno "github.com/alibaba/pouch/cri/annotations"
+	runtime "github.com/alibaba/pouch/cri/apis/v1alpha1"
 	"github.com/alibaba/pouch/daemon/config"
 	"github.com/alibaba/pouch/daemon/mgr"
 	"github.com/alibaba/pouch/pkg/errtypes"
@@ -24,7 +25,6 @@ import (
 	// NOTE: "golang.org/x/net/context" is compatible with standard "context" in golang1.7+.
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/sirupsen/logrus"
-	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 )
 
 const (
@@ -497,6 +497,7 @@ func (c *CriManager) CreateContainer(ctx context.Context, r *runtime.CreateConta
 	specAnnotation[anno.ContainerType] = anno.ContainerTypeContainer
 	specAnnotation[anno.SandboxName] = podSandboxID
 
+	resources := r.GetConfig().GetLinux().GetResources()
 	createConfig := &apitypes.ContainerCreateConfig{
 		ContainerConfig: apitypes.ContainerConfig{
 			Entrypoint: config.Command,
@@ -510,9 +511,12 @@ func (c *CriManager) CreateContainer(ctx context.Context, r *runtime.CreateConta
 			StdinOnce:      config.StdinOnce,
 			Tty:            config.Tty,
 			SpecAnnotation: specAnnotation,
+			NetPriority:    config.NetPriority,
+			DiskQuota:      resources.GetDiskQuota(),
 		},
 		HostConfig: &apitypes.HostConfig{
-			Binds: generateMountBindings(config.GetMounts()),
+			Binds:     generateMountBindings(config.GetMounts()),
+			Resources: parseResourcesFromCRI(resources),
 		},
 		NetworkingConfig: &apitypes.NetworkingConfig{},
 	}
@@ -713,6 +717,8 @@ func (c *CriManager) ContainerStatus(ctx context.Context, r *runtime.ContainerSt
 		imageRef = imageInfo.RepoDigests[0]
 	}
 
+	resources := container.HostConfig.Resources
+	diskQuota := container.Config.DiskQuota
 	status := &runtime.ContainerStatus{
 		Id:          container.ID,
 		Metadata:    metadata,
@@ -729,6 +735,8 @@ func (c *CriManager) ContainerStatus(ctx context.Context, r *runtime.ContainerSt
 		Labels:      labels,
 		Annotations: annotations,
 		// TODO: LogPath.
+		Volumes:   parseVolumesFromPouch(container.Config.Volumes),
+		Resources: parseResourcesFromPouch(resources, diskQuota),
 	}
 
 	return &runtime.ContainerStatusResponse{Status: status}, nil
@@ -794,14 +802,8 @@ func (c *CriManager) UpdateContainerResources(ctx context.Context, r *runtime.Up
 
 	resources := r.GetLinux()
 	updateConfig := &apitypes.UpdateConfig{
-		Resources: apitypes.Resources{
-			CPUPeriod:  resources.GetCpuPeriod(),
-			CPUQuota:   resources.GetCpuQuota(),
-			CPUShares:  resources.GetCpuShares(),
-			Memory:     resources.GetMemoryLimitInBytes(),
-			CpusetCpus: resources.GetCpusetCpus(),
-			CpusetMems: resources.GetCpusetMems(),
-		},
+		Resources: parseResourcesFromCRI(resources),
+		DiskQuota: resources.GetDiskQuota(),
 	}
 	err = c.ContainerMgr.Update(ctx, containerID, updateConfig)
 	if err != nil {

cri/apis/v1alpha1/api.proto

@@ -5,11 +5,11 @@ import (
 	"os"
 	"strings"
 
+	runtime "github.com/alibaba/pouch/cri/apis/v1alpha1"
 	"github.com/alibaba/pouch/cri/config"
 
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/sirupsen/logrus"
-	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 )
 
 // CniMgr as an interface defines all operations against CNI.