Merge "integ: gpu-operator helm charts"

starlingx · Mar 28, 2021 · 5104f26 · 5104f26
2 parents 0e8206e + 41bdf53
commit 5104f26
Show file tree

Hide file tree

Showing 6 changed files with 782 additions and 0 deletions.
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
@@ -85,3 +85,4 @@ python/python-webencodings
 python/python-daemon
 base/inih
 base/pf-bb-config
+gpu/gpu-operator
diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst
@@ -71,3 +71,4 @@ xxHash-1f40c6511fa8dd9d2e337ca8c9bc18b3e87663c9.tar.gz#xxHash#https://api.github
 zstd-f4340f46b2387bc8de7d5320c0b83bb1499933ad.tar.gz#zstd#https://api.github.com/repos/facebook/zstd/tarball/f4340f46b2387bc8de7d5320c0b83bb1499933ad#https##
 inih-b1dbff4b0bd1e1f40d237e21011f6dee0ec2fa69.tar.gz#inih-44#https://github.com/benhoyt/inih/tarball/b1dbff4b0bd1e1f40d237e21011f6dee0ec2fa69#https##
 pf-bb-config-791b4f38d15377d4fbb3c9799a652acbc405b088.tar.gz#pf-bb-config-20.11#https://github.com/intel/pf-bb-config/tarball/791b4f38d15377d4fbb3c9799a652acbc405b088#https##
