Преглед на файлове

Merge pull request #14752 from jakesmith/hpcc-25623-fix-notes

HPCC-25623 Fix generated NOTES.txt if sasha.disabled

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman преди 4 години
родител
ревизия
37cd6c7da0
променени са 1 файла, в които са добавени 10 реда и са изтрити 7 реда
  1. 10 7
      helm/hpcc/templates/NOTES.txt

+ 10 - 7
helm/hpcc/templates/NOTES.txt

@@ -19,14 +19,17 @@ This chart has defined the following HPCC components:
 {{-   end -}}
 {{-  end -}}
 {{- end }}
-{{- range $serviceName, $_service := .Values.sasha }}
-{{-  $service := ($_service | default dict) -}}
-{{-  if not $service.disabled -}}
-{{-   if hasKey $names $serviceName -}}
-{{-    required ( printf "Component name %s in section sasha was already seen in section %s" $serviceName (get $names $serviceName)) nil -}}
-{{-   else }}
+{{- $sashaServices := $.Values.sasha | default dict -}}
+{{- if not $sashaServices.disabled -}}
+{{-  range $serviceName, $_service := $sashaServices }}
+{{-   $service := ($_service | default dict) -}}
+{{-   if not $service.disabled -}}
+{{-    if hasKey $names $serviceName -}}
+{{-     required ( printf "Component name %s in section sasha was already seen in section %s" $serviceName (get $names $serviceName)) nil -}}
+{{-    else }}
   sasha.{{ $serviceName }}
+{{-    end -}}
 {{-   end -}}
-{{-  end -}}
+{{-  end }}
 {{- end }}