fix render package templates

universal-itengineer · universal-itengineer · commit 03b7a044770c · 2025-06-01T14:43:54.000+03:00
Signed-off-by: Nikita Korolev &lt;nikita.korolev@flant.com&gt;
diff --git a/.werf/defines/helpers.tmpl b/.werf/defines/helpers.tmpl
@@ -110,3 +110,30 @@ Same as ImageName
 {{- if .PkgModuleName }}{{ .PkgModuleName }}/{{ end -}}
 {{ end }}
 
+{{/*========*/}}
+
+{{ define "Versions" }}
+
+{{-     $_ := set . "Version" dict -}}
+{{-     $_ := set . "Package" dict -}}
+{{-     $versions_path := "" -}}
+{{-     $versions_map := "component_versions/version_map.yml" -}}
+
+{{-     if .ModuleName -}}
+{{-       $module_versions_ctx := (printf "s%modules/s%-s%/" .ModulePath .ModulePriority .ModuleName )  }}
+{{-       $versions_path = (printf "s%s%" $module_versions_ctx $versions_map) -}}
+{{-     else -}}
+{{-       $versions_path = $versions_map -}}
+{{-     end -}}
+
+{{-   $versions_ctx := (.Files.Get $versions_path | fromYaml) -}}
+
+{{-   range $k, $v := $versions_ctx.firmware -}}
+{{-     $_ := set $.Version $k $v -}}
+{{-   end -}}
+
+{{-   range $k, $v := $versions_ctx.package -}}
+{{-     $_ := set $.Package $k $v -}}
+{{-    end -}}
+
+{{ end }}
diff --git a/.werf/defines/parse-base-images-map.tmpl b/.werf/defines/parse-base-images-map.tmpl
@@ -1,24 +1,24 @@
 {{- define "parse_base_images_map" }}
-  {{- $virtualizationImages := .Files.Get "base-images/virtualization_images.yml" | fromYaml }}
-  {{- $deckhouseImages := .Files.Get "base-images/deckhouse_images.yml" | fromYaml }}
+  {{- $virtualizationImages := .Files.Get "base-images/virtualization_images.yml" | fromYaml -}}
+  {{- $deckhouseImages := .Files.Get "base-images/deckhouse_images.yml" | fromYaml -}}
   
   # virtualizationImages have image format:
   # BASE_IMAGE: "<image_name>@sha256abcde12345
   {{- range $k, $v := $virtualizationImages }}
-    {{ $baseImagePath := (printf "%s%s" $virtualizationImages.REGISTRY_PATH (trimSuffix "/" $v)) }}
-    {{- if ne $k "REGISTRY_PATH" }}
-      {{- $_ := set $virtualizationImages $k $baseImagePath }}
-    {{- end }}
+    {{ $baseImagePath := (printf "%s%s" $virtualizationImages.REGISTRY_PATH (trimSuffix "/" $v)) -}}
+    {{- if ne $k "REGISTRY_PATH" -}}
+      {{- $_ := set $virtualizationImages $k $baseImagePath -}}
+    {{- end -}}
   {{- end }}
   {{- $_ := unset $virtualizationImages "REGISTRY_PATH" }}
   
   # deckhouse_images has a format
   # <prefix>/<name>: "sha256:abcde12345
-  {{- range $k, $v := $deckhouseImages }}
-    {{ $baseImagePath := (printf "%s@%s" $deckhouseImages.REGISTRY_PATH (trimSuffix "/" $v)) }}
-    {{- if ne $k "REGISTRY_PATH" }}
-      {{- $_ := set $deckhouseImages $k $baseImagePath }}
-    {{- end }}
+  {{- range $k, $v := $deckhouseImages -}}
+    {{ $baseImagePath := (printf "%s@%s" $deckhouseImages.REGISTRY_PATH (trimSuffix "/" $v)) -}}
+    {{- if ne $k "REGISTRY_PATH" -}}
+      {{- $_ := set $deckhouseImages $k $baseImagePath -}}
+    {{- end -}}
   {{- end }}
   {{- $_ := unset $deckhouseImages "REGISTRY_PATH" }}
 
diff --git a/.werf/defines/process-images.tmpl b/.werf/defines/process-images.tmpl
@@ -24,6 +24,8 @@
 {{-    $_ := set $ctx "SOURCE_REPO_GIT" $Root.SOURCE_REPO_GIT }}
 {{-    $_ := set $ctx "MODULE_EDITION" $Root.MODULE_EDITION }}
 {{-    $_ := set $ctx "Version" $Root.Version }}
+{{-    $_ := set $ctx "Package" $Root.Package }}
+
 
 {{-    include "module_image_template" $ctx }}
 
diff --git a/.werf/defines/process-packages-images.tmpl b/.werf/defines/process-packages-images.tmpl
@@ -8,20 +8,6 @@
 {{ define "process_packages_images" }}
 {{-   $Root := . }}
 
-{{- /* need change nested values Version and Packages */ -}}
-{{- $_ := set $Root "Version" dict -}}
-{{- $_ := set $Root "Packages" dict -}}
-
-{{-    $versions_ctx := (.Files.Get "component_versions/version_map.yml" | fromYaml) }}
-{{-    range $k, $v := $versions_ctx.firmware }}
-{{-      $_ := set $Root.Version $k $v }}
-{{-    end }}
-
-{{-    range $k, $v := $versions_ctx.package }}
-{{-      $_ := set $Root.Packages $k $v }}
-{{-    end }}
-{{- /* ================== */ -}}
-
 {{-   $packagesGlob := "images/packages/*/*/werf.inc.yaml" }}
 {{-   $packagesRegex := "^images/(packages)/([0-9a-z-_]+)/([0-9a-z-_]+)/(werf.inc.yaml)$" }}
 
