Skip to content

Commit 1064d93

Browse files
Merge branch 'main' into issue_5401
2 parents cce2381 + cd5cd4d commit 1064d93

File tree

6 files changed

+118
-4
lines changed

6 files changed

+118
-4
lines changed

docs/advanced/addons/nvidiadrivertoolkit.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@ To enable the addon, users need to perform the following:
3030

3131
Once the addon is enabled, a nvidia-driver-toolkit daemonset is deployed to the cluster.
3232

33-
On pod startup, the entrypoint script will download the nvidia driver from the speificied `Driver Location`, install the driver and load the kernel drivers.
33+
On pod startup, the ENTRYPOINT script will download the NVIDIA driver from the specified `Driver Location`. Install the driver and load the kernel drivers.
3434

35-
The `PCIDevices` addon can now leverage this addon to manage the lifecycle of the vGPU devices on nodes containing supported GPU [devices](../vgpusupport.md).
35+
The `PCIDevices` addon can now leverage this addon to manage the lifecycle of the vGPU devices on nodes containing supported GPU [devices](../vgpusupport.md).
36+
37+
## Install Different NVIDIA Driver Versions
38+
39+
_Available as of v1.7.0_
40+
41+
NVIDIA driver versions can vary across cluster nodes. If you want to install a specific driver version on a node, you must annotate the node before starting the nvidia-driver-toolkit add-on.
42+
43+
```
44+
kubectl annotate nodes {node name} sriovgpu.harvesterhci.io/custom-driver=https://[driver location]
45+
```
46+
47+
The nvidia-driver-toolkit installs the specified driver version upon starting.
48+
49+
If an NVIDIA driver was previously installed, you must restart the pod to trigger the installation process again.

docs/install/external-disk-support.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,16 @@ os:
7575
externalStorageConfig:
7676
enabled: true
7777
multiPathConfig:
78-
- vendor: "IET"
79-
product: "MediaFiles"
78+
blacklist:
79+
- vendor: "!QEMU"
80+
product: "!QEMU HARDDISK"
81+
blacklistWwids:
82+
- ".*"
83+
blacklistExceptions:
84+
- vendor: "DELL"
85+
product: "POWERVAULT"
86+
blacklistExceptionWwids:
87+
- "^0QEMU_QEMU_HARDDISK_disk[0-9]+"
8088
additionalKernelArguments: "rd.iscsi.firmware vlan=enp4s0f0.2017:enp4s0f0 ip=10.115.48.10::10.115.55.254:255.255.248.0::enp4s0f0.2017:none"
8189
```
8290

docs/install/harvester-configuration.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,20 @@ os:
5454
topology.kubernetes.io/zone: zone1
5555
foo: bar
5656
mylabel: myvalue
57+
externalStorageConfig:
58+
enabled: true
59+
multiPathConfig:
60+
blacklist:
61+
- vendor: "!QEMU"
62+
product: "!QEMU HARDDISK"
63+
blacklistWwids:
64+
- ".*"
65+
blacklistExceptions:
66+
- vendor: "DELL"
67+
product: "POWERVAULT"
68+
blacklistExceptionWwids:
69+
- "^0QEMU_QEMU_HARDDISK_disk[0-9]+"
70+
additionalKernelArguments: "multipath=on"
5771
install:
5872
mode: create
5973
management_interface:
@@ -427,6 +441,66 @@ os:
427441
mylabel: myvalue
428442
```
429443

444+
### `os.externalStorageConfig`
445+
446+
#### Definition
447+
448+
Setting that enables support for external storage devices (for example, storage area network (SAN) devices) that use multipath I/O (MPIO). In the multipath configuration (`multiPathConfig`), you can add devices to the blacklist and whitelist based on specific criteria: vendor, product names, or World Wide Identifiers (WWIDs).
449+
450+
When the setting is enabled, Harvester generates the `/etc/multipath.conf` file with the specified configuration, which the multipath daemon uses to manage storage devices.
451+
452+
#### Example
453+
454+
```yaml
455+
os:
456+
externalStorageConfig:
457+
enabled: true
458+
multiPathConfig:
459+
blacklist:
460+
- vendor: "!QEMU"
461+
product: "!QEMU HARDDISK"
462+
blacklistWwids:
463+
- ".*"
464+
blacklistExceptions:
465+
- vendor: "DELL"
466+
product: "POWERVAULT"
467+
blacklistExceptionWwids:
468+
- "^0QEMU_QEMU_HARDDISK_disk[0-9]+"
469+
```
470+
471+
This configuration generates the following `/etc/multipath.conf` file:
472+
473+
```conf
474+
blacklist {
475+
device {
476+
vendor "!QEMU"
477+
product "!QEMU HARDDISK"
478+
}
479+
wwid ".*"
480+
}
481+
482+
blacklist_exceptions {
483+
device {
484+
vendor "DELL"
485+
product "POWERVAULT"
486+
}
487+
wwid "^0QEMU_QEMU_HARDDISK_disk[0-9]+"
488+
}
489+
```
490+
491+
### `os.additionalKernelArguments`
492+
493+
#### Definition
494+
495+
Additional kernel parameters to be passed to the Linux kernel at boot time. These arguments are appended to the default kernel command line and can be used to enable specific kernel features, configure hardware settings, or modify kernel behavior. Common use cases include enabling multipath support, configuring hardware-specific settings, or debugging options.
496+
497+
#### Example
498+
499+
```yaml
500+
os:
501+
additionalKernelArguments: "multipath=on"
502+
```
503+
430504
### `os.sshd.sftp`
431505

