address comments

Author: lilypan26

parts/linux/cloud-init/artifacts/cse_config.sh

@@ -1149,24 +1149,17 @@ EOF
 }
 
 configureManagedGPUExperience() {
-    if [ "$?" -ne 0 ] && [ "${GPU_NODE}" = "true" ] && [ "${skip_nvidia_driver_install}" != "true" ]; then
-        echo "failed to determine if managed GPU experience should be enabled by nodepool tags"
-        exit $ERR_LOOKUP_ENABLE_MANAGED_GPU_EXPERIENCE_TAG
-    elif [ "${GPU_NODE}" = "true" ] && [ "${skip_nvidia_driver_install}" != "true" ] && [ "${ENABLE_MANAGED_GPU_EXPERIENCE}" = "true" ]; then
+    if [ "${GPU_NODE}" = "true" ] && [ "${skip_nvidia_driver_install}" != "true" ] && [ "${ENABLE_MANAGED_GPU_EXPERIENCE}" = "true" ]; then
         logs_to_events "AKS.CSE.installNvidiaManagedExpPkgFromCache" "installNvidiaManagedExpPkgFromCache" || exit $ERR_NVIDIA_DCGM_INSTALL
         logs_to_events "AKS.CSE.startNvidiaManagedExpServices" "startNvidiaManagedExpServices" || exit $ERR_NVIDIA_DCGM_EXPORTER_FAIL
 
-        # Add node label to indicate DCGM exporter is enabled
-        DCGM_EXPORTER_LABEL="kubernetes.azure.com/dcgm-exporter=enabled"
-        addKubeletNodeLabel $DCGM_EXPORTER_LABEL
+        addKubeletNodeLabel "kubernetes.azure.com/dcgm-exporter=enabled"
     elif [ "${GPU_NODE}" = "true" ] && [ "${skip_nvidia_driver_install}" != "true" ] && [ "${ENABLE_MANAGED_GPU_EXPERIENCE}" = "false" ]; then
         logs_to_events "AKS.CSE.stop.nvidia-device-plugin" "systemctlDisableAndStop nvidia-device-plugin"
         logs_to_events "AKS.CSE.stop.nvidia-dcgm" "systemctlDisableAndStop nvidia-dcgm"
         logs_to_events "AKS.CSE.stop.nvidia-dcgm-exporter" "systemctlDisableAndStop nvidia-dcgm-exporter"
 
-        # Add node label to indicate DCGM exporter is disabled
-        DCGM_EXPORTER_LABEL="kubernetes.azure.com/dcgm-exporter=disabled"
-        addKubeletNodeLabel $DCGM_EXPORTER_LABEL
+        addKubeletNodeLabel "kubernetes.azure.com/dcgm-exporter=disabled"
     fi
 }
 

parts/linux/cloud-init/artifacts/cse_main.sh

@@ -397,6 +397,10 @@ function nodePrep {
 
     export -f enableManagedGPUExperience
     ENABLE_MANAGED_GPU_EXPERIENCE=$(retrycmd_silent 10 1 10 bash -cx enableManagedGPUExperience)
+    if [ "$?" -ne 0 ] && [ "${GPU_NODE}" = "true" ] && [ "${skip_nvidia_driver_install}" != "true" ]; then
+        echo "failed to determine if managed GPU experience should be enabled by nodepool tags"
+        exit $ERR_LOOKUP_ENABLE_MANAGED_GPU_EXPERIENCE_TAG
+    fi
     logs_to_events "AKS.CSE.configureManagedGPUExperience" configureManagedGPUExperience || exit $ERR_ENABLE_MANAGED_GPU_EXPERIENCE
 
     VALIDATION_ERR=0