From f755bd94455a51b104894b20737181ced6a41478 Mon Sep 17 00:00:00 2001 From: Aleksei Igrychev Date: Wed, 12 Nov 2025 16:03:37 +0000 Subject: [PATCH 1/2] chore(release): update delivery-kit version injection Signed-off-by: Aleksei Igrychev --- Taskfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Taskfile.yml b/Taskfile.yml index 352cc238..f5b08f76 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -35,7 +35,7 @@ vars: echo "${ldflags[*]-}" werfLDFlags: sh: | - version="$(go list -m -f '{{"{{"}}.Version{{"}}"}}' github.com/werf/werf/v2)" + version="$(go list -m -f '{{"{{"}}.Replace.Version{{"}}"}}' github.com/werf/werf/v2)" echo "-X 'github.com/werf/werf/v2/pkg/werf.Version=${version}'" cgoTags: "dfrunsecurity dfrunnetwork dfrunmount dfssh containers_image_openpgp osusergo exclude_graphdriver_devicemapper netgo no_devmapper static_build cni" From 5829a053acff9db414146d22189258ab4fa34918 Mon Sep 17 00:00:00 2001 From: Aleksei Igrychev Date: Wed, 12 Nov 2025 16:04:16 +0000 Subject: [PATCH 2/2] feat(delivery-kit): migrate to deckhouse/delivery-kit Signed-off-by: Aleksei Igrychev --- go.mod | 13 +++++++------ go.sum | 22 ++++++++++++---------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 289629ca..8928c4d4 100644 --- a/go.mod +++ b/go.mod @@ -24,10 +24,10 @@ require ( github.com/spf13/pflag v1.0.7 github.com/stretchr/testify v1.10.0 github.com/vbauerster/mpb/v8 v8.7.5 - github.com/werf/3p-helm v0.0.0-20250731134240-58a9eff8ec5b - github.com/werf/common-go v0.0.0-20251023101023-1aa12556cc61 + github.com/werf/3p-helm v0.0.0-20251021224308-a90f195bd29a + github.com/werf/common-go v0.0.0-20251106163127-f918bc5950db github.com/werf/logboek v0.6.1 - github.com/werf/nelm v1.9.1-0.20250731134715-5824cfbe2c5e + github.com/werf/nelm v1.16.1-0.20251106103358-55c46afac355 github.com/werf/werf/v2 v2.45.1 gitlab.com/greyxor/slogor v1.2.11 go.cypherpunks.ru/gogost/v5 v5.13.0 @@ -169,6 +169,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/daviddengcn/go-colortext v1.0.0 // indirect github.com/deckarep/golang-set/v2 v2.6.0 // indirect + github.com/deckhouse/delivery-kit-sdk v1.0.1-0.20251022121655-0cbac8223333 // indirect github.com/deckhouse/virtualization/api v1.0.0 // indirect github.com/deislabs/oras v1.1.0 // indirect github.com/denisenkom/go-mssqldb v0.12.2 // indirect @@ -245,13 +246,13 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect - github.com/golang-jwt/jwt/v5 v5.3.0 // indirect github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.3 // indirect + github.com/google/certificate-transparency-go v1.3.1 // indirect github.com/google/gnostic-models v0.7.0 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/go-intervals v0.0.2 // indirect @@ -369,7 +370,6 @@ require ( github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f // indirect github.com/jefferai/jsonx v1.0.0 // indirect github.com/jellydator/ttlcache/v3 v3.4.0 // indirect - github.com/jhump/protoreflect v1.16.0 // indirect github.com/jinzhu/copier v0.4.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect @@ -533,7 +533,7 @@ require ( github.com/walle/targz v0.0.0-20140417120357-57fe4206da5a // indirect github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d // indirect github.com/werf/copy-recurse v0.2.7 // indirect - github.com/werf/kubedog v0.13.1-0.20250728071655-b80f0b64e912 // indirect + github.com/werf/kubedog v0.13.1-0.20251105104917-8615bb20d8c0 // indirect github.com/werf/kubedog-for-werf-helm v0.0.0-20241217155728-9d45c48b82b6 // indirect github.com/werf/lockgate v0.1.1 // indirect github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf // indirect @@ -635,6 +635,7 @@ replace ( github.com/hashicorp/vault/api => flant.internal/team/foxtrot/stronghold.git/images/stronghold/api v1.16.3 github.com/hashicorp/vault/sdk => flant.internal/team/foxtrot/stronghold.git/images/stronghold/sdk v1.16.3 github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 // upstream not maintained + github.com/werf/werf/v2 => github.com/deckhouse/delivery-kit/v2 v2.51.2-dk.0.20251107144651-af3bcfb81e2c go.cypherpunks.ru/gogost/v5 v5.13.0 => github.com/flant/gogost/v5 v5.13.0 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff ) diff --git a/go.sum b/go.sum index 3677e20e..3a02542d 100644 --- a/go.sum +++ b/go.sum @@ -411,6 +411,10 @@ github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80N github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/deckhouse/deckhouse/pkg/log v0.1.0 h1:2aPfyiHHSIJlX4x7ysyPOaIb7CLmyY+hUf9uDb8TYd8= github.com/deckhouse/deckhouse/pkg/log v0.1.0/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw= +github.com/deckhouse/delivery-kit-sdk v1.0.1-0.20251022121655-0cbac8223333 h1:9YuKuSrRfTSdAaLIUwi0t4bkedoNgj3IMFXPcP/rkSo= +github.com/deckhouse/delivery-kit-sdk v1.0.1-0.20251022121655-0cbac8223333/go.mod h1:iukQB9dt5DasWCI/XkjeyD5KtTJtHp5DMCGN8IS5PqA= +github.com/deckhouse/delivery-kit/v2 v2.51.2-dk.0.20251107144651-af3bcfb81e2c h1:j3CfhhZW9UeWLn+HM+4+bCMHsin3EQokQ/0RGx19Bxk= +github.com/deckhouse/delivery-kit/v2 v2.51.2-dk.0.20251107144651-af3bcfb81e2c/go.mod h1:HSix4ccB6XIu2JjzJg9ihvfYKt5FTgiXt8vHDn5Dxsk= github.com/deckhouse/virtualization/api v1.0.0 h1:q4TvC74tpjk25k0byXJCYP4HjvRexBSeI0cC8QeCMTQ= github.com/deckhouse/virtualization/api v1.0.0/go.mod h1:meTeGulR+xwnvt0pTGsoI14YhGe0lHUVyAfhZsoQyeQ= github.com/deckhouse/virtualization/src/cli v1.0.0 h1:tNuQugKqYiMwVV8xh2yLVaEIrxCzmRhaTVijrWc7Epw= @@ -1817,30 +1821,28 @@ github.com/walle/targz v0.0.0-20140417120357-57fe4206da5a h1:6cKSHLRphD9Fo1LJlIS github.com/walle/targz v0.0.0-20140417120357-57fe4206da5a/go.mod h1:nccQrXCnc5SjsThFLmL7hYbtT/mHJcuolPifzY5vJqE= github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d h1:q80YKUcDWRNvvQcziH63e3ammTWARwrhohBCunHaYAg= github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d/go.mod h1:vLdXKydr/OJssAXmjY0XBgLXUfivBMrNRIBljgtqCnw= -github.com/werf/3p-helm v0.0.0-20250731134240-58a9eff8ec5b h1:l9R9CvJLk8uaLmJpyuP5GboqzZaTqwxgfzuTMEbfF28= -github.com/werf/3p-helm v0.0.0-20250731134240-58a9eff8ec5b/go.mod h1:KDjmOsjFiOmj0fB0+q+0gGvlejPMjTgckLC59bX0BLg= +github.com/werf/3p-helm v0.0.0-20251021224308-a90f195bd29a h1:2MQLbG3bB3wx1PaHSKftVIZNmBUNHKjDdD2K+4kHFbE= +github.com/werf/3p-helm v0.0.0-20251021224308-a90f195bd29a/go.mod h1:cJqEbzc97X0/gYYi5pU4RyXDD8o1spkZh7bOxV2+NQ0= github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d h1:HN9jmAG2Gyhf8hJca9yoAO2xawNZQ/6OYDomxkKr5Sw= github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d/go.mod h1:fozJ+C/Llp1e+jHxrJOZUu+D4QEw+laQK6W6RFqvTsg= github.com/werf/3p-oras v0.9.1-0.20240115121544-03962ecbd40a h1:PsU9szHZlIH+CjcuIuPXRLc5dsdoaFldvYjS6YHI7YQ= github.com/werf/3p-oras v0.9.1-0.20240115121544-03962ecbd40a/go.mod h1:XTePf8biMMCkqbuuWBZ24xOwo3hZej+BBM0uvd8aGqk= -github.com/werf/common-go v0.0.0-20251023101023-1aa12556cc61 h1:IKqtvmzrVtFuP28C1/Ei0Wwh/unbgBC78JmCF3GTVwA= -github.com/werf/common-go v0.0.0-20251023101023-1aa12556cc61/go.mod h1:MXS0JR9zut+oR9oEM8PEkdXXoEbKDILTmWopt0z1eZs= +github.com/werf/common-go v0.0.0-20251106163127-f918bc5950db h1:MEdtZTYcI9EHvuazVUdNrmbtU5rrbbTFtxq/lDPdfMk= +github.com/werf/common-go v0.0.0-20251106163127-f918bc5950db/go.mod h1:MXS0JR9zut+oR9oEM8PEkdXXoEbKDILTmWopt0z1eZs= github.com/werf/copy-recurse v0.2.7 h1:3FTOarbJ9uhFLi75oeUCioK9zxZwuV7o28kuUBPDZPM= github.com/werf/copy-recurse v0.2.7/go.mod h1:6Ypb+qN+hRBJgoCgEkX1vpbqcQ+8q69BQ3hi8s8Y6Qc= -github.com/werf/kubedog v0.13.1-0.20250728071655-b80f0b64e912 h1:D3BE0ynAQQSLkxsrJ8l0y6YwPW8Bzi2V3e19KQszjhM= -github.com/werf/kubedog v0.13.1-0.20250728071655-b80f0b64e912/go.mod h1:Y6pesrIN5uhFKqmHnHSoeW4jmVyZlWPFWv5SjB0rUPg= +github.com/werf/kubedog v0.13.1-0.20251105104917-8615bb20d8c0 h1:7owKaBiK78CpIBr6tCzhSgcXDD25X6ZH0O4B+koBt+M= +github.com/werf/kubedog v0.13.1-0.20251105104917-8615bb20d8c0/go.mod h1:gu4EY4hxtiYVDy5o6WE2lRZS0YWqrOV0HS//GTYyrUE= github.com/werf/kubedog-for-werf-helm v0.0.0-20241217155728-9d45c48b82b6 h1:lpgQPTCp+wNJfTqJWtR6A5gRA4e4m/eRJFV7V18XCoA= github.com/werf/kubedog-for-werf-helm v0.0.0-20241217155728-9d45c48b82b6/go.mod h1:PA9xGVKX9Il6sCgvPrcB3/FahRme3bXRz4BuylvAssc= github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4= github.com/werf/lockgate v0.1.1/go.mod h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE= github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g= github.com/werf/logboek v0.6.1/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk= -github.com/werf/nelm v1.9.1-0.20250731134715-5824cfbe2c5e h1:S+t0V3tuNzCf5aAplEEDDUmIDgOakxCCr3w35gWBPeM= -github.com/werf/nelm v1.9.1-0.20250731134715-5824cfbe2c5e/go.mod h1:0Frc41vYWUNR+HBn0KwBWNIvp+PB/bMviZPOloZlSLc= +github.com/werf/nelm v1.16.1-0.20251106103358-55c46afac355 h1:DhTGH2ScH7g8ezz7M7c2XKIKqIsVtV8GuV7eWq/HbcE= +github.com/werf/nelm v1.16.1-0.20251106103358-55c46afac355/go.mod h1:xagTj6aWTBe+EmzWBIhTydrXeiq47uVX8WISjxo9yIE= github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf h1:K51qz209c1yJgKzPw8AeS72T21F/ACp0VI3RJvT4THA= github.com/werf/nelm-for-werf-helm v0.0.0-20241217155925-b0e6734d1dbf/go.mod h1:7RJXSGPKKPEvfPqrTwNA8jT7y52O0ebwhSbSn29ESMA= -github.com/werf/werf/v2 v2.45.1 h1:n6O+YC/zcJ4EzzarZZKdgtFMUi74ydgf1yVINmetQ3g= -github.com/werf/werf/v2 v2.45.1/go.mod h1:4L2IpfWdMTKvp97CgslVwNaIsVQO1AR8x4acU0ueNL8= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=