Merge branch 'fix-nvd-render' into 'master'

fix the yaml rendering of the default NvidiaDriver CR See merge request nvidia/kubernetes/gpu-operator!896
NVIDIA · Oct 13, 2023 · 3f995d4 · 3f995d4
2 parents 1b4466e + dfa3a5c
commit 3f995d4
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/deployments/gpu-operator/templates/nvidiadriver.yaml b/deployments/gpu-operator/templates/nvidiadriver.yaml
@@ -13,38 +13,38 @@ spec:
   nodeSelector: {{ toYaml .Values.driver.nvidiaDriverCRD.nodeSelector | nindent 6 }}
   {{- end }}
   {{- if .Values.driver.manager }}
-  manager: {{ toYaml .Values.driver.manager | nindent 6 }}
+  manager: {{ toYaml .Values.driver.manager | nindent 4 }}
   {{- end }}
   {{- if .Values.driver.startupProbe }}
-  startupProbe: {{ toYaml .Values.driver.startupProbe | nindent 6 }}
+  startupProbe: {{ toYaml .Values.driver.startupProbe | nindent 4 }}
   {{- end }}
   {{- if .Values.driver.livenessProbe }}
-  livenessProbe: {{ toYaml .Values.driver.livenessProbe | nindent 6 }}
+  livenessProbe: {{ toYaml .Values.driver.livenessProbe | nindent 4 }}
   {{- end }}
   {{- if .Values.driver.readinessProbe }}
-  readinessProbe: {{ toYaml .Values.driver.readinessProbe | nindent 6 }}
+  readinessProbe: {{ toYaml .Values.driver.readinessProbe | nindent 4 }}
   {{- end }}
   rdma:
     enabled: {{ .Values.driver.rdma.enabled }}
     useHostMofed: {{ .Values.driver.rdma.useHostMofed }}
-  {{- if .Values.driver.repoConfig }}
+  {{- if .Values.driver.repoConfig.configMapName }}
   repoConfig:
     name: {{ .Values.driver.repoConfig.configMapName }}
   {{- end }}
-  {{- if .Values.driver.certConfig }}
+  {{- if .Values.driver.certConfig.name }}
   certConfig:
     name: {{ .Values.driver.certConfig.name }}
   {{- end }}
-  {{- if .Values.driver.licensingConfig }}
+  {{- if .Values.driver.licensingConfig.configMapName }}
   licensingConfig:
     name: {{ .Values.driver.licensingConfig.configMapName }}
     nlsEnabled: {{ .Values.driver.licensingConfig.nlsEnabled | default true }}
   {{- end }}
-  {{- if .Values.driver.virtualTopology }}
+  {{- if .Values.driver.virtualTopology.config }}
   virtualTopologyConfig:
     name: {{ .Values.driver.virtualTopology.config }}
   {{- end }}
-  {{- if .Values.driver.kernelModuleConfig }}
+  {{- if .Values.driver.kernelModuleConfig.name }}
   kernelModuleConfig:
     name: {{ .Values.driver.kernelModuleConfig.name }}
   {{- end }}