fix minor issues with templates

Signed-off-by: Rahul Sharma <[email protected]>
(cherry picked from commit d834539)

Author: rahulait

deployments/gpu-operator/templates/cleanup_crd.yaml

@@ -35,6 +35,7 @@ spec:
           image: {{ include "gpu-operator.fullimage" . }}
           imagePullPolicy: {{ .Values.operator.imagePullPolicy }}
           command:
+<<<<<<< HEAD
           - sh
           - -c
           - >
@@ -46,5 +47,15 @@ spec:
               kubectl delete crd nodefeaturegroups.nfd.k8s-sigs.io --ignore-not-found=true;
               kubectl delete crd nodefeaturerules.nfd.k8s-sigs.io --ignore-not-found=true;
             {{- end }}
+=======
+            - /usr/bin/manage-crds
+          args:
+            - delete
+            - --filepath=/opt/gpu-operator/nvidia.com_clusterpolicies.yaml
+            - --filepath=/opt/gpu-operator/nvidia.com_nvidiadrivers.yaml
+        {{- if .Values.nfd.enabled }}
+            - --filepath=/opt/gpu-operator/nfd-api-crds.yaml
+        {{- end }}
+>>>>>>> d834539c (fix minor issues with templates)
       restartPolicy: OnFailure
 {{- end }}

deployments/gpu-operator/templates/clusterpolicy.yaml

@@ -141,7 +141,6 @@ spec:
       env: []
       {{- end }}
     {{- end }}
-
   mig:
     {{- if .Values.mig.strategy }}
     strategy: {{ .Values.mig.strategy }}
@@ -150,7 +149,9 @@ spec:
     enabled: {{ .Values.psa.enabled }}
   cdi:
     enabled: {{ .Values.cdi.enabled }}
+    {{- if .Values.cdi.default }}
     default: {{ .Values.cdi.default }}
+    {{- end }}
   driver:
     enabled: {{ .Values.driver.enabled }}
     useNvidiaDriverCRD: {{ .Values.driver.nvidiaDriverCRD.enabled }}
@@ -411,7 +412,7 @@ spec:
     resources: {{ toYaml .Values.ccManager.resources | nindent 6 }}
     {{- end }}
     {{- if .Values.ccManager.env }}
-    env: {{ toYaml .Values.vfioManager.env | nindent 6 }}
+    env: {{ toYaml .Values.ccManager.env | nindent 6 }}
     {{- end }}
     {{- if .Values.ccManager.args }}
     args: {{ toYaml .Values.ccManager.args | nindent 6 }}