Merge pull request #252 from vbedida79/patch-070624-1

nfd: Update NFD CR's to support SGX EPC
intel · Jun 10, 2024 · fe4df14 · fe4df14
2 parents c3ab0dd + af39d05
commit fe4df14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git 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: |
diff --git a/nfd/node-feature-rules-openshift.yaml b/nfd/node-feature-rules-openshift.yaml
@@ -33,14 +33,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}