NVIDIA / holodeck / 22684084891

push

github

merge: resolve conflicts with upstream/main

Merge upstream/main into feat/565-custom-template-types. Resolved
conflicts in types.go and zz_generated.deepcopy.go by keeping all
upstream changes (cluster support, driver sources, etc.) and adding
CustomTemplate types and deepcopy methods in correct alphabetical
positions.

Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>

2249 of 4923 new or added lines in 35 files covered. (45.68%)

2657 of 5487 relevant lines covered (48.42%)

0.55 hits per line