Skip to content

Commit 4e12d70

Browse files
bart0shbart0sh
authored
Merge pull request #1257 from mythi/PR-2022-083
release-0.25: 0.25.1
2 parents 63cfcd2 + cc12e55 commit 4e12d70

File tree

49 files changed

+100
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+100
-57
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ pipeline {
142142
stage('make test-with-kind') {
143143
steps {
144144
dir(path: "$REPO_DIR") {
145-
sh "make test-with-kind REG=intel/ TAG=0.25.0"
145+
sh "make test-with-kind REG=intel/ TAG=0.25.1"
146146
}
147147
}
148148
}

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ clean:
138138

139139
ORG?=intel
140140
REG?=$(ORG)/
141-
TAG?=0.25.0
141+
TAG?=0.25.1
142142
export TAG
143143

144144
e2e-fpga:

‎build/docker/intel-qat-initcontainer.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ LABEL summary='Intel® QAT initcontainer for Kubernetes'
6262
LABEL description='Intel QAT initcontainer initializes devices'
6363
COPY --from=builder /install_root /
6464
COPY demo/qat-init.sh /usr/local/bin/
65-
ENTRYPOINT ["/usr/local/bin/qat-init.sh"]
65+
ENTRYPOINT [ "/bin/bash", "/usr/local/bin/qat-init.sh"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ COPY --from=builder /install_root /
2121

2222
COPY demo/qat-init.sh /usr/local/bin/
2323

24-
ENTRYPOINT ["/usr/local/bin/qat-init.sh"]
24+
ENTRYPOINT [ "/bin/bash", "/usr/local/bin/qat-init.sh"]

‎cmd/gpu_nfdhook/labeler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ func createNumaNodeMappingLabel(mapping map[int][]string) string {
463463

464464
sort.Ints(numas)
465465

466-
for numaNode := range numas {
466+
for _, numaNode := range numas {
467467
gpus := mapping[numaNode]
468468
numaString := strconv.FormatInt(int64(numaNode), 10)
469469
gpusString := strings.Join(gpus, ".")

‎cmd/gpu_nfdhook/labeler_test.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,42 @@ func getTestCases() []testcase {
537537
"gpu.intel.com/numa-gpu-map": "0-0_1-1",
538538
},
539539
},
540+
{
541+
sysfsdirs: []string{
542+
"card0/device/drm/card0",
543+
"card1/device/drm/card1",
544+
"card1/gt/gt0",
545+
},
546+
sysfsfiles: map[string][]byte{
547+
"card0/device/vendor": []byte("0xfefe"),
548+
"card0/device/numa_node": []byte("0"),
549+
"card1/device/vendor": []byte("0x8086"),
550+
"card1/lmem_total_bytes": []byte("8000"),
551+
"card1/device/numa_node": []byte("1"),
552+
},
553+
name: "successful labeling with one 0x8086 card and numa node info",
554+
memoryOverride: 16000000000,
555+
capabilityFile: map[string][]byte{
556+
"1/i915_capabilities": []byte(
557+
"platform: newnew\n" +
558+
"gen: 9"),
559+
},
560+
expectedRetval: nil,
561+
expectedLabels: labelMap{
562+
"gpu.intel.com/graphics_version": "9",
563+
"gpu.intel.com/media_version": "9",
564+
"gpu.intel.com/millicores": "1000",
565+
"gpu.intel.com/memory.max": "8000",
566+
"gpu.intel.com/platform_newnew.count": "1",
567+
"gpu.intel.com/platform_newnew.present": "true",
568+
"gpu.intel.com/platform_newnew.tiles": "1",
569+
"gpu.intel.com/platform_gen": "9",
570+
"gpu.intel.com/gpu-numbers": "1",
571+
"gpu.intel.com/cards": "card1",
572+
"gpu.intel.com/tiles": "1",
573+
"gpu.intel.com/numa-gpu-map": "1-1",
574+
},
575+
},
540576
{
541577
sysfsdirs: []string{
542578
"card0/device/drm/card0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
restartPolicy: Never
77
containers:
88
- name: dlb-libdlb-demo-pf-pod
9-
image: intel/dlb-libdlb-demo:0.25.0
9+
image: intel/dlb-libdlb-demo:0.25.1
1010
imagePullPolicy: IfNotPresent
1111
resources:
1212
limits:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
restartPolicy: Never
77
containers:
88
- name: pf
9-
image: intel/dlb-libdlb-demo:0.25.0
9+
image: intel/dlb-libdlb-demo:0.25.1
1010
imagePullPolicy: IfNotPresent
1111
resources:
1212
limits:
@@ -18,7 +18,7 @@ spec:
1818
cpu: 1
1919
memory: 200Mi
2020
- name: vf
21-
image: intel/dlb-libdlb-demo:0.25.0
21+
image: intel/dlb-libdlb-demo:0.25.1
2222
imagePullPolicy: IfNotPresent
2323
resources:
2424
limits:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
restartPolicy: Never
77
containers:
88
- name: dlb-libdlb-demo-vf-pod
9-
image: intel/dlb-libdlb-demo:0.25.0
9+
image: intel/dlb-libdlb-demo:0.25.1
1010
command: [ "sh", "-c", "/usr/local/bin/dir_traffic -n 8 -w epoll -d $(ls /dev/dlb* | sed 's/\\/dev\\/dlb//')" ]
1111
imagePullPolicy: IfNotPresent
1212
resources:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
spec:
88
containers:
99
- name: dsa-accel-config-demo
10-
image: intel/accel-config-demo:0.25.0
10+
image: intel/accel-config-demo:0.25.1
1111
imagePullPolicy: IfNotPresent
1212
resources:
1313
limits:

‎demo/iaa-accel-config-demo-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
spec:
88
containers:
99
- name: iaa-accel-config-demo
10-
image: intel/accel-config-demo:0.25.0
10+
image: intel/accel-config-demo:0.25.1
1111
command: [ "/bin/bash", "-c", "cd /test && /bin/bash -e ./iaa_user_test_runner.sh" ]
1212
imagePullPolicy: IfNotPresent
1313
resources:

‎demo/intelfpga-job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
restartPolicy: Never
1414
containers:
1515
- name: intelfpga-demo-job-1
16-
image: intel/opae-nlb-demo:0.25.0
16+
image: intel/opae-nlb-demo:0.25.1
1717
imagePullPolicy: IfNotPresent
1818
securityContext:
1919
capabilities:

‎demo/openssl-qat-engine-cpa-sample-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
spec:
88
containers:
99
- name: openssl-qat-engine
10-
image: intel/openssl-qat-engine:0.25.0
10+
image: intel/openssl-qat-engine:0.25.1
1111
imagePullPolicy: IfNotPresent
1212
command: [ "cpa_sample_code", "runTests=4", "signOfLife=1" ]
1313
securityContext:

‎demo/qat-init.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
#!/bin/bash
1+
#!/bin/sh -eu
22
ENABLED_QAT_PF_PCIIDS=${ENABLED_QAT_PF_PCIIDS:-37c8 4940 4942}
33
DEVS=$(for pf in $ENABLED_QAT_PF_PCIIDS; do lspci -n | grep -e "$pf" | grep -o -e "^\\S*"; done)
44

55
for dev in $DEVS; do
66
DEVPATH="/sys/bus/pci/devices/0000:$dev"
77
NUMVFS="$DEVPATH/sriov_numvfs"
8-
if test -w "$NUMVFS" -a "$(cat "$NUMVFS")" -eq 0 ; then
8+
if ! test -w "$NUMVFS"; then
9+
echo "error: $NUMVFS is not found or not writable. Check if QAT driver module is loaded"
10+
exit 1
11+
fi
12+
if [ "$(cat "$NUMVFS")" -ne 0 ]; then
13+
echo "$DEVPATH already configured"
14+
else
915
tee "$NUMVFS" < "$DEVPATH/sriov_totalvfs"
1016
fi
1117
done

‎demo/test-fpga-orchestrated.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: intel/opae-nlb-demo:0.25.0
8+
image: intel/opae-nlb-demo:0.25.1
99
imagePullPolicy: IfNotPresent
1010
securityContext:
1111
capabilities:

‎demo/test-fpga-preprogrammed.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: intel/opae-nlb-demo:0.25.0
8+
image: intel/opae-nlb-demo:0.25.1
99
imagePullPolicy: IfNotPresent
1010
securityContext:
1111
capabilities:

‎deployments/dlb_plugin/base/intel-dlb-plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
valueFrom:
2222
fieldRef:
2323
fieldPath: spec.nodeName
24-
image: intel/intel-dlb-plugin:0.25.0
24+
image: intel/intel-dlb-plugin:0.25.1
2525
imagePullPolicy: IfNotPresent
2626
securityContext:
2727
readOnlyRootFilesystem: true

‎deployments/dlb_plugin/overlays/dlb_initcontainer/dlb_initcontainer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
spec:
88
initContainers:
99
- name: intel-dlb-initcontainer
10-
image: intel/intel-dlb-initcontainer:0.25.0
10+
image: intel/intel-dlb-initcontainer:0.25.1
1111
securityContext:
1212
readOnlyRootFilesystem: true
1313
privileged: true

‎deployments/dsa_plugin/base/intel-dsa-plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
valueFrom:
2222
fieldRef:
2323
fieldPath: spec.nodeName
24-
image: intel/intel-dsa-plugin:0.25.0
24+
image: intel/intel-dsa-plugin:0.25.1
2525
imagePullPolicy: IfNotPresent
2626
securityContext:
2727
readOnlyRootFilesystem: true

‎deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
valueFrom:
1313
fieldRef:
1414
fieldPath: spec.nodeName
15-
image: intel/intel-idxd-config-initcontainer:0.25.0
15+
image: intel/intel-idxd-config-initcontainer:0.25.1
1616
securityContext:
1717
readOnlyRootFilesystem: true
1818
privileged: true

‎deployments/fpga_admissionwebhook/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
control-plane: controller-manager
1717
spec:
1818
containers:
19-
- image: intel/intel-fpga-admissionwebhook:0.25.0
19+
- image: intel/intel-fpga-admissionwebhook:0.25.1
2020
imagePullPolicy: IfNotPresent
2121
name: manager
2222
securityContext:

‎deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
initContainers:
1818
- name: intel-fpga-initcontainer
19-
image: intel/intel-fpga-initcontainer:0.25.0
19+
image: intel/intel-fpga-initcontainer:0.25.1
2020
imagePullPolicy: IfNotPresent
2121
securityContext:
2222
readOnlyRootFilesystem: true
@@ -33,7 +33,7 @@ spec:
3333
valueFrom:
3434
fieldRef:
3535
fieldPath: spec.nodeName
36-
image: intel/intel-fpga-plugin:0.25.0
36+
image: intel/intel-fpga-plugin:0.25.1
3737
imagePullPolicy: IfNotPresent
3838
args:
3939
- -mode=af

‎deployments/gpu_plugin/base/intel-gpu-plugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
initContainers:
1717
- name: intel-gpu-initcontainer
18-
image: intel/intel-gpu-initcontainer:0.25.0
18+
image: intel/intel-gpu-initcontainer:0.25.1
1919
imagePullPolicy: IfNotPresent
2020
securityContext:
2121
seLinuxOptions:
@@ -32,7 +32,7 @@ spec:
3232
valueFrom:
3333
fieldRef:
3434
fieldPath: spec.nodeName
35-
image: intel/intel-gpu-plugin:0.25.0
35+
image: intel/intel-gpu-plugin:0.25.1
3636
imagePullPolicy: IfNotPresent
3737
securityContext:
3838
seLinuxOptions:

‎deployments/iaa_plugin/base/intel-iaa-plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
valueFrom:
2222
fieldRef:
2323
fieldPath: spec.nodeName
24-
image: intel/intel-iaa-plugin:0.25.0
24+
image: intel/intel-iaa-plugin:0.25.1
2525
imagePullPolicy: IfNotPresent
2626
securityContext:
2727
readOnlyRootFilesystem: true

‎deployments/iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
fieldPath: spec.nodeName
1515
- name: IDXD_DEVICE_TYPE
1616
value: "iax"
17-
image: intel/intel-idxd-config-initcontainer:0.25.0
17+
image: intel/intel-idxd-config-initcontainer:0.25.1
1818
securityContext:
1919
readOnlyRootFilesystem: true
2020
privileged: true

‎deployments/operator/default/manager_auth_proxy_patch.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ spec:
1010
spec:
1111
containers:
1212
- name: kube-rbac-proxy
13-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
13+
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
1414
args:
1515
- "--secure-listen-address=0.0.0.0:8443"
1616
- "--upstream=http://127.0.0.1:8080/"
1717
- "--logtostderr=true"
18+
- "--tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305"
1819
- "--v=10"
1920
ports:
2021
- containerPort: 8443

‎deployments/operator/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
control-plane: controller-manager
2424
spec:
2525
containers:
26-
- image: intel/intel-deviceplugin-operator:0.25.0
26+
- image: intel/intel-deviceplugin-operator:0.25.1
2727
imagePullPolicy: IfNotPresent
2828
name: manager
2929
resources:

‎deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
alm-examples: '[]'
66
capabilities: Seamless Upgrades
77
categories: Drivers and plugins
8-
containerImage: intel/intel-deviceplugin-operator:0.25.0
8+
containerImage: intel/intel-deviceplugin-operator:0.25.1
99
createdAt: "2022-05-20"
1010
description: This operator is a Kubernetes custom controller whose goal is to
1111
serve the installation and lifecycle management of Intel device plugins for

‎deployments/operator/samples/deviceplugin_v1_dlbdeviceplugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ metadata:
99
# annotations:
1010
# container.apparmor.security.beta.kubernetes.io/intel-dlb-plugin: unconfined
1111
spec:
12-
image: intel/intel-dlb-plugin:0.25.0
13-
initImage: intel/intel-dlb-initcontainer:0.25.0
12+
image: intel/intel-dlb-plugin:0.25.1
13+
initImage: intel/intel-dlb-initcontainer:0.25.1
1414
logLevel: 4
1515
nodeSelector:
1616
intel.feature.node.kubernetes.io/dlb: 'true'

‎deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: DsaDevicePlugin
33
metadata:
44
name: dsadeviceplugin-sample
55
spec:
6-
image: intel/intel-dsa-plugin:0.25.0
6+
image: intel/intel-dsa-plugin:0.25.1
77
sharedDevNum: 10
88
logLevel: 4
99
nodeSelector:

‎deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ kind: FpgaDevicePlugin
33
metadata:
44
name: fpgadeviceplugin-sample
55
spec:
6-
image: intel/intel-fpga-plugin:0.25.0
7-
initImage: intel/intel-fpga-initcontainer:0.25.0
6+
image: intel/intel-fpga-plugin:0.25.1
7+
initImage: intel/intel-fpga-initcontainer:0.25.1
88
mode: region
99
logLevel: 4
1010
nodeSelector:

‎deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ kind: GpuDevicePlugin
33
metadata:
44
name: gpudeviceplugin-sample
55
spec:
6-
image: intel/intel-gpu-plugin:0.25.0
7-
initImage: intel/intel-gpu-initcontainer:0.25.0
6+
image: intel/intel-gpu-plugin:0.25.1
7+
initImage: intel/intel-gpu-initcontainer:0.25.1
88
sharedDevNum: 10
99
logLevel: 4
1010
nodeSelector:

‎deployments/operator/samples/deviceplugin_v1_iaadeviceplugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: IaaDevicePlugin
33
metadata:
44
name: iaadeviceplugin-sample
55
spec:
6-
image: intel/intel-iaa-plugin:0.25.0
6+
image: intel/intel-iaa-plugin:0.25.1
77
sharedDevNum: 10
88
logLevel: 4
99
nodeSelector:

‎deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ metadata:
99
# annotations:
1010
# container.apparmor.security.beta.kubernetes.io/intel-qat-plugin: unconfined
1111
spec:
12-
image: intel/intel-qat-plugin:0.25.0
13-
initImage: intel/intel-qat-initcontainer:0.25.0
12+
image: intel/intel-qat-plugin:0.25.1
13+
initImage: intel/intel-qat-initcontainer:0.25.1
1414
dpdkDriver: vfio-pci
1515
kernelVfDrivers:
1616
- c6xxvf

‎deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ kind: SgxDevicePlugin
33
metadata:
44
name: sgxdeviceplugin-sample
55
spec:
6-
image: intel/intel-sgx-plugin:0.25.0
7-
initImage: intel/intel-sgx-initcontainer:0.25.0
6+
image: intel/intel-sgx-plugin:0.25.1
7+
initImage: intel/intel-sgx-initcontainer:0.25.1
88
enclaveLimit: 110
99
provisionLimit: 110
1010
logLevel: 4

0 commit comments

Comments
 (0)