From af39d0565c5ad2f66f24006bb1ae7342b2dae3d6 Mon Sep 17 00:00:00 2001 From: vbedida79 Date: Fri, 7 Jun 2024 12:34:48 -0400 Subject: [PATCH] nfd: Update NFD CR's to support SGX EPC Fix for issue https://github.com/intel/intel-technology-enabling-for-openshift/issues/255 Signed-off-by: vbedida79 --- nfd/node-feature-discovery-openshift.yaml | 8 ++------ nfd/node-feature-rules-openshift.yaml | 8 +++++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/nfd/node-feature-discovery-openshift.yaml b/nfd/node-feature-discovery-openshift.yaml index 3be26468..39659930 100644 --- a/nfd/node-feature-discovery-openshift.yaml +++ b/nfd/node-feature-discovery-openshift.yaml @@ -7,13 +7,9 @@ metadata: name: nfd-instance namespace: openshift-nfd spec: - extraLabelNs: - - sgx.intel.com - resourceLabels: - - sgx.intel.com/epc operand: - image: quay.io/openshift/origin-node-feature-discovery:4.13 + image: quay.io/openshift/origin-node-feature-discovery:4.15 imagePullPolicy: Always servicePort: 12000 workerConfig: - configData: | + configData: | \ No newline at end of file diff --git a/nfd/node-feature-rules-openshift.yaml b/nfd/node-feature-rules-openshift.yaml index 5dc73b49..9e6c4815 100644 --- a/nfd/node-feature-rules-openshift.yaml +++ b/nfd/node-feature-rules-openshift.yaml @@ -32,14 +32,16 @@ spec: - name: "intel.sgx" labels: "intel.feature.node.kubernetes.io/sgx": "true" + extendedResources: + sgx.intel.com/epc: "@cpu.security.sgx.epc" matchFeatures: - feature: cpu.cpuid matchExpressions: SGX: {op: Exists} SGXLC: {op: Exists} - - feature: cpu.sgx + - feature: cpu.security matchExpressions: - enabled: {op: IsTrue} + sgx.enabled: {op: IsTrue} - feature: kernel.config matchExpressions: - X86_SGX: {op: Exists} + X86_SGX: {op: Exists} \ No newline at end of file