Remove helm chart for GPU DRA driver in favor of one for ComputeDomains

This is done despite the fact that the name of the helm chart is
nvidia-dra-driver-gpu. A future commit will add the safeguards to ensure
that enabling the GPU DRA driver is not allowed (even if it is the
default).

Signed-off-by: Kevin Klues <[email protected]>

Author: klueska

Makefile

@@ -109,12 +109,9 @@ generate-crds: generate-deepcopy .remove-crds
 			paths=$(CURDIR)/$${dir} \
 			output:crd:dir=$(CURDIR)/deployments/helm/tmp_crds; \
 	done
-	mkdir -p $(CURDIR)/deployments/helm/$(GPU_DRIVER_NAME)/crds
+	mkdir -p $(CURDIR)/deployments/helm/$(HELM_DRIVER_NAME)/crds
 	cp -R $(CURDIR)/deployments/helm/tmp_crds/* \
-		$(CURDIR)/deployments/helm/$(GPU_DRIVER_NAME)/crds
-	mkdir -p $(CURDIR)/deployments/helm/$(IMEX_DRIVER_NAME)/crds
-	cp -R $(CURDIR)/deployments/helm/tmp_crds/* \
-		$(CURDIR)/deployments/helm/$(IMEX_DRIVER_NAME)/crds
+		$(CURDIR)/deployments/helm/$(HELM_DRIVER_NAME)/crds
 	rm -rf $(CURDIR)/deployments/helm/tmp_crds
 
 
@@ -166,7 +163,7 @@ generate-clientset: .remove-clientset
 	rm -rf $(CURDIR)/pkg/tmp_clientset
 
 .remove-crds:
-	rm -rf $(CURDIR)/deployments/helm/$(DRIVER_NAME)/crds
+	rm -rf $(CURDIR)/deployments/helm/$(HELM_DRIVER_NAME)/crds
 
 .remove-deepcopy:
 	for dir in $(DEEPCOPY_SOURCES); do \

demo/clusters/gke/install-dra-gpu-driver.sh renamed to demo/clusters/gke/install-dra-driver-gpu.sh

@@ -29,7 +29,7 @@ DRIVER_NAME=$(from_versions_mk "DRIVER_NAME")
 : ${IMAGE_NAME:=${DRIVER_NAME}}
 : ${IMAGE_TAG:=6c34f5fb-ubi8}
 
-helm upgrade -i --create-namespace --namespace nvidia nvidia-dra-gpu-driver ${PROJECT_DIR}/deployments/helm/k8s-dra-gpu-driver \
+helm upgrade -i --create-namespace --namespace nvidia nvidia-dra-driver-gpu ${PROJECT_DIR}/deployments/helm/nvidia-dra-driver-gpu \
   --set image.repository=${IMAGE_REGISTRY}/${IMAGE_NAME} \
   --set image.tag=${IMAGE_TAG} \
   --set image.pullPolicy=Always \

demo/clusters/gke/install-dra-imex-driver.sh

@@ -24,7 +24,7 @@ source "${CURRENT_DIR}/scripts/common.sh"
 
 kubectl label node -l node-role.x-k8s.io/worker --overwrite nvidia.com/gpu.present=true
 
-helm upgrade -i --create-namespace --namespace nvidia nvidia-dra-gpu-driver ${PROJECT_DIR}/deployments/helm/k8s-dra-gpu-driver \
+helm upgrade -i --create-namespace --namespace nvidia nvidia-dra-driver-gpu ${PROJECT_DIR}/deployments/helm/nvidia-dra-driver-gpu \
     ${NVIDIA_CTK_PATH:+--set nvidiaCtkPath=${NVIDIA_CTK_PATH}} \
     ${NVIDIA_DRIVER_ROOT:+--set nvidiaDriverRoot=${NVIDIA_DRIVER_ROOT}} \
     ${MASK_NVIDIA_DRIVER_PARAMS:+--set maskNvidiaDriverParams=${MASK_NVIDIA_DRIVER_PARAMS}} \

demo/clusters/kind/install-dra-gpu-driver.sh renamed to demo/clusters/kind/install-dra-driver-gpu.sh

@@ -19,4 +19,4 @@ CURRENT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
 
 : ${MASK_NVIDIA_DRIVER_PARAMS:="true"}
 export MASK_NVIDIA_DRIVER_PARAMS
-exec ${CURRENT_DIR}/../kind/install-dra-gpu-driver.sh
+exec ${CURRENT_DIR}/../kind/install-dra-driver-gpu.sh