From b53acb2abe230291ba113472d6ad3dea09f271d7 Mon Sep 17 00:00:00 2001 From: Alyson Deives Pereira Date: Fri, 24 May 2024 16:00:57 -0300 Subject: [PATCH] Upversion intel-device-plugins-dsa helm to 0.30.0 Updated latest helm version of intel-device-plugins-dsa from 0.29.0 to 0.30.0. Some adjustments were also made to patch file since nodeFeatureRule now defaults to true. TEST CASES: PASSED: Package build PASSED: Check the application uploaded successfully using command "system application-upload intel-device-plugins-operator.tgz" PASSED: Enable the dsa-plugin using command "system helm-chart-attribute-modify --enabled true intel-device-plugins-operator intel-device-plugins-dsa intel-device-plugins-operator" PASSED: Check the enabled status using command "system helm-override-list intel-device-plugins-operator --long" PASSED: Apply the app using command "system application-apply intel-device-plugins-operator" and check the status of app, it should be applied successfully in first attempt. PASSED: Verified the pods using command "kubectl get pods -n intel-device-plugins-operator" PASSED: Check the image version used by the pods using command "kubectl describe pod pod_name". It should show the 0.30.0. PASSED: Check the description of the node after applying the app using command "kubectl describe node controller-0". It shows in Capacity dsa.intel.com/wq-user-dedicated and dsa.intel.com/wq-user-shared. Story: 2011040 Task: 50188 Change-Id: I92a919d58c10124d213db8c4fc4b7feca0b6316f Signed-off-by: Alyson Deives Pereira --- .../debian/deb_folder/changelog | 6 ++++ ...DSA-configuration-via-helm-overrides.patch | 36 +++++++++---------- .../debian/meta_data.yaml | 8 ++--- .../dsa-static-overrides.yaml | 2 -- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/changelog b/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/changelog index db5babc..44c42f0 100644 --- a/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/changelog +++ b/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +intel-device-plugins-dsa-helm (0.30-1) unstable; urgency=medium + + * New upstream release. + + -- Alyson Deives Pereira Fri, 24 May 2024 03:50:00 +0000 + intel-device-plugins-dsa-helm (0.29-1) unstable; urgency=medium * Initial release. diff --git a/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/patches/0001-Enable-custom-DSA-configuration-via-helm-overrides.patch b/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/patches/0001-Enable-custom-DSA-configuration-via-helm-overrides.patch index a61f1e2..8a3f3d8 100644 --- a/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/patches/0001-Enable-custom-DSA-configuration-via-helm-overrides.patch +++ b/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/patches/0001-Enable-custom-DSA-configuration-via-helm-overrides.patch @@ -1,6 +1,6 @@ -From ad7bd1edd81250f6cfd8206c81ed4f26cd23f80c Mon Sep 17 00:00:00 2001 +From 3f0b88085653158cb7f7de95956cdf0d1224bc0a Mon Sep 17 00:00:00 2001 From: Alyson Deives Pereira -Date: Fri, 1 Mar 2024 10:27:30 -0300 +Date: Fri, 24 May 2024 15:19:21 -0300 Subject: [PATCH] Enable custom DSA configuration via helm overrides Enable custom configuration for DSA devices via helm overrides by @@ -8,29 +8,30 @@ defining the overrideConfig value. The default DSA configuration provided is based on the default config from upstream intel-device-plugins repository: -https://github.com/intel/intel-device-plugins-for-kubernetes/blob/release-0.29/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa-config.yaml +https://github.com/intel/intel-device-plugins-for-kubernetes/blob/release-0.30/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa-config.yaml + +Signed-off-by: Alyson Deives Pereira --- .../templates/_helpers.tpl | 3 + .../templates/dsa-config.yaml | 232 ++++++++++++++++++ - templates/dsa.yaml | 2 +- + templates/dsa.yaml | 1 + values.yaml | 4 +- - 4 files changed, 239 insertions(+), 2 deletions(-) + 4 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 templates/_helpers.tpl create mode 100644 templates/dsa-config.yaml diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl new file mode 100644 -index 0000000..c5f1fd6 +index 0000000..66bb94b --- /dev/null +++ b/templates/_helpers.tpl @@ -0,0 +1,3 @@ +{{- define "dsa.provisioningConfig" -}} +{{- printf "intel-dsa-config-%s" (.Values.overrideConfig | toJson | sha256sum) -}} +{{- end -}} -\ No newline at end of file diff --git a/templates/dsa-config.yaml b/templates/dsa-config.yaml new file mode 100644 -index 0000000..e70bf9d +index 0000000..3b250d0 --- /dev/null +++ b/templates/dsa-config.yaml @@ -0,0 +1,232 @@ @@ -268,27 +269,26 @@ index 0000000..e70bf9d +{{- end }} \ No newline at end of file diff --git a/templates/dsa.yaml b/templates/dsa.yaml -index 896b42c..411f867 100755 +index b3da083..adc7e96 100755 --- a/templates/dsa.yaml +++ b/templates/dsa.yaml -@@ -14,7 +14,7 @@ spec: - sharedDevNum: {{ .Values.sharedDevNum }} +@@ -15,6 +15,7 @@ spec: logLevel: {{ .Values.logLevel }} nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 4 }} -- + tolerations: {{- .Values.tolerations | toYaml | nindent 4 }} + provisioningConfig: {{ include "dsa.provisioningConfig" . }} + --- {{ if eq .Values.nodeFeatureRule true }} - apiVersion: nfd.k8s-sigs.io/v1alpha1 diff --git a/values.yaml b/values.yaml -index 9598856..0fd9de5 100755 +index 9433480..8fa2f04 100755 --- a/values.yaml +++ b/values.yaml -@@ -14,4 +14,6 @@ logLevel: 4 - nodeSelector: - intel.feature.node.kubernetes.io/dsa: 'true' +@@ -16,4 +16,6 @@ nodeSelector: --nodeFeatureRule: false + tolerations: + +-nodeFeatureRule: true \ No newline at end of file +nodeFeatureRule: true +annotations: {} diff --git a/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/meta_data.yaml b/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/meta_data.yaml index 4cb35a0..1619d44 100644 --- a/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/meta_data.yaml +++ b/helm-charts/upstream/intel-device-plugins-dsa-helm/debian/meta_data.yaml @@ -1,10 +1,10 @@ --- debname: intel-device-plugins-dsa-helm -debver: 0.29-1 +debver: 0.30-1 dl_path: - name: intel-device-plugins-dsa-v0.29.0.tgz - url: https://github.com/intel/helm-charts/releases/download/intel-device-plugins-dsa-0.29.0/intel-device-plugins-dsa-0.29.0.tgz - sha256sum: cb653afb09f1830d211857846ee7d20a6b9f909174d2d64ebcb8f481c62f5609 + name: intel-device-plugins-dsa-v0.30.0.tgz + url: https://github.com/intel/helm-charts/releases/download/intel-device-plugins-dsa-0.30.0/intel-device-plugins-dsa-0.30.0.tgz + sha256sum: 5980d107621d095f3dbc6f8c1491485f63942a87a398fd97dcb8bec82d535f2b src_files: - intel-device-plugins-dsa-helm/files/Makefile revision: diff --git a/stx-intel-device-plugins-operator-helm/stx-intel-device-plugins-operator-helm/fluxcd-manifests/intel-device-plugins-dsa/dsa-static-overrides.yaml b/stx-intel-device-plugins-operator-helm/stx-intel-device-plugins-operator-helm/fluxcd-manifests/intel-device-plugins-dsa/dsa-static-overrides.yaml index 535679a..7dd2806 100644 --- a/stx-intel-device-plugins-operator-helm/stx-intel-device-plugins-operator-helm/fluxcd-manifests/intel-device-plugins-dsa/dsa-static-overrides.yaml +++ b/stx-intel-device-plugins-operator-helm/stx-intel-device-plugins-operator-helm/fluxcd-manifests/intel-device-plugins-dsa/dsa-static-overrides.yaml @@ -3,5 +3,3 @@ # # SPDX-License-Identifier: Apache-2.0 # - -nodeFeatureRule: true \ No newline at end of file