- Use golang builders from deckhouse images

diafour · diafour · commit 0415f0e5869c · 2025-05-14T11:46:58.000+03:00
- Cleanup virtualization_images.yml file.

Signed-off-by: Ivan Mikheykin &lt;ivan.mikheykin@flant.com&gt;
diff --git a/base-images/virtualization_images.yml b/base-images/virtualization_images.yml
@@ -3,11 +3,7 @@ REGISTRY_PATH: "docker.io/"
 
 # Virtualization images
 BASE_DEBIAN_BOOKWORM_SLIM: "debian:bookworm-slim@sha256:e9ac68ffde903b241342267a51cd74c5417414af652cb2e380c6ddcf522589bc"
-BASE_CONTAINER_REGISTRY: "registry:2.8.3@sha256:ac0192b549007e22998eb74e8d8488dcfe70f1489520c3b144a6047ac5efbe90"
-BASE_GOLANG_22_BOOKWORM: "golang:1.22.12-bookworm@sha256:3d699e4d15d0f8f13c9195c0632a16702b8cbdece2955af1c23b37ae5d55a253"
-BASE_GOLANG_23_BOOKWORM: "golang:1.23.9-bookworm@sha256:26ca07ec0684ebe2154ad45a3a03710edb90b9cfc3769bead74ebcf6644dc759"
 
 BASE_ALT_P10: "alt:p10@sha256:4fab03b8d23eb16147397b0bc41a5025ba59f4e834f7fb4b933ac5206431d740"
 # Digest for image created at 2024-09-20.
 BASE_ALT_P11: "alt:p11@sha256:39f03d3bca1a92dc36835c28c2ba2f22ec15257e950b3930e0a3f034466e8dfb"
-BASE_ALPINE: "alpine:3.17.10@sha256:3451da08fc6ef554a100da3e2df5ac6d598c82f2a774d5f6ed465c3d80cd163a"
diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml
@@ -3,7 +3,7 @@
 ---
 image: {{ $.ImageName }}
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 mount:
   - fromPath: ~/go-pkg-cache
     to: /go/pkg
diff --git a/images/cdi-cloner/werf.inc.yaml b/images/cdi-cloner/werf.inc.yaml
@@ -51,7 +51,7 @@ shell:
 ---
 image: {{ $.ImageName }}-gobuild
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
   - add: /images/{{ $.ImageName }}/cloner-startup
     to: /app
diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}-builder
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
 - add: /images/{{ $.ImageName }}
   to: /src
diff --git a/images/hooks/werf.inc.yaml b/images/hooks/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
 - add: /images/{{ $.ImageName }}
   to: /app/images/hooks
diff --git a/images/kube-api-rewriter/werf.inc.yaml b/images/kube-api-rewriter/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}-builder
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
   - add: /images/{{ $.ImageName }}
     to: /src/kube-api-rewriter
diff --git a/images/pre-delete-hook/werf.inc.yaml b/images/pre-delete-hook/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: pre-delete-hook-builder
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
 - add: /images/{{ $.ImageName }}
   to: /pre-delete-hook
diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml
@@ -1,7 +1,6 @@
 ---
 # Source https://github.com/kubevirt/kubevirt/blob/v1.3.1/hack/dockerized#L15
 {{- $version := "1.3.1" }}
-{{- $goVersion := "1.22.12" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
@@ -59,7 +58,6 @@ shell:
         echo -n "Apply ${p} ... "
         git apply  --ignore-space-change --ignore-whitespace ${p} && echo OK || (echo FAIL ; exit 1)
       done
-    - go mod edit -go={{ $goVersion }}
     - go mod download
     - echo Update modules to mitigate CVEs...
     - |
@@ -72,9 +70,9 @@ shell:
       go get github.com/cilium/ebpf/internal@v0.11.0
 
       # CVE-2024-45337,CVE-2025-22869
-      go get golang.org/x/crypto@v0.38.0
+      go mod edit -replace golang.org/x/crypto=golang.org/x/crypto@v0.38.0
       # CVE-2025-22870, CVE-2025-22872
-      go get golang.org/x/net@v0.40.0
+      go mod edit -replace golang.org/x/net=golang.org/x/net@v0.40.0
 
     - go mod vendor
 
diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
@@ -436,7 +436,7 @@ shell:
 ---
 image: {{ $.ImageName }}-gobuilder
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
   - add: /images/{{ $.ImageName }}/node-labeller
     to: /node-labeller
diff --git a/images/virtualization-artifact/werf.inc.yaml b/images/virtualization-artifact/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
 - add: /api
   to: /usr/local/go/api
diff --git a/images/vm-route-forge/go.mod b/images/vm-route-forge/go.mod
@@ -23,22 +23,6 @@ replace github.com/deckhouse/virtualization/api => ./../../api
 
 replace golang.org/x/net => golang.org/x/net v0.40.0 // CVE-2025-22870, CVE-2025-22872
 
-// TODO: delete this replaces after fixing https://github.com/golang/go/issues/66403.
-//replace (
-//	github.com/cilium/proxy => github.com/cilium/proxy v0.0.0-20231202123106-38b645b854f3
-//	github.com/markbates/safe => github.com/markbates/safe v1.0.1
-//	github.com/youmark/pkcs8 => github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d
-//	k8s.io/api => k8s.io/api v0.29.2
-//	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2
-//	k8s.io/apimachinery => k8s.io/apimachinery v0.29.2
-//	k8s.io/apiserver => k8s.io/apiserver v0.29.2
-//	k8s.io/code-generator => k8s.io/code-generator v0.29.2
-//	k8s.io/component-base => k8s.io/component-base v0.29.2
-//	k8s.io/kms => k8s.io/kms v0.29.2
-//	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.17.2
-//	sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.11.4
-//)
-
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
diff --git a/images/vm-route-forge/werf.inc.yaml b/images/vm-route-forge/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}-builder
 final: false
-fromImage: BASE_GOLANG_23_BOOKWORM
+fromImage: builder/golang-bookworm-1.23
 git:
 - add: /images/{{ $.ImageName }}
   to: /app/images/vm-route-forge
diff --git a/werf.yaml b/werf.yaml
@@ -43,7 +43,7 @@ build:
 
 ---
 image: images-digests
-fromImage: BASE_ALPINE
+fromImage: builder/alpine
 dependencies:
   {{- range $ImageID := $.ImagesIDList }}
   {{- $ImageNameCamel  := $ImageID | splitList "/" | last  | camelcase | untitle }}
