Merge pull request #1206 from mythi/sgx-plugin-topologymanager-fix

release-0.24: trigger 0.24.1

Author: bart0sh

.github/workflows/ci.yaml

@@ -176,7 +176,7 @@ jobs:
       uses: actions/checkout@v3
     - name: Install terrascan
       run: |
-        curl -L "$(curl -s https://api.github.com/repos/accurics/terrascan/releases/latest | grep -o -E "https://.+?_Linux_x86_64.tar.gz")" > terrascan.tar.gz
+        curl -L "$(curl -s https://api.github.com/repos/tenable/terrascan/releases/latest | grep -o -E "https://.+?_Linux_x86_64.tar.gz")" > terrascan.tar.gz
         tar -xf terrascan.tar.gz terrascan && rm terrascan.tar.gz
         install terrascan /usr/local/bin && rm terrascan
     - name: Run Terrascan

Jenkinsfile

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

Makefile

@@ -135,7 +135,7 @@ clean:
 
 ORG?=intel
 REG?=$(ORG)/
-TAG?=0.24.0
+TAG?=0.24.1
 export TAG
 
 e2e-fpga:

README.md

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-deviceplugin-operator'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® device plugin operator for Kubernetes'
 LABEL description='To simplify the deployment of the device plugins, a unified device plugins operator is implemented. Currently the operator has support for the QAT, GPU, FPGA, SGX, DSA and DLB device plugins. Each device plugin has its own custom resource definition (CRD) and the corresponding controller that watches CRUD operations to those custom resources.'

build/docker/intel-deviceplugin-operator.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-dlb-plugin'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® DLB device plugin for Kubernetes'
 LABEL description='The DLB device plugin supports Intel Dynamic Load Balancer accelerator(DLB)'

build/docker/intel-dlb-plugin.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-dsa-plugin'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® DSA device plugin for Kubernetes'
 LABEL description='The DSA device plugin supports acceleration using the Intel Data Streaming accelerator(DSA)'

build/docker/intel-dsa-plugin.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-fpga-admissionwebhook'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® FPGA admission controller webhook for Kubernetes'
 LABEL description='The FPGA admission controller webhook is responsible for performing mapping from user-friendly function IDs to the Interface ID and Bitstream ID that are required for FPGA programming. It also implements access control by namespacing FPGA configuration information'

build/docker/intel-fpga-admissionwebhook.Dockerfile

@@ -78,7 +78,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-fpga-initcontainer'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® FPGA programming CRI hook for Kubernetes'
 LABEL description='The FPGA prestart CRI-O hook performs discovery of the requested FPGA function bitstream and programs FPGA devices based on the environment variables in the workload description'

build/docker/intel-fpga-initcontainer.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-fpga-plugin'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® FPGA device plugin for Kubernetes'
 LABEL description='The FPGA device plugin is responsible for discovering and reporting FPGA devices to kubelet'

build/docker/intel-fpga-plugin.Dockerfile

@@ -69,7 +69,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-gpu-initcontainer'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® GPU NFD hook for Kubernetes'
 LABEL description='The GPU fractional resources, such as GPU memory is registered as a kubernetes extended resource using node-feature-discovery (NFD). A custom NFD source hook is installed as part of GPU device plugin operator deployment and NFD is configured to register the GPU memory extended resource reported by the hook'

build/docker/intel-gpu-initcontainer.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-gpu-plugin'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® GPU device plugin for Kubernetes'
 LABEL description='The GPU device plugin provides access to Intel discrete (Xe) and integrated GPU HW device files'

build/docker/intel-gpu-plugin.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-iaa-plugin'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® IAA device plugin for Kubernetes'
 LABEL description='The IAA device plugin supports acceleration using the Intel Analytics accelerator(IAA)'

build/docker/intel-iaa-plugin.Dockerfile

@@ -46,7 +46,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-qat-initcontainer'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® QAT initcontainer for Kubernetes'
 LABEL description='Intel QAT initcontainer initializes devices'

build/docker/intel-qat-initcontainer.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-qat-plugin'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® QAT device plugin for Kubernetes'
 LABEL description='The QAT plugin supports device plugin for Intel QAT adapters, and includes code showing deployment via DPDK'

build/docker/intel-qat-plugin.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-sgx-admissionwebhook'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® SGX admission controller webhook for Kubernetes'
 LABEL description='The SGX admission webhook is responsible for performing Pod mutations based on the sgx.intel.com/quote-provider pod annotation set by the user. The purpose of the webhook is to hide the details of setting the necessary device resources and volume mounts for using SGX remote attestation in the cluster'

build/docker/intel-sgx-admissionwebhook.Dockerfile