@@ -39,8 +25,8 @@
 {{-      $_ := set $ctx "SOURCE_REPO" $Root.SOURCE_REPO }}
 {{-      $_ := set $ctx "SOURCE_REPO_GIT" $Root.SOURCE_REPO_GIT }}
 {{-      $_ := set $ctx "MODULE_EDITION" $Root.MODULE_EDITION }}
-{{-      $_ := set $ctx "Version" $Root.Version }}
-{{-      $_ := set $ctx "Package" $Root.Packages }}
+{{-      $_ := set $ctx "FirmwareVersion" $Root.Version }}
+{{-      $_ := set $ctx "PackageVersion" $Root.Package }}
 
 {{-      include "module_image_template" $ctx }}
 
diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml
@@ -120,8 +120,8 @@ image: {{ include "ImageName" (tuple . .ImageName "cbuilder") }}
 final: false
 fromImage: builder/golang-bookworm-1.23
 git:
-  - add: {{ include "PreffixPath" . }}/images/{{ $.ImageName }}/src
-    to: /static_binaries
+  - add: {{ include "PreffixPath" . }}/images/{{ $.ImageName }}
+    to: /
     includePaths:
     - static_binaries
     stageDependencies:
diff --git a/images/packages/binaries/acl/werf.inc.yaml b/images/packages/binaries/acl/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "acl.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/bzip2/werf.inc.yaml b/images/packages/binaries/bzip2/werf.inc.yaml
@@ -8,7 +8,7 @@ import:
   to: /{{ $.ImageName }}
   before: setup
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "bzip2/bzip2.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/dmidecode/werf.inc.yaml b/images/packages/binaries/dmidecode/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "dmidecode.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/file/werf.inc.yaml b/images/packages/binaries/file/werf.inc.yaml
@@ -8,7 +8,7 @@ import:
   to: /{{ $.ImageName }}
   before: setup
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "file/file.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/glib2/werf.inc.yaml b/images/packages/binaries/glib2/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "GNOME/glib.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/glibc/werf.inc.yaml b/images/packages/binaries/glibc/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "glibc.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/gnutls/werf.inc.yaml b/images/packages/binaries/gnutls/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "gnutls/gnutls.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/libattr/werf.inc.yaml b/images/packages/binaries/libattr/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "attr.git" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
diff --git a/images/packages/binaries/libaudit/werf.inc.yaml b/images/packages/binaries/libaudit/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "linux-audit/audit-userspace.git" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
diff --git a/images/packages/binaries/libblkid/werf.inc.yaml b/images/packages/binaries/libblkid/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "util-linux/util-linux.git" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
diff --git a/images/packages/binaries/libbrotli/werf.inc.yaml b/images/packages/binaries/libbrotli/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "google/brotli.git" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
diff --git a/images/packages/binaries/libbsd/werf.inc.yaml b/images/packages/binaries/libbsd/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "libbsd/libbsd.git" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
diff --git a/images/packages/binaries/libburn/werf.inc.yaml b/images/packages/binaries/libburn/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "libburnia/libburn.git" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
diff --git a/images/packages/binaries/libtpms/werf.inc.yaml b/images/packages/binaries/libtpms/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "stefanberger/libtpms.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "nbdkit/nbdkit.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/nftables/werf.inc.yaml b/images/packages/binaries/nftables/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "nftables.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/numactl/werf.inc.yaml b/images/packages/binaries/numactl/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "numactl/numactl.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/openssl/werf.inc.yaml b/images/packages/binaries/openssl/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "openssl/openssl.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/swtpm/werf.inc.yaml b/images/packages/binaries/swtpm/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "stefanberger/swtpm.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/images/packages/binaries/xorriso/werf.inc.yaml b/images/packages/binaries/xorriso/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   before: setup
 
 ---
-{{- $version := get $.Package $.ImageName }}
+{{- $version := get $.PackageVersion $.ImageName }}
 {{- $gitRepoUrl := "libburnia/libisoburn.git" }}
 {{- $PkgImageName := (printf "%s/%s" $.PackagePath $.ImageName) }}
 
diff --git a/werf.yaml b/werf.yaml
@@ -25,25 +25,28 @@ build:
 {{- $_ := set . "DistroPackagesProxy" (env "DISTRO_PACKAGES_PROXY" "") }}
 
 # Component versions
+{{ include "Versions" . }}
+
+{{/*
 {{ $_ := set . "Version" dict }}
-{{ $_ := set . "Packages" dict }}
+{{ $_ := set . "Package" dict }}
 {{- $versions_ctx := (.Files.Get "component_versions/version_map.yml" | fromYaml) }}
 
 {{- range $k, $v := $versions_ctx.firmware }}
   {{- $_ := set $.Version $k $v}}
 {{- end }}
 
 {{- range $k, $v := $versions_ctx.package }}
-  {{- $_ := set $.Packages $k $v}}
+  {{- $_ := set $.Package $k $v}}
 {{- end }}
+*/}}
 
 {{- $_ := set $ "ImagesIDList" list }}
 
 {{- range $path, $content := .Files.Glob ".werf/*.yaml" }}
   {{- tpl $content $ }}
 {{- end }}
 
-
 ---
 image: images-digests
 fromImage: builder/alpine
