diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d776fdce..4039a062 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,7 +11,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.25.5' + go-version: '1.26.1' id: go - name: Check out addon-operator code uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 2611e965..2bde8664 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.25.5" + go-version: "1.26.1" - name: Check out shell-operator code uses: actions/checkout@v4 - name: Restore Go modules @@ -31,7 +31,7 @@ jobs: echo -n "Go modules unpacked size is: " && du -sh $HOME/go/pkg/mod - name: Run golangci-lint run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v2.8.0 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v2.11.4 ./golangci-lint run ./... codespell: name: Run codespell diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 8c9ce894..715dff86 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.25.5' + go-version: '1.26.1' id: go - name: Check out addon-operator code uses: actions/checkout@v4 diff --git a/Makefile b/Makefile index d1bf5c0f..50c2abbf 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ 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 -GOLANGCI_LINT_VERSION = v2.8.0 +GO_BUILDER_VERSION = 1.26.1 +GOLANGCI_LINT_VERSION = v2.11.4 YQ_VERSION ?= v4.50.1 diff --git a/go.mod b/go.mod index cb6aa149..8c63577d 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,16 @@ module github.com/flant/addon-operator -go 1.24.0 +go 1.25.8 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/deckhouse/deckhouse/pkg/log v0.2.0 github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0 - github.com/deckhouse/module-sdk v0.10.2 + github.com/deckhouse/module-sdk v0.10.4 github.com/dominikbraun/graph v0.23.0 github.com/ettle/strcase v0.2.0 github.com/flant/kube-client v1.6.0 - github.com/flant/shell-operator v1.14.3 + github.com/flant/shell-operator v1.15.0 github.com/go-chi/chi/v5 v5.2.3 github.com/go-openapi/loads v0.23.1 github.com/go-openapi/spec v0.22.0 diff --git a/go.sum b/go.sum index 31f25616..d1b14955 100644 --- a/go.sum +++ b/go.sum @@ -102,8 +102,8 @@ github.com/deckhouse/deckhouse/pkg/log v0.2.0 h1:6tmZQLwNb1o/hP1gzJQBjcwfA/bubbg github.com/deckhouse/deckhouse/pkg/log v0.2.0/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw= github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0 h1:xZvbKuexrSQGEw6CB4n3UC7XbOb9QNLbm8UhcGZ2R1I= github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0/go.mod h1:Rz++SzCLkFW03WGgftnn91TimGU2shiKb5S/YuxcBuE= -github.com/deckhouse/module-sdk v0.10.2 h1:jYxFTgjdaZ9NKWKbFP95RvD55WJvhwjPAeSMFKhZb0o= -github.com/deckhouse/module-sdk v0.10.2/go.mod h1:Z1jfmd0fICoYww0daMijWAU+OZTxeJUXfMciKKuYAYA= +github.com/deckhouse/module-sdk v0.10.4 h1:1C61nXevgQiUnmv5Is+XP9Octu05XWKgjFi6gmL7miM= +github.com/deckhouse/module-sdk v0.10.4/go.mod h1:wpEKjpMUHZ4D5JGPfHChKGzBcOVyZnUN4sP0yTEaHdU= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= @@ -161,8 +161,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flant/kube-client v1.6.0 h1:g6ksfIgTlrvLgp/Iu1a9c5aC4yPClLplq3w9e/qtYbk= github.com/flant/kube-client v1.6.0/go.mod h1:dYJyx7aMldXR/F8hlhRxlcEhSkxKcMZV2Oz8d+o/Up4= -github.com/flant/shell-operator v1.14.3 h1:P88uPvWZsWYAt6gUS14C1brYpCKvYIHYahgdo/UQKRo= -github.com/flant/shell-operator v1.14.3/go.mod h1:9tUfaWsJ8lzT04L/nUEvpqjOtOrzFgK4RPylSkZPMmo= +github.com/flant/shell-operator v1.15.0 h1:GLk1OzcWNxEDNBFDerwqZdSY8jlGA/12j0GjwFW3yY4= +github.com/flant/shell-operator v1.15.0/go.mod h1:+dzZnSxYJCdIsV9Eo3uYNb9Q83wYnH2x3wUzbJESAzs= github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc=