Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dev_module_build-and-registration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
MODULES_MODULE_TAG: ${{ github.event.inputs.tag }}
SOURCE_REPO: "${{secrets.SOURCE_REPO}}"
DECKHOUSE_PRIVATE_REPO: "${{secrets.DECKHOUSE_PRIVATE_REPO}}"
GO_VERSION: "1.25.10"
GO_VERSION: "1.25.11"
MODULE_EDITION: "EE"

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev_module_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
MODULES_REGISTRY_PASSWORD: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
SOURCE_REPO: "${{secrets.SOURCE_REPO}}"
DECKHOUSE_PRIVATE_REPO: "${{secrets.DECKHOUSE_PRIVATE_REPO}}"
GO_VERSION: "1.25.10"
GO_VERSION: "1.25.11"
GOLANGCI_LINT_VERSION: "2.11.1"
TRIVY_DISABLE_VEX_NOTICE: "true"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dev_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
name: Validations

env:
GO_VERSION: "1.25.10"
GO_VERSION: "1.25.11"
on:
pull_request:
types: [opened, synchronize, labeled, unlabeled]
Expand Down Expand Up @@ -137,9 +137,9 @@ jobs:
matrix:
# Define two groups of components with their respective Go versions
components:
- { component: virtualization-artifact, go-version: "1.25.10" }
- { component: vm-route-forge, go-version: "1.25.10" }
- { component: api, go-version: "1.25.10" }
- { component: virtualization-artifact, go-version: "1.25.11" }
- { component: vm-route-forge, go-version: "1.25.11" }
- { component: api, go-version: "1.25.11" }

steps:
- name: Set skip flag
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ jobs:
virtualization_tag: main
deckhouse_channel: alpha
default_user: cloud
go_version: "1.25.10"
go_version: "1.25.11"
e2e_timeout: "3.5h"
date_start: ${{ needs.set-vars.outputs.date_start }}
randuuid4c: ${{ needs.set-vars.outputs.randuuid4c }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ on:
go_version:
required: false
type: string
default: "1.25.10"
default: "1.25.11"
description: "Go version"
apt_mirror_enabled:
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_module_release-channels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
needs: print-vars
if: ${{ !inputs.check_only && (inputs.ce || inputs.ee) }}
env:
GO_VERSION: "1.25.10"
GO_VERSION: "1.25.11"
input_channel: ${{ github.event.inputs.channel }}
input_version: ${{ github.event.inputs.tag }}
steps:
Expand Down Expand Up @@ -417,7 +417,7 @@ jobs:
name: Check version on release channel
runs-on: ubuntu-latest
env:
GO_VERSION: "1.25.10"
GO_VERSION: "1.25.11"
input_channel: ${{ github.event.inputs.channel }}
input_version: ${{ github.event.inputs.tag }}
needs:
Expand Down
29 changes: 27 additions & 2 deletions .werf/defines/parse-base-images-map.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,44 @@

{{- define "parse_base_images_map" }}
{{- $deckhouseImages := .Files.Get "build/base-images/deckhouse_images.yml" | fromYaml }}
{{- $containerFactoryImages := .Files.Get "build/base-images/container_factory_images.yml" | fromYaml }}
{{/*
# deckhouse_images has a format
# <prefix>/<name>: "sha256:abcde12345
*/}}
{{- $usedImagesDict := (include "project_images" . | fromJson) }}
{{- range $k, $v := $deckhouseImages }}
{{- $baseImagePath := (printf "%s@%s" $deckhouseImages.REGISTRY_PATH (trimSuffix "/" $v)) }}
{{- if ne $k "REGISTRY_PATH" }}
{{- $baseImagePath := (printf "%s@%s" $deckhouseImages.REGISTRY_PATH (trimSuffix "/" $v)) }}
{{- $_ := set $deckhouseImages $k $baseImagePath }}
{{- end }}
{{- end }}
{{- $_ := unset $deckhouseImages "REGISTRY_PATH" }}
{{- $_ := set . "Images" (mustMerge $deckhouseImages) }}
{{- if $containerFactoryImages }}
{{- range $k, $v := $containerFactoryImages }}
{{- if ne $k "REGISTRY_PATH" }}
{{- $baseImagePath := (printf "%s@%s" $containerFactoryImages.REGISTRY_PATH (trimSuffix "/" $v)) }}
{{- $_ := set $containerFactoryImages $k $baseImagePath }}
{{- end }}
{{- end }}
{{- $_ := unset $containerFactoryImages "REGISTRY_PATH" }}
{{/*
# Source pins: image names that must be taken from container_factory_images
# instead of the default deckhouse_images source. Declared in a module-owned
# data file so the image libraries in build/base-images stay untouched.
*/}}
{{- $pins := .Files.Get "build/base-images/base-images-pins.yml" | fromYaml }}
{{- $containerFactoryOverrideImages := $pins.fromContainerFactory | default list }}
{{- $containerFactoryOverrides := dict }}
{{- range $k := $containerFactoryOverrideImages }}
{{- if hasKey $containerFactoryImages $k }}
{{- $_ := set $containerFactoryOverrides $k (get $containerFactoryImages $k) }}
{{- end }}
{{- end }}
{{- $_ := set . "Images" (mustMerge $containerFactoryOverrides $deckhouseImages $containerFactoryImages) }}
{{- else }}
{{- $_ := set . "Images" (mustMerge $deckhouseImages) }}
{{- end }}
{{/* # base images artifacts */}}
{{- range $k, $v := .Images }}
{{- if hasKey $usedImagesDict $k }}
Expand Down
2 changes: 1 addition & 1 deletion api/client/examples/cancel-evacuation/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/deckhouse/virtualization/api/client/examples/cancel-evacuation

go 1.25.10
go 1.25.11

require (
github.com/deckhouse/virtualization/api v1.6.1
Expand Down
2 changes: 1 addition & 1 deletion api/client/examples/list-resources/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/deckhouse/virtualization/api/client/examples/list-resources

go 1.25.10
go 1.25.11

require (
github.com/deckhouse/virtualization/api v1.6.1
Expand Down
2 changes: 1 addition & 1 deletion api/client/examples/resourceclaim/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/deckhouse/virtualization/api/client/examples/resourceclaim

go 1.25.10
go 1.25.11

require (
github.com/deckhouse/virtualization/api v1.6.1
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/deckhouse/virtualization/api

go 1.25.10
go 1.25.11

tool (
k8s.io/code-generator
Expand Down
12 changes: 12 additions & 0 deletions build/base-images/base-images-pins.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Base image source pins (module-owned configuration).
#
# deckhouse_images.yml and container_factory_images.yml in this directory are
# treated as read-only image libraries. When the same image name exists in both,
# the default merge precedence prefers deckhouse_images. List here the image
# names that must instead be taken from container_factory_images, with a reason.
#
# Consumed by .werf/defines/parse-base-images-map.tmpl.
fromContainerFactory:
# CVE mitigation (08-06-2026): requires the ALT 20260119 based toolchain
# provided by container-factory instead of the deckhouse_images build.
- builder/golang-alt-1.25
Loading
Loading