address review: drop enabled for shimDownloaderConfig

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Author: Shunpoco

.github/workflows/helm-chart-smoketest.yml

@@ -151,8 +151,9 @@ jobs:
             --set rcm.nodeInstallerImage.tag=chart-test \
             --set rcm.shimDownloaderImage.repository=shim-downloader \
             --set rcm.shimDownloaderImage.tag=chart-test \
-            --set rcm.shimDownloaderConfig.enabled=true \
             --set rcm.shimDownloaderConfig.configMapName=configmap-test \
+            --set rcm.shimDownloaderConfig.content.numRetry=5 \
+            --set rcm.shimDownloaderConfig.content.sleepDuration=3 \
             deploy/helm
 
       - name: apply Spin shim

deploy/helm/templates/deployment.yaml

@@ -49,7 +49,7 @@ spec:
             value: "{{ .Values.rcm.nodeInstallerImage.repository }}:{{ .Values.rcm.nodeInstallerImage.tag | default .Chart.AppVersion }}"
           - name: SHIM_NODE_INSTALLER_JOB_TTL
             value: "{{ .Values.rcm.nodeInstallerJob.ttl | default 0 }}"
-          {{- if .Values.rcm.shimDownloaderConfig.enabled }}
+          {{- if .Values.rcm.shimDownloaderConfig }}
           - name: SHIM_DOWNLOADER_CONFIG_MAP
             value: "{{ .Values.rcm.shimDownloaderConfig.configMapName }}"
           {{- end }}
@@ -83,13 +83,13 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- if .Values.rcm.shimDownloaderConfig.enabled }}
+{{- if .Values.rcm.shimDownloaderConfig }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Values.rcm.shimDownloaderConfig.configMapName }}
 data:
-  NUM_RETRY: "{{ .Values.rcm.shimDownloaderConfig.content.numRetry }}"
-  SLEEP_DURATION: "{{ .Values.rcm.shimDownloaderConfig.content.sleepDuration }}"
+  NUM_RETRY: "{{ .Values.rcm.shimDownloaderConfig.content.numRetry | default 3 }}"
+  SLEEP_DURATION: "{{ .Values.rcm.shimDownloaderConfig.content.sleepDuration | default 2 }}"
 {{- end }}

deploy/helm/values.yaml

@@ -21,12 +21,11 @@ rcm:
     ttl: 0
   leaderElectEnabled: false
   # shimDownloaderConfig generates a ConfigMap which sets a downloader container's variables. Since those variables have defaults, you don't need to enable it unless you want to customize them.
-  shimDownloaderConfig:
-    enabled: false
-    configMapName: shim-downloader-config
-    content:
-      numRetry: 3
-      sleepDuration: 2
+  # shimDownloaderConfig:
+  #   configMapName: shim-downloader-config
+  #   content:
+  #     numRetry: 3
+  #     sleepDuration: 2
 
 imagePullSecrets: []
 nameOverride: ""