From 25b4c5a063e47a85a482c7b1db90403ec9fdb861 Mon Sep 17 00:00:00 2001
From: Gaurav Mehta <gaurav@rancher.com>
Date: Tue, 23 Jan 2024 17:08:59 +1100
Subject: [PATCH] addon updates

update pcidevices controller to v0.3.1
---
 pkg/config/templates/rancherd-22-addons.yaml | 33 +++++++++++++++-----
 scripts/build-bundle                         | 18 +++++++----
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/pkg/config/templates/rancherd-22-addons.yaml b/pkg/config/templates/rancherd-22-addons.yaml
index da37fb903..2eb84b833 100644
--- a/pkg/config/templates/rancherd-22-addons.yaml
+++ b/pkg/config/templates/rancherd-22-addons.yaml
@@ -6,7 +6,7 @@ resources:
       namespace: harvester-system
     spec:
       repo: http://harvester-cluster-repo.cattle-system.svc/charts
-      version: "0.1.5"
+      version: "0.1.7"
       chart: harvester-vm-import-controller
       {{- if and .Addons .Addons.harvester_vm_import_controller }}
       enabled: {{ .Addons.harvester_vm_import_controller.Enabled }}
@@ -15,7 +15,7 @@ resources:
       {{- end }}
       valuesContent: |
         image:
-          tag: v0.1.5
+          tag: v0.1.7
         fullnameOverride: harvester-vm-import-controller
   - apiVersion: harvesterhci.io/v1beta1
     kind: Addon
@@ -24,7 +24,7 @@ resources:
       namespace: harvester-system
     spec:
       repo: http://harvester-cluster-repo.cattle-system.svc/charts
-      version: "0.2.5"
+      version: "0.3.1"
       chart: harvester-pcidevices-controller
       {{- if and .Addons .Addons.harvester_pcidevices_controller }}
       enabled: {{ .Addons.harvester_pcidevices_controller.Enabled }}
@@ -33,7 +33,7 @@ resources:
       {{- end }}
       valuesContent: |
         image:
-          tag: v0.2.5
+          tag: v0.3.1
         fullnameOverride: harvester-pcidevices-controller
   - apiVersion: harvesterhci.io/v1beta1
     kind: Addon
@@ -208,7 +208,7 @@ resources:
       addon.harvesterhci.io/experimental: "true"
     spec:
       repo: http://harvester-cluster-repo.cattle-system.svc/charts
-      version: "0.1.0"
+      version: "0.1.1"
       chart: harvester-seeder
       {{- if and .Addons .Addons.harvester_seeder}}
       enabled: {{ .Addons.harvester_seeder.Enabled }}
@@ -217,5 +217,24 @@ resources:
       {{- end }}
       valuesContent: |
         image:
-          tag: v0.1.0
-        fullnameOverride: harvester-seeder
\ No newline at end of file
+          tag: v0.1.1
+        fullnameOverride: harvester-seeder
+  - apiVersion: harvesterhci.io/v1beta1
+    kind: Addon
+    metadata:
+      name: nvidia-driver-toolkit
+      namespace: harvester-system
+    spec:
+      repo: http://harvester-cluster-repo.cattle-system.svc/charts
+      version: "0.1.1"
+      chart: nvidia-driver-runtime
+      {{- if and .Addons .Addons.nvidia_driver_toolkit}}
+      enabled: {{ .Addons.nvidia_driver_toolkit.Enabled }}
+      {{- else }}
+      enabled: false
+      {{- end }}
+      valuesContent: |
+        image:
+          tag: sle-micro-head
+        driverLocation:  "HTTPENDPOINT/NVIDIA-Linux-x86_64-vgpu-kvm.run" 
+        fullnameOverride: nvidia-driver-runtime        
\ No newline at end of file
diff --git a/scripts/build-bundle b/scripts/build-bundle
index ca5be1178..434b1ad46 100755
--- a/scripts/build-bundle
+++ b/scripts/build-bundle
@@ -23,12 +23,13 @@ CHARTS_DIR="${PACKAGE_HARVESTER_REPO_DIR}/charts"
 IMAGES_DIR="${BUNDLE_DIR}/harvester/images"
 IMAGES_LISTS_DIR="${BUNDLE_DIR}/harvester/images-lists"
 RANCHERD_IMAGES_DIR="${BUNDLE_DIR}/rancherd/images"
-VM_IMPORT_CONTROLLER_CHART_VERSION="0.1.5"
-VM_IMPORT_CONTROLLER_IMAGE="rancher/harvester-vm-import-controller:v0.1.5"
-PCIDEVICES_CONTROLLER_CHART_VERSION="0.2.5"
-PCIDEVICES_CONTROLLER_IMAGE="rancher/harvester-pcidevices:v0.2.5"
-HARVESTER_SEEDER_CHART_VERSION="0.1.0"
-HARVESTER_SEEDER_IMAGE="rancher/harvester-seeder:v0.1.0"
+VM_IMPORT_CONTROLLER_CHART_VERSION="0.1.7"
+VM_IMPORT_CONTROLLER_IMAGE="rancher/harvester-vm-import-controller:v0.1.7"
+PCIDEVICES_CONTROLLER_CHART_VERSION="0.3.1"
+PCIDEVICES_CONTROLLER_IMAGE="rancher/harvester-pcidevices:v0.3.1"
+HARVESTER_SEEDER_CHART_VERSION="0.1.1"
+HARVESTER_SEEDER_IMAGE="rancher/harvester-seeder:v0.1.1"
+NVIDIA_DRIVER_RUNTIME_CHART_VERSION="0.1.1"
 mkdir -p ${CHARTS_DIR}
 mkdir -p ${IMAGES_DIR}
 mkdir -p ${IMAGES_LISTS_DIR}
@@ -108,6 +109,11 @@ helm pull https://github.com/harvester/charts/releases/download/harvester-seeder
 # make chart sanity check
 tar zxvf ${CHARTS_DIR}/harvester-seeder-${HARVESTER_SEEDER_CHART_VERSION}.tgz >/dev/null --warning=no-timestamp
 
+# Prepare nvidia-driver-toolkit chart
+helm pull https://github.com/harvester/charts/releases/download/nvidia-driver-runtime-${NVIDIA_DRIVER_RUNTIME_CHART_VERSION}/nvidia-driver-runtime-${NVIDIA_DRIVER_RUNTIME_CHART_VERSION}.tgz -d ${CHARTS_DIR}
+# make chart sanity check
+tar zxvf ${CHARTS_DIR}/nvidia-driver-runtime-${NVIDIA_DRIVER_RUNTIME_CHART_VERSION}.tgz >/dev/null --warning=no-timestamp
+
 # Create Helm repo index after charts are ready
 helm repo index ${CHARTS_DIR}