Merge pull request #1257 from mythi/PR-2022-083

release-0.25: 0.25.1

Author: bart0sh

Jenkinsfile

@@ -142,7 +142,7 @@ pipeline {
         stage('make test-with-kind') {
           steps {
             dir(path: "$REPO_DIR") {
-              sh "make test-with-kind REG=intel/ TAG=0.25.0"
+              sh "make test-with-kind REG=intel/ TAG=0.25.1"
             }
           }
         }

Makefile

@@ -138,7 +138,7 @@ clean:
 
 ORG?=intel
 REG?=$(ORG)/
-TAG?=0.25.0
+TAG?=0.25.1
 export TAG
 
 e2e-fpga:

build/docker/intel-qat-initcontainer.Dockerfile

@@ -62,4 +62,4 @@ LABEL summary='Intel® QAT initcontainer for Kubernetes'
 LABEL description='Intel QAT initcontainer initializes devices'
 COPY --from=builder /install_root /
 COPY demo/qat-init.sh /usr/local/bin/
-ENTRYPOINT ["/usr/local/bin/qat-init.sh"]
+ENTRYPOINT [ "/bin/bash", "/usr/local/bin/qat-init.sh"]

build/docker/templates/intel-qat-initcontainer.Dockerfile.in

@@ -21,4 +21,4 @@ COPY --from=builder /install_root /
 
 COPY demo/qat-init.sh /usr/local/bin/
 
-ENTRYPOINT ["/usr/local/bin/qat-init.sh"]
+ENTRYPOINT [ "/bin/bash", "/usr/local/bin/qat-init.sh"]

cmd/gpu_nfdhook/labeler.go

@@ -463,7 +463,7 @@ func createNumaNodeMappingLabel(mapping map[int][]string) string {
 
 	sort.Ints(numas)
 
-	for numaNode := range numas {
+	for _, numaNode := range numas {
 		gpus := mapping[numaNode]
 		numaString := strconv.FormatInt(int64(numaNode), 10)
 		gpusString := strings.Join(gpus, ".")

cmd/gpu_nfdhook/labeler_test.go

@@ -537,6 +537,42 @@ func getTestCases() []testcase {
 				"gpu.intel.com/numa-gpu-map":            "0-0_1-1",
 			},
 		},
+		{
+			sysfsdirs: []string{
+				"card0/device/drm/card0",
+				"card1/device/drm/card1",
+				"card1/gt/gt0",
+			},
+			sysfsfiles: map[string][]byte{
+				"card0/device/vendor":    []byte("0xfefe"),
+				"card0/device/numa_node": []byte("0"),
+				"card1/device/vendor":    []byte("0x8086"),
+				"card1/lmem_total_bytes": []byte("8000"),
+				"card1/device/numa_node": []byte("1"),
+			},
+			name:           "successful labeling with one 0x8086 card and numa node info",
+			memoryOverride: 16000000000,
+			capabilityFile: map[string][]byte{
+				"1/i915_capabilities": []byte(
+					"platform: newnew\n" +
+						"gen: 9"),
+			},
+			expectedRetval: nil,
+			expectedLabels: labelMap{
+				"gpu.intel.com/graphics_version":        "9",
+				"gpu.intel.com/media_version":           "9",
+				"gpu.intel.com/millicores":              "1000",
+				"gpu.intel.com/memory.max":              "8000",
+				"gpu.intel.com/platform_newnew.count":   "1",
+				"gpu.intel.com/platform_newnew.present": "true",
+				"gpu.intel.com/platform_newnew.tiles":   "1",
+				"gpu.intel.com/platform_gen":            "9",
+				"gpu.intel.com/gpu-numbers":             "1",
+				"gpu.intel.com/cards":                   "card1",
+				"gpu.intel.com/tiles":                   "1",
+				"gpu.intel.com/numa-gpu-map":            "1-1",
+			},
+		},
 		{
 			sysfsdirs: []string{
 				"card0/device/drm/card0",

demo/dlb-libdlb-demo-pf-pod.yaml

@@ -6,7 +6,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: dlb-libdlb-demo-pf-pod
-    image: intel/dlb-libdlb-demo:0.25.0
+    image: intel/dlb-libdlb-demo:0.25.1
     imagePullPolicy: IfNotPresent
     resources:
       limits:

demo/dlb-libdlb-demo-pod.yaml

@@ -6,7 +6,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: pf
-    image: intel/dlb-libdlb-demo:0.25.0
+    image: intel/dlb-libdlb-demo:0.25.1
     imagePullPolicy: IfNotPresent
     resources:
       limits:
@@ -18,7 +18,7 @@ spec:
         cpu: 1
         memory: 200Mi
   - name: vf
-    image: intel/dlb-libdlb-demo:0.25.0
+    image: intel/dlb-libdlb-demo:0.25.1
     imagePullPolicy: IfNotPresent
     resources:
       limits:

demo/dlb-libdlb-demo-vf-pod.yaml

@@ -6,7 +6,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: dlb-libdlb-demo-vf-pod
-    image: intel/dlb-libdlb-demo:0.25.0
+    image: intel/dlb-libdlb-demo:0.25.1
     command: [ "sh", "-c", "/usr/local/bin/dir_traffic -n 8 -w epoll -d $(ls /dev/dlb* | sed 's/\\/dev\\/dlb//')" ]
     imagePullPolicy: IfNotPresent
     resources:

demo/dsa-accel-config-demo-pod.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
   - name: dsa-accel-config-demo
-    image: intel/accel-config-demo:0.25.0
+    image: intel/accel-config-demo:0.25.1
     imagePullPolicy: IfNotPresent
     resources:
       limits: