Revert "In the helm_lib_module_image helper, we need to insert the lowerCamelCase module name (#142)" (#149)

This reverts commit ab830b4.

Signed-off-by: Pavel Okhlopkov <[email protected]>

Author: ldmonster

charts/helm_lib/templates/_module_image.tpl

@@ -19,7 +19,7 @@
     {{- if index $context.Values $moduleName "registry" }}
       {{- if index $context.Values $moduleName "registry" "base" }}
         {{- $host := trimAll "/" (index $context.Values $moduleName "registry" "base") }}
-        {{- $path := trimAll "/" $moduleName }}
+        {{- $path := trimAll "/" (include "helm_lib_module_kebabcase_name" $rawModuleName) }}
         {{- $registryBase = join "/" (list $host $path) }}
       {{- end }}
     {{- end }}
@@ -33,19 +33,18 @@
 {{- define "helm_lib_module_image_no_fail" }}
   {{- $context := index . 0 }} {{- /* Template context with .Values, .Chart, etc */ -}}
   {{- $containerName := index . 1 | trimAll "\"" }} {{- /* Container name */ -}}
-  {{- $rawModuleName := $context.Chart.Name }}
+  {{- $moduleName := (include "helm_lib_module_camelcase_name" $context) }}
   {{- if ge (len .) 3 }}
-  {{- $rawModuleName = (index . 2) }} {{- /* Optional module name */ -}}
+  {{- $moduleName = (include "helm_lib_module_camelcase_name" (index . 2)) }} {{- /* Optional module name */ -}}
   {{- end }}
-  {{- $moduleName := (include "helm_lib_module_camelcase_name" $rawModuleName) }}
   {{- $imageDigest := index $context.Values.global.modulesImages.digests $moduleName $containerName }}
   {{- if $imageDigest }}
     {{- $registryBase := $context.Values.global.modulesImages.registry.base }}
     {{- if index $context.Values $moduleName }}
       {{- if index $context.Values $moduleName "registry" }}
         {{- if index $context.Values $moduleName "registry" "base" }}
           {{- $host := trimAll "/" (index $context.Values $moduleName "registry" "base") }}
-          {{- $path := trimAll "/" $moduleName }}
+          {{- $path := trimAll "/" $context.Chart.Name }}
           {{- $registryBase = join "/" (list $host $path) }}
         {{- end }}
       {{- end }}
@@ -102,12 +101,11 @@
 {{- define "helm_lib_module_image_digest_no_fail" }}
   {{- $context := index . 0 }} {{- /* Template context with .Values, .Chart, etc */ -}}
   {{- $containerName := index . 1 | trimAll "\"" }} {{- /* Container name */ -}}
-  {{- $rawModuleName := $context.Chart.Name }}
+  {{- $moduleName := (include "helm_lib_module_camelcase_name" $context) }}
   {{- if ge (len .) 3 }}
-  {{- $rawModuleName = (index . 2) }} {{- /* Optional module name */ -}}
+  {{- $moduleName = (include "helm_lib_module_camelcase_name" (index . 2)) }} {{- /* Optional module name */ -}}
   {{- end }}
-  {{- $moduleName := (include "helm_lib_module_camelcase_name" $rawModuleName) }}
   {{- $moduleMap := index $context.Values.global.modulesImages.digests $moduleName | default dict }}
   {{- $imageDigest := index $moduleMap $containerName | default "" }}
   {{- printf "%s" $imageDigest }}
-{{- end }}
+{{- end }}

tests/tests/helm_lib_module_image_test.yaml

@@ -39,13 +39,13 @@ tests:
     asserts:
       - equal:
           path: "externalModuleImage"
-          value: "registry.deckhouse.io/modules/testModule@sha321"
+          value: "registry.deckhouse.io/modules/test-module@sha321"
       - equal:
           path: "externalModuleImageWithOptionalName"
-          value: "registry.flant.com/modules/someModule@sha543"
+          value: "registry.flant.com/modules/some-module@sha543"
       - equal:
           path: "externalModuleKebabImageWithOptionalName"
-          value: "registry.flant.com/modules/someModule@sha543"
+          value: "registry.flant.com/modules/some-module@sha543"
 
   - it: should render external module image with trail slash
     documentIndex: 1
@@ -59,7 +59,7 @@ tests:
     asserts:
       - equal:
           path: "externalModuleImage"
-          value: "registry.deckhouse.io/modules/testModule@sha321"
+          value: "registry.deckhouse.io/modules/test-module@sha321"
 
   - it: should render external module image digest
     documentIndex: 2
@@ -115,4 +115,4 @@ tests:
           value: "registry.deckhouse.io/deckhouse/ce@sha999"
       - equal:
           path: "commonImageNoFailNotExist"
-          value: null
+          value: null