koordlet: support pouch container

Signed-off-by: 佑祎 <[email protected]>

hack/mock-gen.sh

@@ -46,3 +46,8 @@ mockgen -source vendor/k8s.io/cri-api/pkg/apis/runtime/v1/api.pb.go \
   -imports github.com/koordinator-sh/koordinator/vendor/k8s.io/cri-api/pkg/apis/runtime/v1=k8s.io/cri-api/pkg/apis/runtime/v1 \
   -copyright_file ${LICENSE_HEADER_PATH} \
   -package mock_client RuntimeServiceClient
+mockgen -source vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go \
+  -destination pkg/koordlet/util/runtime/handler/mockv1alpha2client/mock.go \
+  -imports github.com/koordinator-sh/koordinator/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2=k8s.io/cri-api/pkg/apis/runtime/v1alpha2 \
+  -copyright_file ${LICENSE_HEADER_PATH} \
+  -package mockv1alpha2_client RuntimeServiceClient

pkg/koordlet/metricsadvisor/collectors/hostapplication/host_app_collector.go

@@ -140,7 +140,7 @@ func (h *hostAppCollector) collectHostAppResUsed() {
 		}
 
 		metrics = append(metrics, cpuUsageMetric, memUsageMetric)
-		klog.V(6).Infof("collect host application %v finished, metric %+v", hostApp.Name, metrics)
+		klog.V(6).Infof("collect host application %v finished, metric cpu=%v, memory=%v", hostApp.Name, cpuUsageValue, memoryUsageValue)
 		count++
 		allCPUUsageCores.Value += cpuUsageValue
 		allMemoryUsage.Value += float64(memoryUsageValue)

pkg/koordlet/runtimehooks/protocol/container_context.go

@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"github.com/containerd/nri/pkg/api"
-
 	"k8s.io/klog/v2"
 
 	apiext "github.com/koordinator-sh/koordinator/apis/extension"
@@ -30,6 +29,7 @@ import (
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/resourceexecutor"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer"
 	koordletutil "github.com/koordinator-sh/koordinator/pkg/koordlet/util"
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
 	"github.com/koordinator-sh/koordinator/pkg/util"
 )
 
@@ -372,10 +372,10 @@ func (c *ContainerContext) injectForExt() {
 }
 
 func getContainerID(podAnnotations map[string]string, containerUID string) string {
-	// TODO parse from runtime hook request directly
-	runtimeType := "containerd"
+	// TODO parse from runtime hook request directly such as cgroup path format
+	runtimeType := system.Conf.DefaultRuntimeType
 	if _, exist := podAnnotations["io.kubernetes.docker.type"]; exist {
-		runtimeType = "docker"
+		runtimeType = system.RuntimeTypeDocker
 	}
 	return fmt.Sprintf("%s://%s", runtimeType, containerUID)
 }

pkg/koordlet/runtimehooks/protocol/container_context_test.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/koordinator-sh/koordinator/apis/extension"
 	"github.com/koordinator-sh/koordinator/pkg/koordlet/resourceexecutor"
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
 )
 
 func TestContainerContext_FromNri(t *testing.T) {
@@ -209,3 +210,65 @@ func TestContainerContext_NriDone(t *testing.T) {
 		})
 	}
 }
+
+func Test_getContainerID(t *testing.T) {
+	type args struct {
+		podAnnotations           map[string]string
+		containerUID             string
+		systemConfDefaultRuntime string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "default is containerd",
+			args: args{
+				podAnnotations:           nil,
+				containerUID:             "testContainerID",
+				systemConfDefaultRuntime: system.RuntimeTypeContainerd,
+			},
+			want: "containerd://testContainerID",
+		},
+		{
+			name: "default is pouch",
+			args: args{
+				podAnnotations:           nil,
+				containerUID:             "testContainerID",
+				systemConfDefaultRuntime: system.RuntimeTypePouch,
+			},
+			want: "pouch://testContainerID",
+		},
+		{
+			name: "default is docker",
+			args: args{
+				podAnnotations:           nil,
+				containerUID:             "testContainerID",
+				systemConfDefaultRuntime: system.RuntimeTypeDocker,
+			},
+			want: "docker://testContainerID",
+		},
+		{
+			name: "docker in pod annotation",
+			args: args{
+				podAnnotations: map[string]string{
+					"io.kubernetes.docker.type": "true",
+				},
+				containerUID:             "testContainerID",
+				systemConfDefaultRuntime: system.RuntimeTypePouch,
+			},
+			want: "docker://testContainerID",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			system.Conf = &system.Config{
+				DefaultRuntimeType: tt.args.systemConfDefaultRuntime,
+			}
+			if got := getContainerID(tt.args.podAnnotations, tt.args.containerUID); got != tt.want {
+				t.Errorf("getContainerID() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}