From a213df7519923ce61691be2a0205bdcc4a5414bd Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 17:23:04 +0300 Subject: [PATCH 1/9] bump Signed-off-by: Pavel Okhlopkov --- .github/workflows/test.yml | 4 ++-- Makefile | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 50a40d1..8155509 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,8 +5,8 @@ on: push: branches-ignore: [main] env: - GO_VERSION: '1.26.0' - GOLANGCI_LINT_VERSION: 'v2.10.1' + GO_VERSION: '1.25.5' + GOLANGCI_LINT_VERSION: 'v2.11.4' jobs: # Check if there is any dirty change for go mod tidy go-mod: diff --git a/Makefile b/Makefile index 739649c..bddbcf9 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ YQ = $(LOCALBIN)/yq ## Tool Versions # GO_BUILDER_VERSION must be without 'v' prefix GO_BUILDER_VERSION = 1.25.5 -GOLANGCI_LINT_VERSION = v2.10.1 +GOLANGCI_LINT_VERSION = v2.11.4 YQ_VERSION ?= v4.50.1 diff --git a/go.mod b/go.mod index 6ed11ab..aa93e41 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/deckhouse/module-sdk -go 1.24.0 +go 1.25 require ( github.com/caarlos0/env/v11 v11.3.1 github.com/cloudflare/cfssl v1.6.5 - github.com/deckhouse/deckhouse/pkg/log v0.2.0 + github.com/deckhouse/deckhouse/pkg/log v0.1.0 github.com/ettle/strcase v0.2.0 github.com/gojuno/minimock/v3 v3.4.7 github.com/google/go-cmp v0.7.0 diff --git a/go.sum b/go.sum index 5b24a81..dc45786 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/deckhouse/pkg/log v0.2.0 h1:6tmZQLwNb1o/hP1gzJQBjcwfA/bubbgObovXzxq+Exo= -github.com/deckhouse/deckhouse/pkg/log v0.2.0/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw= +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/docker/cli v28.2.2+incompatible h1:qzx5BNUDFqlvyq4AHzdNB7gSyVTmU4cgsyN9SdInc1A= github.com/docker/cli v28.2.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= From 25561be417961e8d93ebbba80cef198e2393cd68 Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 17:24:10 +0300 Subject: [PATCH 2/9] bump Signed-off-by: Pavel Okhlopkov --- .github/workflows/test.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8155509..8ff78b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ on: push: branches-ignore: [main] env: - GO_VERSION: '1.25.5' + GO_VERSION: '1.25.8' GOLANGCI_LINT_VERSION: 'v2.11.4' jobs: # Check if there is any dirty change for go mod tidy diff --git a/Makefile b/Makefile index bddbcf9..281040f 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ YQ = $(LOCALBIN)/yq ## TODO: remap in yaml file (version.yaml or smthng) ## Tool Versions # GO_BUILDER_VERSION must be without 'v' prefix -GO_BUILDER_VERSION = 1.25.5 +GO_BUILDER_VERSION = 1.25.8 GOLANGCI_LINT_VERSION = v2.11.4 YQ_VERSION ?= v4.50.1 From 4c37e7bfa2acd28b83a6e6a4041b31238ea3570f Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 17:28:02 +0300 Subject: [PATCH 3/9] bump dependencies Signed-off-by: Pavel Okhlopkov --- examples/basic-example-module/hooks/go.mod | 2 +- examples/common-hooks/tls-certificate/hooks/go.mod | 2 +- examples/dependency-example-module/hooks/go.mod | 2 +- examples/example-module/hooks/go.mod | 2 +- examples/settings-check/hooks/go.mod | 2 +- examples/single-file-app-example/hooks/go.mod | 2 +- examples/single-file-example/hooks/go.mod | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/basic-example-module/hooks/go.mod b/examples/basic-example-module/hooks/go.mod index 3423b3c..660dd24 100644 --- a/examples/basic-example-module/hooks/go.mod +++ b/examples/basic-example-module/hooks/go.mod @@ -1,6 +1,6 @@ module basic-example-module -go 1.24.0 +go 1.25 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/common-hooks/tls-certificate/hooks/go.mod b/examples/common-hooks/tls-certificate/hooks/go.mod index aa52bdb..234f108 100644 --- a/examples/common-hooks/tls-certificate/hooks/go.mod +++ b/examples/common-hooks/tls-certificate/hooks/go.mod @@ -1,6 +1,6 @@ module tlscertificate -go 1.24.0 +go 1.25 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/dependency-example-module/hooks/go.mod b/examples/dependency-example-module/hooks/go.mod index 70b3b3a..33cadc0 100644 --- a/examples/dependency-example-module/hooks/go.mod +++ b/examples/dependency-example-module/hooks/go.mod @@ -1,6 +1,6 @@ module dependency-example-module -go 1.24.0 +go 1.25 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/example-module/hooks/go.mod b/examples/example-module/hooks/go.mod index ee36421..e8420d8 100644 --- a/examples/example-module/hooks/go.mod +++ b/examples/example-module/hooks/go.mod @@ -1,6 +1,6 @@ module example-module -go 1.24.0 +go 1.25 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/settings-check/hooks/go.mod b/examples/settings-check/hooks/go.mod index e799c55..7fd0a19 100644 --- a/examples/settings-check/hooks/go.mod +++ b/examples/settings-check/hooks/go.mod @@ -1,6 +1,6 @@ module valuescheck -go 1.24.0 +go 1.25 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/single-file-app-example/hooks/go.mod b/examples/single-file-app-example/hooks/go.mod index a50006e..7539847 100644 --- a/examples/single-file-app-example/hooks/go.mod +++ b/examples/single-file-app-example/hooks/go.mod @@ -1,6 +1,6 @@ module singlefileexample -go 1.24.0 +go 1.25 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/single-file-example/hooks/go.mod b/examples/single-file-example/hooks/go.mod index a50006e..7539847 100644 --- a/examples/single-file-example/hooks/go.mod +++ b/examples/single-file-example/hooks/go.mod @@ -1,6 +1,6 @@ module singlefileexample -go 1.24.0 +go 1.25 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 From 84ef9cb12f539c39a11f8d6e015ab70c3f785691 Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 17:46:25 +0300 Subject: [PATCH 4/9] fix examples test Signed-off-by: Pavel Okhlopkov --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8ff78b1..80bc5ce 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,7 +59,7 @@ jobs: name: go_work path: go.work - id: set-modules - run: echo "modules=$(go list -m -json | jq -s '.' | jq -c '[.[].Dir]')" >> $GITHUB_OUTPUT + run: echo "modules=$(go work edit -json | jq -c '[.Use[].DiskPath]')" >> $GITHUB_OUTPUT go-mod-examples: needs: [detect-modules] runs-on: ubuntu-latest From a99a634bda7dc017ade1221c4e1c41d11db0c5fa Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 17:50:06 +0300 Subject: [PATCH 5/9] bump go Signed-off-by: Pavel Okhlopkov --- .github/workflows/test.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80bc5ce..82664f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ on: push: branches-ignore: [main] env: - GO_VERSION: '1.25.8' + GO_VERSION: '1.26.1' GOLANGCI_LINT_VERSION: 'v2.11.4' jobs: # Check if there is any dirty change for go mod tidy diff --git a/Makefile b/Makefile index 281040f..77dc2f4 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ YQ = $(LOCALBIN)/yq ## TODO: remap in yaml file (version.yaml or smthng) ## Tool Versions # GO_BUILDER_VERSION must be without 'v' prefix -GO_BUILDER_VERSION = 1.25.8 +GO_BUILDER_VERSION = 1.26.1 GOLANGCI_LINT_VERSION = v2.11.4 YQ_VERSION ?= v4.50.1 From 38938a7c9522916837d9a6adc513ac412243b674 Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 17:55:55 +0300 Subject: [PATCH 6/9] bump Signed-off-by: Pavel Okhlopkov --- examples/basic-example-module/hooks/go.mod | 2 +- examples/common-hooks/tls-certificate/hooks/go.mod | 2 +- examples/dependency-example-module/hooks/go.mod | 2 +- examples/example-module/hooks/go.mod | 2 +- examples/settings-check/hooks/go.mod | 2 +- examples/single-file-app-example/hooks/go.mod | 2 +- examples/single-file-example/hooks/go.mod | 2 +- go.mod | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/basic-example-module/hooks/go.mod b/examples/basic-example-module/hooks/go.mod index 660dd24..2cb360c 100644 --- a/examples/basic-example-module/hooks/go.mod +++ b/examples/basic-example-module/hooks/go.mod @@ -1,6 +1,6 @@ module basic-example-module -go 1.25 +go 1.25.8 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/common-hooks/tls-certificate/hooks/go.mod b/examples/common-hooks/tls-certificate/hooks/go.mod index 234f108..71dc430 100644 --- a/examples/common-hooks/tls-certificate/hooks/go.mod +++ b/examples/common-hooks/tls-certificate/hooks/go.mod @@ -1,6 +1,6 @@ module tlscertificate -go 1.25 +go 1.25.8 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/dependency-example-module/hooks/go.mod b/examples/dependency-example-module/hooks/go.mod index 33cadc0..66c825d 100644 --- a/examples/dependency-example-module/hooks/go.mod +++ b/examples/dependency-example-module/hooks/go.mod @@ -1,6 +1,6 @@ module dependency-example-module -go 1.25 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/example-module/hooks/go.mod b/examples/example-module/hooks/go.mod index e8420d8..59dbcfe 100644 --- a/examples/example-module/hooks/go.mod +++ b/examples/example-module/hooks/go.mod @@ -1,6 +1,6 @@ module example-module -go 1.25 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/settings-check/hooks/go.mod b/examples/settings-check/hooks/go.mod index 7fd0a19..8e1f530 100644 --- a/examples/settings-check/hooks/go.mod +++ b/examples/settings-check/hooks/go.mod @@ -1,6 +1,6 @@ module valuescheck -go 1.25 +go 1.25.8 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/single-file-app-example/hooks/go.mod b/examples/single-file-app-example/hooks/go.mod index 7539847..e30676a 100644 --- a/examples/single-file-app-example/hooks/go.mod +++ b/examples/single-file-app-example/hooks/go.mod @@ -1,6 +1,6 @@ module singlefileexample -go 1.25 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/single-file-example/hooks/go.mod b/examples/single-file-example/hooks/go.mod index 7539847..e30676a 100644 --- a/examples/single-file-example/hooks/go.mod +++ b/examples/single-file-example/hooks/go.mod @@ -1,6 +1,6 @@ module singlefileexample -go 1.25 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/go.mod b/go.mod index aa93e41..d6b6f11 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/deckhouse/module-sdk -go 1.25 +go 1.25.8 require ( github.com/caarlos0/env/v11 v11.3.1 From ba86bbe5e13e9586e0b15e5bdb400564f0660cbd Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 18:45:11 +0300 Subject: [PATCH 7/9] fix Signed-off-by: Pavel Okhlopkov --- examples/single-file-app-example/hooks/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/single-file-app-example/hooks/go.mod b/examples/single-file-app-example/hooks/go.mod index e30676a..811c7a1 100644 --- a/examples/single-file-app-example/hooks/go.mod +++ b/examples/single-file-app-example/hooks/go.mod @@ -1,4 +1,4 @@ -module singlefileexample +module singlefileappexample go 1.25.8 From cac370f6bc3dc5d948335700592a1813cee21279 Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 19:36:48 +0300 Subject: [PATCH 8/9] fix example Signed-off-by: Pavel Okhlopkov --- examples/single-file-app-example/hooks/main_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/single-file-app-example/hooks/main_test.go b/examples/single-file-app-example/hooks/main_test.go index 8fc9e9f..2593e7e 100644 --- a/examples/single-file-app-example/hooks/main_test.go +++ b/examples/single-file-app-example/hooks/main_test.go @@ -11,7 +11,7 @@ import ( "github.com/deckhouse/module-sdk/pkg" "github.com/deckhouse/module-sdk/testing/mock" - singlefileexample "singlefileexample" + singlefileappexample "singlefileappexample" ) const ( @@ -21,7 +21,7 @@ const ( var _ = Describe("handle hook single file example", func() { snapshots := mock.NewSnapshotsMock(GinkgoT()) - snapshots.GetMock.When(singlefileexample.SnapshotKey).Then( + snapshots.GetMock.When(singlefileappexample.SnapshotKey).Then( []pkg.Snapshot{ mock.NewSnapshotMock(GinkgoT()).UnmarshalToMock.Set(func(v any) error { str := v.(*string) @@ -49,7 +49,7 @@ var _ = Describe("handle hook single file example", func() { Context("reconcile func", func() { It("reconcile func executed correctly", func() { - err := singlefileexample.Handle(context.Background(), input) + err := singlefileappexample.Handle(context.Background(), input) Expect(err).ShouldNot(HaveOccurred()) }) }) From da756b9743c3066caad474a8c18bbb0bd1769dd4 Mon Sep 17 00:00:00 2001 From: Pavel Okhlopkov Date: Mon, 30 Mar 2026 19:37:59 +0300 Subject: [PATCH 9/9] bump Signed-off-by: Pavel Okhlopkov --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d6b6f11..116f0ef 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.25.8 require ( github.com/caarlos0/env/v11 v11.3.1 github.com/cloudflare/cfssl v1.6.5 - github.com/deckhouse/deckhouse/pkg/log v0.1.0 + github.com/deckhouse/deckhouse/pkg/log v0.2.0 github.com/ettle/strcase v0.2.0 github.com/gojuno/minimock/v3 v3.4.7 github.com/google/go-cmp v0.7.0 diff --git a/go.sum b/go.sum index dc45786..5b24a81 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -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/deckhouse/pkg/log v0.2.0 h1:6tmZQLwNb1o/hP1gzJQBjcwfA/bubbgObovXzxq+Exo= +github.com/deckhouse/deckhouse/pkg/log v0.2.0/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw= github.com/docker/cli v28.2.2+incompatible h1:qzx5BNUDFqlvyq4AHzdNB7gSyVTmU4cgsyN9SdInc1A= github.com/docker/cli v28.2.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=