Merge "Upversion intel-device-plugins-dsa helm to 0.30.0"

This commit is contained in:
Zuul 2024-06-03 22:40:37 +00:00 committed by Gerrit Code Review
commit b038702711
4 changed files with 28 additions and 24 deletions

View File

@ -1,3 +1,9 @@
intel-device-plugins-dsa-helm (0.30-1) unstable; urgency=medium
* New upstream release.
-- Alyson Deives Pereira <alyson.deivespereira@windriver.com> Fri, 24 May 2024 03:50:00 +0000
intel-device-plugins-dsa-helm (0.29-1) unstable; urgency=medium intel-device-plugins-dsa-helm (0.29-1) unstable; urgency=medium
* Initial release. * Initial release.

View File

@ -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 <alyson.deivespereira@windriver.com> From: Alyson Deives Pereira <alyson.deivespereira@windriver.com>
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 Subject: [PATCH] Enable custom DSA configuration via helm overrides
Enable custom configuration for DSA devices via helm overrides by 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 The default DSA configuration provided is based on the default config
from upstream intel-device-plugins repository: 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 <alyson.deivespereira@windriver.com>
--- ---
.../templates/_helpers.tpl | 3 + .../templates/_helpers.tpl | 3 +
.../templates/dsa-config.yaml | 232 ++++++++++++++++++ .../templates/dsa-config.yaml | 232 ++++++++++++++++++
templates/dsa.yaml | 2 +- templates/dsa.yaml | 1 +
values.yaml | 4 +- 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/_helpers.tpl
create mode 100644 templates/dsa-config.yaml create mode 100644 templates/dsa-config.yaml
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
new file mode 100644 new file mode 100644
index 0000000..c5f1fd6 index 0000000..66bb94b
--- /dev/null --- /dev/null
+++ b/templates/_helpers.tpl +++ b/templates/_helpers.tpl
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+{{- define "dsa.provisioningConfig" -}} +{{- define "dsa.provisioningConfig" -}}
+{{- printf "intel-dsa-config-%s" (.Values.overrideConfig | toJson | sha256sum) -}} +{{- printf "intel-dsa-config-%s" (.Values.overrideConfig | toJson | sha256sum) -}}
+{{- end -}} +{{- end -}}
\ No newline at end of file
diff --git a/templates/dsa-config.yaml b/templates/dsa-config.yaml diff --git a/templates/dsa-config.yaml b/templates/dsa-config.yaml
new file mode 100644 new file mode 100644
index 0000000..e70bf9d index 0000000..3b250d0
--- /dev/null --- /dev/null
+++ b/templates/dsa-config.yaml +++ b/templates/dsa-config.yaml
@@ -0,0 +1,232 @@ @@ -0,0 +1,232 @@
@ -268,27 +269,26 @@ index 0000000..e70bf9d
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/templates/dsa.yaml b/templates/dsa.yaml diff --git a/templates/dsa.yaml b/templates/dsa.yaml
index 896b42c..411f867 100755 index b3da083..adc7e96 100755
--- a/templates/dsa.yaml --- a/templates/dsa.yaml
+++ b/templates/dsa.yaml +++ b/templates/dsa.yaml
@@ -14,7 +14,7 @@ spec: @@ -15,6 +15,7 @@ spec:
sharedDevNum: {{ .Values.sharedDevNum }}
logLevel: {{ .Values.logLevel }} logLevel: {{ .Values.logLevel }}
nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 4 }} nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 4 }}
- tolerations: {{- .Values.tolerations | toYaml | nindent 4 }}
+ provisioningConfig: {{ include "dsa.provisioningConfig" . }} + provisioningConfig: {{ include "dsa.provisioningConfig" . }}
--- ---
{{ if eq .Values.nodeFeatureRule true }} {{ if eq .Values.nodeFeatureRule true }}
apiVersion: nfd.k8s-sigs.io/v1alpha1
diff --git a/values.yaml b/values.yaml diff --git a/values.yaml b/values.yaml
index 9598856..0fd9de5 100755 index 9433480..8fa2f04 100755
--- a/values.yaml --- a/values.yaml
+++ b/values.yaml +++ b/values.yaml
@@ -14,4 +14,6 @@ logLevel: 4 @@ -16,4 +16,6 @@ nodeSelector:
nodeSelector:
intel.feature.node.kubernetes.io/dsa: 'true'
-nodeFeatureRule: false tolerations:
-nodeFeatureRule: true
\ No newline at end of file \ No newline at end of file
+nodeFeatureRule: true +nodeFeatureRule: true
+annotations: {} +annotations: {}

View File

@ -1,10 +1,10 @@
--- ---
debname: intel-device-plugins-dsa-helm debname: intel-device-plugins-dsa-helm
debver: 0.29-1 debver: 0.30-1
dl_path: dl_path:
name: intel-device-plugins-dsa-v0.29.0.tgz name: intel-device-plugins-dsa-v0.30.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 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: cb653afb09f1830d211857846ee7d20a6b9f909174d2d64ebcb8f481c62f5609 sha256sum: 5980d107621d095f3dbc6f8c1491485f63942a87a398fd97dcb8bec82d535f2b
src_files: src_files:
- intel-device-plugins-dsa-helm/files/Makefile - intel-device-plugins-dsa-helm/files/Makefile
revision: revision:

View File

@ -3,5 +3,3 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
nodeFeatureRule: true