chore(release): merge werf upstream into delivery-kit (3.6.2-dk.1)

.agents/skills/test-the-tests/SKILL.md

@@ -52,6 +52,12 @@ seen fail.
   of externally observable behavior.
 - **Coverage number, not falsifiability.** A line being executed says nothing about whether
   a wrong value on that line would be caught.
+- **It proves the lab, not production wiring.** A probe on a bare context "proved" that
+  cancellation panics past a branch — but production wraps commands in
+  `graceful.WithTermination`, where `Terminate` returns normally and the branch executes.
+  Before concluding "X cannot reach this code", rebuild the exact wiring production uses
+  (context construction, env, entry point); a conclusion drawn from simplified wiring
+  describes the probe, not the system.
 - **An extended test quietly drops what the old one proved.** Adding cases to a fixture can
   remove the conflict that made an earlier property observable. After editing an existing
   test, re-run the mutations the previous version caught, not only the new ones.

.github/workflows/docs_cleanup_pr.yml

@@ -28,7 +28,12 @@ jobs:
           ref: ${{ github.event_name == 'workflow_dispatch' && github.ref || github.event.pull_request.base.ref }}
 
       - name: Install werf
-        uses: werf/actions/install@v2
+        uses: werf/trdl/actions/setup-app@v0.13.0
+        with:
+          preset: werf
+          group: "3"
+          channel: dev
+          force: false
 
       - name: Dismiss preview
         run: |

.github/workflows/docs_deploy_test_versions.yml

@@ -34,12 +34,17 @@ jobs:
           ref: main
 
       - name: Install werf
-        uses: werf/actions/install@v2
+        uses: werf/trdl/actions/setup-app@v0.13.0
+        with:
+          preset: werf
+          group: "3"
+          channel: dev
+          force: false
 
       - name: Deploy v3 docs to test
         run: |
           . $(werf ci-env github --as-file)
-          werf converge --virtual-merge=false
+          werf converge
         env:
           WERF_NAMESPACE: werfio-test
           WERF_DIR: docs
@@ -64,12 +69,17 @@ jobs:
           ref: "2"
 
       - name: Install werf
-        uses: werf/actions/install@v2
+        uses: werf/trdl/actions/setup-app@v0.13.0
+        with:
+          preset: werf
+          group: "3"
+          channel: dev
+          force: false
 
       - name: Deploy v2 docs to test
         run: |
           . $(werf ci-env github --as-file)
-          werf converge --virtual-merge=false
+          werf converge
         env:
           WERF_NAMESPACE: werfio-test
           WERF_DIR: docs
@@ -94,12 +104,17 @@ jobs:
           ref: "1.2"
 
       - name: Install werf
-        uses: werf/actions/install@v2
+        uses: werf/trdl/actions/setup-app@v0.13.0
+        with:
+          preset: werf
+          group: "3"
+          channel: dev
+          force: false
 
       - name: Deploy v1.2 docs to test
         run: |
           . $(werf ci-env github --as-file)
-          werf converge --virtual-merge=false
+          werf converge
         env:
           WERF_NAMESPACE: werfio-test
           WERF_DIR: docs
@@ -124,12 +139,17 @@ jobs:
           ref: main
 
       - name: Install werf
-        uses: werf/actions/install@v2
+        uses: werf/trdl/actions/setup-app@v0.13.0
+        with:
+          preset: werf
+          group: "3"
+          channel: dev
+          force: false
 
       - name: Deploy latest docs to test
         run: |
           . $(werf ci-env github --as-file)
-          werf converge --virtual-merge=false
+          werf converge
         env:
           WERF_NAMESPACE: werfio-test
           WERF_DIR: docs

CONTRIBUTING.md

