Merge pull request #1539 from mythi/PR-2023-046

k8s v1.28.2 and NFD updates

Author: tkatila

DEVEL.md

@@ -369,3 +369,4 @@ others:
 6. Plugin CRD validation tests implemented in [`test/envtest/`](test/envtest) and passing: `make envtest`.
 7. Plugin CRD controller implemented in [`pkg/controllers/`](pkg/controllers) and added to the manager in `cmd/operator/main.go`.
 8. Plugin documentation written `cmd/<plugin>/README.md` and optionally end to end demos created in [`demo`](demo).
+9. Plugin [`NodeFeatureRule`](deployments/nfd/overlays/node-feature-rules)s added for Node Feature Discovery labeling.

cmd/gpu_plugin/README.md

@@ -227,8 +227,8 @@ take care of, which are explained below. For the RBAC-permissions, gRPC service
 the flag enabling, it is recommended to use kustomization by running:
 
 ```bash
-# Start NFD with GPU related configuration changes
-$ kubectl apply -k 'https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/gpu?ref=<RELEASE_VERSION>'
+# Start NFD - if your cluster doesn't have NFD installed yet
+$ kubectl apply -k 'https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd?ref=<RELEASE_VERSION>'
 
 # Create NodeFeatureRules for detecting GPUs on nodes
 $ kubectl apply -k 'https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/node-feature-rules?ref=<RELEASE_VERSION>'

cmd/qat_plugin/dpdkdrv/dpdkdrv.go

@@ -476,7 +476,7 @@ func (dp *DevicePlugin) isValidVfDeviceID(vfDevID string) bool {
 		}
 	}
 
-	klog.Warningf("device ID %s is not a QAT device or not enabled by kernelVfDrivers.", vfDevID)
+	klog.V(3).Infof("device ID %s is not a QAT device or not enabled by kernelVfDrivers.", vfDevID)
 
 	return false
 }

demo/openssl-qat-engine/Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:22.04 as builder
 
 ARG QATLIB_VERSION="23.08.0"
-ARG QAT_ENGINE_VERSION="v1.2.0"
+ARG QAT_ENGINE_VERSION="v1.4.0"
 ARG ASYNC_NGINX_VERSION="v0.5.1"
 ARG IPSEC_MB_VERSION="v1.4"
 ARG IPP_CRYPTO_VERSION="ippcp_2021.8"
@@ -48,7 +48,6 @@ RUN cd /intel-ipsec-mb && \
     make && make install LIB_INSTALL_DIR=/usr/lib64
 
 RUN cd /QAT_Engine && \
-    sed -i -e 's/GCM_IV_DATA_LEN/IMB_GCM_IV_DATA_LEN/g' qat_evp.c && \
     ./autogen.sh && \
     ./configure \
     --enable-qat_sw && \

deployments/nfd/base/kustomization.yaml

@@ -1,4 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.13.4"
+- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.14.1"
+configMapGenerator:
+- name: nfd-worker-conf
+  behavior: replace
+  files:
+  - nfd-worker.conf

deployments/nfd/base/nfd-worker.conf

@@ -0,0 +1,3 @@
+core:
+  labelSources:
+   - "local"