@@ -69,7 +69,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-sgx-initcontainer'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® SGX NFD hook for Kubernetes'
 LABEL description='The SGX EPC memory available on each node is registered as a Kubernetes extended resource using node-feature-discovery (NFD). A custom NFD source hook is installed as part of SGX device plugin operator deployment and NFD is configured to register the SGX EPC memory extended resource reported by the hook'

build/docker/intel-sgx-initcontainer.Dockerfile

@@ -49,7 +49,7 @@ FROM ${FINAL_BASE}
 
 LABEL name='intel-sgx-plugin'
 LABEL vendor='Intel®'
-LABEL version=0.24.0
+LABEL version=0.24.1
 LABEL release='1'
 LABEL summary='Intel® SGX device plugin for Kubernetes'
 LABEL description='The SGX device plugin is responsible for discovering and reporting SGX device nodes to kubelet'

build/docker/intel-sgx-plugin.Dockerfile

@@ -3,4 +3,4 @@ name: intel-device-plugins-operator
 description: A Helm chart for Intel Device Plugins Operator for Kubernetes
 type: application
 version: 0.1.0
-appVersion: "0.24.0"
+appVersion: "0.24.1"

charts/operator/Chart.yaml

@@ -1,4 +1,4 @@
 image:
   hub: intel
-  tag: "0.24.0"
+  tag: "0.24.1"
   pullPolicy: IfNotPresent

charts/operator/values.yaml

@@ -94,13 +94,13 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
 	for i := uint(0); i < dp.nEnclave; i++ {
 		devID := fmt.Sprintf("%s-%d", "sgx-enclave", i)
 		nodes := []pluginapi.DeviceSpec{{HostPath: sgxEnclavePath, ContainerPath: sgxEnclavePath, Permissions: "rw"}}
-		devTree.AddDevice(deviceTypeEnclave, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil))
+		devTree.AddDevice(deviceTypeEnclave, devID, dpapi.NewDeviceInfoWithTopologyHints(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil, nil))
 	}
 
 	for i := uint(0); i < dp.nProvision; i++ {
 		devID := fmt.Sprintf("%s-%d", "sgx-provision", i)
 		nodes := []pluginapi.DeviceSpec{{HostPath: sgxProvisionPath, ContainerPath: sgxProvisionPath, Permissions: "rw"}}
-		devTree.AddDevice(deviceTypeProvision, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil))
+		devTree.AddDevice(deviceTypeProvision, devID, dpapi.NewDeviceInfoWithTopologyHints(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil, nil))
 	}
 
 	return devTree, nil

cmd/sgx_plugin/sgx_plugin.go

@@ -13,7 +13,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: intelfpga-demo-job-1
-          image: intel/opae-nlb-demo:0.24.0
+          image: intel/opae-nlb-demo:0.24.1
           imagePullPolicy: IfNotPresent
           securityContext:
             capabilities:

demo/intelfpga-job.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: test-container
-    image: intel/opae-nlb-demo:0.24.0
+    image: intel/opae-nlb-demo:0.24.1
     imagePullPolicy: IfNotPresent
     securityContext:
       capabilities:

demo/test-fpga-orchestrated.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: test-container
-    image: intel/opae-nlb-demo:0.24.0
+    image: intel/opae-nlb-demo:0.24.1
     imagePullPolicy: IfNotPresent
     securityContext:
       capabilities:

demo/test-fpga-preprogrammed.yaml

@@ -20,7 +20,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-dlb-plugin:0.24.0
+        image: intel/intel-dlb-plugin:0.24.1
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true

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

@@ -20,7 +20,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-dsa-plugin:0.24.0
+        image: intel/intel-dsa-plugin:0.24.1
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true

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

@@ -12,7 +12,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-idxd-config-initcontainer:0.24.0
+        image: intel/intel-idxd-config-initcontainer:0.24.1
         securityContext:
           readOnlyRootFilesystem: true
           privileged: true

deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml

@@ -16,7 +16,7 @@ spec:
         control-plane: controller-manager
     spec:
       containers:
-      - image: intel/intel-fpga-admissionwebhook:0.24.0
+      - image: intel/intel-fpga-admissionwebhook:0.24.1
         imagePullPolicy: IfNotPresent
         name: manager
         securityContext:

deployments/fpga_admissionwebhook/manager/manager.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       initContainers:
       - name: intel-fpga-initcontainer
-        image: intel/intel-fpga-initcontainer:0.24.0
+        image: intel/intel-fpga-initcontainer:0.24.1
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true
@@ -33,7 +33,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-fpga-plugin:0.24.0
+        image: intel/intel-fpga-plugin:0.24.1
         imagePullPolicy: IfNotPresent
         args:
           - -mode=af

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

@@ -15,7 +15,7 @@ spec:
     spec:
       initContainers:
       - name: intel-gpu-initcontainer