@@ -10,7 +10,7 @@ For small changes, such as few lines bugfixes or documentation improvements, fee
 
 For easy first issues, check the [good first issue](https://github.com/werf/werf/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) tag.
 
-You can also check the existing [issues](https://github.com/werf/werf/issues), [discussion threads](https://github.com/werf/werf/discussions), and [documentation](https://werf.io/docs/v2/) — there may already be a discussion or solution on your topic. If not, choose the appropriate way to address the issue on [the new issue form](https://github.com/werf/werf/issues/new/choose).
+You can also check the existing [issues](https://github.com/werf/werf/issues), [discussion threads](https://github.com/werf/werf/discussions), and [documentation](https://werf.io/docs/v3/) — there may already be a discussion or solution on your topic. If not, choose the appropriate way to address the issue on [the new issue form](https://github.com/werf/werf/issues/new/choose).
 
 ## Contributing code
 

cmd/werf/build/main.go

@@ -94,6 +94,11 @@ func NewCmd(ctx context.Context) *cobra.Command {
 	common.SetupLogOptions(&commonCmdData, cmd)
 	common.SetupLogProjectDir(&commonCmdData, cmd)
 
+	common.SetupSynchronization(&commonCmdData, cmd)
+	common.SetupKubeConfigBase64(&commonCmdData, cmd)
+	common.SetupLegacyKubeConfigPath(&commonCmdData, cmd)
+	common.SetupKubeContextCurrent(&commonCmdData, cmd)
+
 	common.SetupSaveBuildReport(&commonCmdData, cmd)
 	common.SetupBuildReportPath(&commonCmdData, cmd)
 	common.SetupBuildReportOperations(&commonCmdData, cmd)
@@ -124,6 +129,9 @@ func NewCmd(ctx context.Context) *cobra.Command {
 }
 
 func runMain(ctx context.Context, imageNameListFromArgs []string) error {
+	ctx, logOperationsSummaryFn := common.InitOperationsStatistics(ctx, &commonCmdData)
+	defer logOperationsSummaryFn()
+
 	commonManager, ctx, err := common.InitCommonComponents(ctx, common.InitCommonComponentsOptions{
 		Cmd:                &commonCmdData,
 		InitWerf:           true,
@@ -135,6 +143,7 @@ func runMain(ctx context.Context, imageNameListFromArgs []string) error {
 		},
 		InitDockerRegistry:          true,
 		InitProcessContainerBackend: true,
+		RequireDockerDaemon:         true,
 		InitSSHAgent:                true,
 	})
 	if err != nil {
@@ -217,7 +226,7 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
 
 	logboek.LogOptionalLn()
 
-	conveyorWithRetry := build.NewConveyorWithRetryWrapper(werfConfig, giterminismManager, giterminismManager.ProjectDir(), projectTmpDir, containerBackend, storageManager, conveyorOptions)
+	conveyorWithRetry := build.NewConveyorWithRetryWrapper(werfConfig, giterminismManager, giterminismManager.ProjectDir(), projectTmpDir, containerBackend, storageManager, storageManager.StorageLockManager, conveyorOptions)
 	defer conveyorWithRetry.Terminate()
 
 	if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {

cmd/werf/bundle/publish/publish.go

@@ -33,6 +33,7 @@ import (
 	"github.com/werf/werf/v3/cmd/werf/common"
 	"github.com/werf/werf/v3/pkg/build"
 	"github.com/werf/werf/v3/pkg/config"
+	"github.com/werf/werf/v3/pkg/container_backend"
 	"github.com/werf/werf/v3/pkg/deploy"
 	"github.com/werf/werf/v3/pkg/deploy/bundles"
 	"github.com/werf/werf/v3/pkg/image"
@@ -109,6 +110,10 @@ func NewCmd(ctx context.Context) *cobra.Command {
 	common.SetupLogOptions(&commonCmdData, cmd)
 	common.SetupLogProjectDir(&commonCmdData, cmd)
 
+	common.SetupSynchronization(&commonCmdData, cmd)
+	common.SetupKubeConfigBase64(&commonCmdData, cmd)
+	common.SetupLegacyKubeConfigPath(&commonCmdData, cmd)
+	common.SetupKubeContextCurrent(&commonCmdData, cmd)
 	common.SetupDenoBinaryPath(&commonCmdData, cmd)
 
 	common.SetupSaveBuildReport(&commonCmdData, cmd)
@@ -160,31 +165,32 @@ func NewCmd(ctx context.Context) *cobra.Command {
 }
 
 func runPublish(ctx context.Context, imageNameListFromArgs []string) error {
+	ctx, logOperationsSummaryFn := common.InitOperationsStatistics(ctx, &commonCmdData)
+	defer logOperationsSummaryFn()
 	commonManager, ctx, err := common.InitCommonComponents(ctx, common.InitCommonComponentsOptions{
 		Cmd: &commonCmdData,
 		InitTrueGitWithOptions: &common.InitTrueGitOptions{
 			Options: true_git.Options{LiveGitOutput: *commonCmdData.LogDebug},
 		},
-		InitDockerRegistry:          true,
-		InitProcessContainerBackend: true,
-		InitWerf:                    true,
-		InitGitDataManager:          true,
-		InitManifestCache:           true,
-		InitLRUImagesCache:          true,
-		InitSSHAgent:                true,
+		InitDockerRegistry: true,
+		InitWerf:           true,
+		InitGitDataManager: true,
+		InitManifestCache:  true,
+		InitLRUImagesCache: true,
+		InitSSHAgent:       true,
 	})
 	if err != nil {
 		return fmt.Errorf("component init error: %w", err)
 	}
 
-	containerBackend := commonManager.ContainerBackend()
-
 	defer func() {
 		if err := tmp_manager.DelegateCleanup(ctx); err != nil {
 			logboek.Context(ctx).Warn().LogF("Temporary files cleanup preparation failed: %s\n", err)
 		}
-		if err := common.RunAutoHostCleanup(ctx, &commonCmdData, containerBackend); err != nil {
-			logboek.Context(ctx).Error().LogF("Auto host cleanup failed: %s\n", err)
+		if containerBackend, ok := commonManager.TryContainerBackend(); ok {
+			if err := common.RunAutoHostCleanup(ctx, &commonCmdData, containerBackend); err != nil {
+				logboek.Context(ctx).Error().LogF("Auto host cleanup failed: %s\n", err)
+			}
 		}
 	}()
 
@@ -209,6 +215,16 @@ func runPublish(ctx context.Context, imageNameListFromArgs []string) error {
 		return err
 	}
 
+	var containerBackend container_backend.ContainerBackend
+	if !imagesToProcess.WithoutImages {
+		var newCtx context.Context
+		containerBackend, newCtx, err = commonManager.EnsureContainerBackend(ctx, &commonCmdData, common.EnsureContainerBackendOptions{InitDockerRegistry: true, RequireDockerDaemon: true})
+		if err != nil {
+			return fmt.Errorf("container backend initialization error: %w", err)
+		}
+		ctx = newCtx
+	}
+
 	projectName := werfConfig.Meta.Project
 
 	projectTmpDir, err := tmp_manager.CreateProjectDir(ctx)
@@ -223,17 +239,22 @@ func runPublish(ctx context.Context, imageNameListFromArgs []string) error {
 
 	logboek.LogOptionalLn()
 
-	stagesStorage, err := common.GetStagesStorage(ctx, containerBackend, &commonCmdData, common.GetStagesStorageOpts{
-		CleanupDisabled:                werfConfig.Meta.Cleanup.DisableCleanup,
-		GitHistoryBasedCleanupDisabled: werfConfig.Meta.Cleanup.DisableGitHistoryBasedPolicy,
-	})
+	bundleRepo, err := commonCmdData.Repo.GetAddress()
 	if err != nil {
 		return err
 	}
-	finalStagesStorage, err := common.GetOptionalFinalStagesStorage(ctx, containerBackend, &commonCmdData)
-	if err != nil {
+	if err := common.ValidateRepoContainerRegistry(commonCmdData.Repo.GetContainerRegistry(ctx)); err != nil {
 		return err
 	}
+	if *commonCmdData.FinalRepo.Address != "" {
+		if err := common.ValidateRepoContainerRegistry(commonCmdData.FinalRepo.GetContainerRegistry(ctx)); err != nil {
+			return err
+		}
+		bundleRepo, err = commonCmdData.FinalRepo.GetAddress()
+		if err != nil {
+			return err
+		}
+	}
 
 	var imagesInfoGetters []*image.InfoGetter
 	var imagesRepo string
@@ -263,7 +284,7 @@ func runPublish(ctx context.Context, imageNameListFromArgs []string) error {
 			return err
 		}
 
-		conveyorWithRetry := build.NewConveyorWithRetryWrapper(werfConfig, giterminismManager, giterminismManager.ProjectDir(), projectTmpDir, containerBackend, storageManager, conveyorOptions)
+		conveyorWithRetry := build.NewConveyorWithRetryWrapper(werfConfig, giterminismManager, giterminismManager.ProjectDir(), projectTmpDir, containerBackend, storageManager, storageManager.StorageLockManager, conveyorOptions)
 		defer conveyorWithRetry.Terminate()
 
 		if err := conveyorWithRetry.WithRetryBlock(ctx, func(c *build.Conveyor) error {
@@ -429,13 +450,6 @@ func runPublish(ctx context.Context, imageNameListFromArgs []string) error {
 		return fmt.Errorf("create bundle: %w", err)
 	}
 
-	var bundleRepo string
-	if finalStagesStorage != nil {
-		bundleRepo = finalStagesStorage.Address()
-	} else {
-		bundleRepo = stagesStorage.Address()
-	}
-
 	opts.ChartLoadOpts.ChartType = nelmcommon.LegacyChartTypeBundle
 
 	return bundles.Publish(ctx, bundleTmpDir, fmt.Sprintf("%s:%s", bundleRepo, cmdData.Tag), bundlesRegistryClient, bundles.PublishOptions{

cmd/werf/cleanup/cleanup.go

@@ -90,6 +90,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
 	common.SetupLogOptions(&commonCmdData, cmd)
 	common.SetupLogProjectDir(&commonCmdData, cmd)
 
+	common.SetupSynchronization(&commonCmdData, cmd)
 	common.SetupWithoutKube(&commonCmdData, cmd)
 	common.SetupKeepStagesBuiltWithinLastNHours(&commonCmdData, cmd)
 
@@ -210,12 +211,6 @@ func runCleanup(ctx context.Context, cmd *cobra.Command) error {
 		storageManager.EnableParallel(int(common.GetParallelTasksLimit(&commonCmdData)))
 	}
 
-	imagesNames, err := common.GetManagedImagesNames(ctx, projectName, storageManager.GetMetaStorage(), werfConfig)
-	if err != nil {
-		return err
-	}
-	logboek.Debug().LogF("Managed images names: %v\n", imagesNames)
-
 	var kubernetesContextClients []*cleaning.ContextClient
 	var kubernetesNamespacesByContext map[string][]string
 	if !(*commonCmdData.WithoutKube || werfConfig.Meta.Cleanup.DisableKubernetesBasedPolicy) {
@@ -251,7 +246,7 @@ func runCleanup(ctx context.Context, cmd *cobra.Command) error {
 	}
 
 	cleanupOptions := cleaning.CleanupOptions{
-		ImageNameList:                   imagesNames,
+		ImageNameList:                   werfConfig.GetImageNameList(false),
 		LocalGit:                        giterminismManager.LocalGitRepo().(*git_repo.Local),
 		KubernetesContextClients:        kubernetesContextClients,
 		KubernetesNamespacesByContext:   kubernetesNamespacesByContext,