432506
#### Definition

versioned_docs/version-v1.4/install/external-disk-support.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ os:
8080
additionalKernelArguments: "rd.iscsi.firmware vlan=enp4s0f0.2017:enp4s0f0 ip=10.115.48.10::10.115.55.254:255.255.248.0::enp4s0f0.2017:none"
8181
```
8282

83+
:::info important
84+
85+
The multiPathConfig structure changed starting in v1.7.0. While this change does not affect upgrades, you must review the [`os.externalStorageConfig`](/v1.7/install/harvester-configuration#osexternalstorageconfig) documentation before performing a fresh installation of v1.7.0 or later versions.
86+
87+
:::
88+
8389
The test setup uses multiple tagged VLANs, such as VLAN 2017 (used for connecting with the iSCSI volume) and VLAN 2011 (used for the Harvester management interface).
8490

8591
The kernel argument `vlan=enp4s0f0.2017:enp4s0f0 ip=10.115.48.10::10.115.55.254:255.255.248.0::enp4s0f0.2017:none` is necessary only if the iSCSI volume is accessible via an interface on a tagged VLAN. The arguments ensure that an additional tagged interface is created during boot and that a static address is allocated to the interface. See [dracut.cmdline](https://manpages.opensuse.org/Tumbleweed/dracut/dracut.cmdline.7.en.html) for more information about configuring the kernel arguments to match your use case.

versioned_docs/version-v1.5/install/external-disk-support.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ os:
8080
additionalKernelArguments: "rd.iscsi.firmware vlan=enp4s0f0.2017:enp4s0f0 ip=10.115.48.10::10.115.55.254:255.255.248.0::enp4s0f0.2017:none"
8181
```
8282

83+
:::warning
84+
85+
The `multiPathConfig` structure has changed since v1.7.0. Check the [latest configuration](/v1.7/install/harvester-configuration#osexternalstorageconfig) to set up your multipath configuration for fresh installations. This change will not impact upgrades.
86+
87+
:::
88+
8389
The test setup uses multiple tagged VLANs, such as VLAN 2017 (used for connecting with the iSCSI volume) and VLAN 2011 (used for the Harvester management interface).
8490

8591
The kernel argument `vlan=enp4s0f0.2017:enp4s0f0 ip=10.115.48.10::10.115.55.254:255.255.248.0::enp4s0f0.2017:none` is necessary only if the iSCSI volume is accessible via an interface on a tagged VLAN. The arguments ensure that an additional tagged interface is created during boot and that a static address is allocated to the interface. See [dracut.cmdline](https://manpages.opensuse.org/Tumbleweed/dracut/dracut.cmdline.7.en.html) for more information about configuring the kernel arguments to match your use case.

versioned_docs/version-v1.6/install/external-disk-support.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ os:
8080
additionalKernelArguments: "rd.iscsi.firmware vlan=enp4s0f0.2017:enp4s0f0 ip=10.115.48.10::10.115.55.254:255.255.248.0::enp4s0f0.2017:none"
8181
```
8282

83+
:::warning
84+
85+
The `multiPathConfig` structure has changed since v1.7.0. Check the [latest configuration](/v1.7/install/harvester-configuration#osexternalstorageconfig) to set up your multipath configuration for fresh installations. This change will not impact upgrades.
86+
87+
:::
88+
8389
The test setup uses multiple tagged VLANs, such as VLAN 2017 (used for connecting with the iSCSI volume) and VLAN 2011 (used for the Harvester management interface).
8490

8591
The kernel argument `vlan=enp4s0f0.2017:enp4s0f0 ip=10.115.48.10::10.115.55.254:255.255.248.0::enp4s0f0.2017:none` is necessary only if the iSCSI volume is accessible via an interface on a tagged VLAN. The arguments ensure that an additional tagged interface is created during boot and that a static address is allocated to the interface. See [dracut.cmdline](https://manpages.opensuse.org/Tumbleweed/dracut/dracut.cmdline.7.en.html) for more information about configuring the kernel arguments to match your use case.

0 commit comments

Comments
 (0)