+gpu-operator-1.6.0.tar.gz#gpu-operator-1.6.0#https://github.com/NVIDIA/gpu-operator/archive/1.6.0.tar.gz##https##
diff --git a/gpu/gpu-operator/centos/build_srpm.data b/gpu/gpu-operator/centos/build_srpm.data
@@ -0,0 +1,8 @@
+VERSION=1.6.0
+TAR_NAME=gpu-operator
+TAR="$TAR_NAME-$VERSION.tar.gz"
+COPY_LIST=" \
+  $PKG_BASE/files/* \
+  $STX_BASE/downloads/$TAR"
+
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/gpu/gpu-operator/centos/gpu-operator.spec b/gpu/gpu-operator/centos/gpu-operator.spec
@@ -0,0 +1,45 @@
+# Build variables
+%global app_folder /usr/local/share/applications/helm
+
+Summary: StarlingX nvidia gpu-operator helm chart
+Name: gpu-operator
+Version: 1.6.0
+Release: 0%{?_tis_dist}.%{tis_patch_ver}
+License: Apache-2.0
+Group: base
+Packager: Wind River <[email protected]>
+URL: https://github.com/NVIDIA/gpu-operator/tree/gh-pages
+
+Source0: %{name}-%{version}.tar.gz
+
+BuildArch: noarch
+
+Patch01: deployments-setup-configmap-with-assets-for-volumemo.patch
+Patch02: enablement-support-on-starlingx-cloud-platform.patch
+
+BuildRequires: helm
+
+%define debug_package %{nil}
+%description
+StarlingX port of NVIDIA gpu-operator
+
+%prep
+%setup
+
+%patch01 -p1
+%patch02 -p1
+
+%build
+cp -r assets deployments/gpu-operator/assets
+
+helm lint deployments/gpu-operator
+mkdir build_results
+helm package --version %{version} --app-version %{version} -d build_results deployments/gpu-operator
+
+%install
+install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
+install -p -D -m 755 build_results/%{name}-%{version}.tgz ${RPM_BUILD_ROOT}%{helm_folder}
+
+%files
+%defattr(-,root,root,-)
+%{helm_folder}
diff --git a/gpu/gpu-operator/files/deployments-setup-configmap-with-assets-for-volumemo.patch b/gpu/gpu-operator/files/deployments-setup-configmap-with-assets-for-volumemo.patch
@@ -0,0 +1,137 @@
+From de6068e56987960b7f3227dd4747e64b169742df Mon Sep 17 00:00:00 2001
+From: Babak Sarashki <[email protected]>
+Date: Sat, 6 Mar 2021 00:22:40 +0000
+Subject: [PATCH] deployments: setup configmap with assets for volumemounts
+
+This feature allows inclusion of assets/ in the helm chart and their
+export to the gpu-operator pod through configmap volumeMounts.
+
+Signed-off-by: Babak Sarashki <[email protected]>
+---
+ .../gpu-operator/templates/operator.yaml      | 45 +++++++++++++++++++
+ .../templates/operator_configmap.yaml         | 36 +++++++++++++++
+ deployments/gpu-operator/values.yaml          |  2 +
+ 3 files changed, 83 insertions(+)
+ create mode 100644 deployments/gpu-operator/templates/operator_configmap.yaml
+
+diff --git a/deployments/gpu-operator/templates/operator.yaml b/deployments/gpu-operator/templates/operator.yaml
+index 50983b20..90aa3874 100644
+--- a/deployments/gpu-operator/templates/operator.yaml
++++ b/deployments/gpu-operator/templates/operator.yaml
+@@ -50,6 +50,45 @@ spec:
+           - name: host-os-release
+             mountPath: "/host-etc/os-release"
+             readOnly: true
++
++          {{- if eq .Values.operator.include_assets "include_assets" }}
++          {{- range $path, $_ := .Files.Glob "assets/gpu-feature-discovery/*" }}
++          - name: assets
++            mountPath: {{ printf "/opt/gpu-operator/gpu-feature-discovery/%s" (base $path) }}
++            subPath: {{ printf "gfd_%s" (base $path) }}
++          {{- end }}
++
++          {{- range $path, $_ := .Files.Glob "assets/state-container-toolkit/*" }}
++          - name: assets
++            mountPath: {{ printf "/opt/gpu-operator/state-container-toolkit/%s" (base $path) }}
++            subPath: {{ printf "state_container_toolkit_%s" (base $path) }}
++          {{- end }}
++
++          {{- range $path, $_ := .Files.Glob "assets/state-device-plugin/*" }}
++          - name: assets
++            mountPath: {{ printf "/opt/gpu-operator/state-device-plugin/%s" (base $path) }}
++            subPath: {{ printf "state_device_%s" (base $path) }}
++          {{- end }}
++
++          {{- range $path, $_ := .Files.Glob "assets/state-device-plugin-validation/*" }}
++          - name: assets
++            mountPath: {{ printf "/opt/gpu-operator/state-device-plugin-validation/%s" (base $path) }}
++            subPath: {{ printf "state_device_validation_%s" (base $path) }}
++          {{- end }}
++
++          {{- range $path, $_ := .Files.Glob "assets/state-driver/*" }}
++          - name: assets
++            mountPath: {{ printf "/opt/gpu-operator/state-driver/%s" (base $path) }}
++            subPath: {{ printf "state_driver_%s" (base $path) }}
++          {{- end }}
++
++          {{- range $path, $_ := .Files.Glob "assets/state-monitoring/*" }}
++          - name: assets
++            mountPath: {{ printf "/opt/gpu-operator/state-monitoring/%s" (base $path) }}
++            subPath: {{ printf "state_monitor_%s" (base $path) }}
++          {{- end }}
++          {{- end }}
++
+         readinessProbe:
+           exec:
+             command: ["stat", "/tmp/operator-sdk-ready"]
+@@ -63,6 +102,12 @@ spec:
+         - name: host-os-release
+           hostPath:
+             path: "/etc/os-release"
++        {{- if eq .Values.operator.include_assets "include_assets" }}
++        - name: assets
++          configMap:
++            name: operator-configmap
++        {{- end }}
++
+     {{- with .Values.operator.nodeSelector }}
+       nodeSelector:
+         {{- toYaml . | nindent 8 }}
+diff --git a/deployments/gpu-operator/templates/operator_configmap.yaml b/deployments/gpu-operator/templates/operator_configmap.yaml
+new file mode 100644
+index 00000000..61f366e8
+--- /dev/null
++++ b/deployments/gpu-operator/templates/operator_configmap.yaml
+@@ -0,0 +1,36 @@
++{{- if eq .Values.operator.include_assets "include_assets" }}
++apiVersion: v1
++kind: ConfigMap
++metadata:
++  name: operator-configmap
++data:
++{{- range $path, $_ := .Files.Glob "assets/gpu-feature-discovery/*" }}
++{{ printf "gfd_%s" (base $path) | indent 2 }}: |-
++{{ $.Files.Get $path | indent 4 }}
++{{- end }}
++
++{{- range $path, $_ := .Files.Glob "assets/state-container-toolkit/*" }}
++{{ printf "state_container_toolkit_%s" (base $path) | indent 2 }}: |-
++{{ $.Files.Get $path | indent 4 }}
++{{- end }}
++
++{{- range $path, $_ := .Files.Glob "assets/state-device-plugin/*" }}
++{{ printf "state_device_%s" (base $path) | indent 2 }}: |-
++{{ $.Files.Get $path | indent 4 }}
++{{- end }}
++
++{{- range $path, $_ := .Files.Glob "assets/state-device-plugin-validation/*" }}
++{{ printf "state_device_validation_%s" (base $path) | indent 2 }}: |-
++{{ $.Files.Get $path | indent 4 }}
++{{- end }}
++
++{{- range $path, $_ := .Files.Glob "assets/state-driver/*" }}
++{{ printf "state_driver_%s" (base $path) | indent 2 }}: |-
++{{ $.Files.Get $path | indent 4 }}
++{{- end }}
++
++{{- range $path, $_ := .Files.Glob "assets/state-monitoring/*" }}
++{{ printf "state_monitor_%s" (base $path) | indent 2 }}: |-
++{{ $.Files.Get $path | indent 4 }}
++{{- end }}
++{{- end }}
+diff --git a/deployments/gpu-operator/values.yaml b/deployments/gpu-operator/values.yaml
+index 00d94195..8b43c59f 100644
+--- a/deployments/gpu-operator/values.yaml
++++ b/deployments/gpu-operator/values.yaml
+@@ -39,6 +39,8 @@ operator:
+                 values: [""]
+   logging:
+     timeEncoding: epoch
++  # Set to "include_assets" to include assets/gpu-operator with the helm chart
++  include_assets: ""
+
+ driver:
+   repository: nvcr.io/nvidia
+-- 
+2.17.1
+