-        image: intel/intel-gpu-initcontainer:0.24.0
+        image: intel/intel-gpu-initcontainer:0.24.1
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true
@@ -30,7 +30,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-gpu-plugin:0.24.0
+        image: intel/intel-gpu-plugin:0.24.1
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true

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

@@ -20,7 +20,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-iaa-plugin:0.24.0
+        image: intel/intel-iaa-plugin:0.24.1
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true

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

@@ -14,7 +14,7 @@ spec:
                 fieldPath: spec.nodeName
           - name: IDXD_DEVICE_TYPE
             value: "iaa"
-        image: intel/intel-idxd-config-initcontainer:0.24.0
+        image: intel/intel-idxd-config-initcontainer:0.24.1
         securityContext:
           readOnlyRootFilesystem: true
           privileged: true

deployments/iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml

@@ -23,7 +23,7 @@ spec:
         control-plane: controller-manager
     spec:
       containers:
-      - image: intel/intel-deviceplugin-operator:0.24.0
+      - image: intel/intel-deviceplugin-operator:0.24.1
         imagePullPolicy: IfNotPresent
         name: manager
         resources:

deployments/operator/manager/manager.yaml

@@ -5,7 +5,7 @@ metadata:
     alm-examples: '[]'
     capabilities: Basic Install
     categories: Drivers and plugins
-    containerImage: intel/intel-deviceplugin-operator:0.24.0
+    containerImage: intel/intel-deviceplugin-operator:0.24.1
     createdAt: "2022-01-04"
     description: This operator is a Kubernetes custom controller whose goal is to
       serve the installation and lifecycle management of Intel device plugins for

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

@@ -9,7 +9,7 @@ metadata:
   # annotations:
   #   container.apparmor.security.beta.kubernetes.io/intel-dlb-plugin: unconfined
 spec:
-  image: intel/intel-dlb-plugin:0.24.0
+  image: intel/intel-dlb-plugin:0.24.1
   logLevel: 4
   nodeSelector:
     intel.feature.node.kubernetes.io/dlb: 'true'

deployments/operator/samples/deviceplugin_v1_dlbdeviceplugin.yaml

@@ -3,7 +3,7 @@ kind: DsaDevicePlugin
 metadata:
   name: dsadeviceplugin-sample
 spec:
-  image: intel/intel-dsa-plugin:0.24.0
+  image: intel/intel-dsa-plugin:0.24.1
   sharedDevNum: 10
   logLevel: 4
   nodeSelector:

deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml

@@ -3,8 +3,8 @@ kind: FpgaDevicePlugin
 metadata:
   name: fpgadeviceplugin-sample
 spec:
-  image: intel/intel-fpga-plugin:0.24.0
-  initImage: intel/intel-fpga-initcontainer:0.24.0
+  image: intel/intel-fpga-plugin:0.24.1
+  initImage: intel/intel-fpga-initcontainer:0.24.1
   mode: region
   logLevel: 4
   nodeSelector:

deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml

@@ -3,8 +3,8 @@ kind: GpuDevicePlugin
 metadata:
   name: gpudeviceplugin-sample
 spec:
-  image: intel/intel-gpu-plugin:0.24.0
-  initImage: intel/intel-gpu-initcontainer:0.24.0
+  image: intel/intel-gpu-plugin:0.24.1
+  initImage: intel/intel-gpu-initcontainer:0.24.1
   sharedDevNum: 10
   logLevel: 4
   nodeSelector:

deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml

@@ -3,7 +3,7 @@ kind: IaaDevicePlugin
 metadata:
   name: iaadeviceplugin-sample
 spec:
-  image: intel/intel-iaa-plugin:0.24.0
+  image: intel/intel-iaa-plugin:0.24.1
   sharedDevNum: 10
   logLevel: 4
   # TODO: nodeSelector is supported and can be used once it becomes

deployments/operator/samples/deviceplugin_v1_iaadeviceplugin.yaml

@@ -9,8 +9,8 @@ metadata:
   # annotations:
   #   container.apparmor.security.beta.kubernetes.io/intel-qat-plugin: unconfined
 spec:
-  image: intel/intel-qat-plugin:0.24.0
-  initImage: intel/intel-qat-initcontainer:0.24.0
+  image: intel/intel-qat-plugin:0.24.1
+  initImage: intel/intel-qat-initcontainer:0.24.1
   dpdkDriver: vfio-pci
   kernelVfDrivers:
     - c6xxvf

deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml

@@ -3,8 +3,8 @@ kind: SgxDevicePlugin
 metadata:
   name: sgxdeviceplugin-sample
 spec:
-  image: intel/intel-sgx-plugin:0.24.0
-  initImage: intel/intel-sgx-initcontainer:0.24.0
+  image: intel/intel-sgx-plugin:0.24.1
+  initImage: intel/intel-sgx-initcontainer:0.24.1
   enclaveLimit: 110
   provisionLimit: 110
   logLevel: 4