From e4ae1266778f53a00227f2f3c3b438ffa5198909 Mon Sep 17 00:00:00 2001 From: Andreas Kupries Date: Mon, 26 Oct 2026 11:00:05 +0100 Subject: [PATCH 1/4] Bump Go toolchain to go1.27.3 --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 83ae051a..50df5026 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/rancher/cli -go 1.27.0 +go 1.27.2 -toolchain go1.27.2 +toolchain go1.27.3 replace ( k8s.io/api => k8s.io/api v0.37.1 From ea22216b04417788c4bb3fa718efc91aaf9a126c Mon Sep 17 00:00:00 2001 From: Andreas Kupries Date: Mon, 26 Oct 2026 11:01:14 +0100 Subject: [PATCH 2/4] Bump rancher to main (7758e3eb8c0ff70e8c68444b6f7a42cf9dda4392) --- go.mod | 32 ++++++++++++++++-------------- go.sum | 62 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/go.mod b/go.mod index 50df5026..10e161ae 100644 --- a/go.mod +++ b/go.mod @@ -15,18 +15,18 @@ replace ( require ( github.com/rancher/norman v0.10.1 - github.com/rancher/rancher/pkg/apis v0.0.0-20261009144438-9262b09fcc6d - github.com/rancher/rancher/pkg/client v0.0.0-20261009144438-9262b09fcc6d + github.com/rancher/rancher/pkg/apis v0.0.0-20261026073715-7758e3eb8c0f + github.com/rancher/rancher/pkg/client v0.0.0-20261026073715-7758e3eb8c0f github.com/sirupsen/logrus v1.10.2 github.com/stretchr/testify v1.12.1 github.com/tidwall/gjson v1.19.0 github.com/urfave/cli/v3 v3.11.0 golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f - golang.org/x/oauth2 v0.36.0 - golang.org/x/sync v0.23.0 - golang.org/x/sys v0.48.0 - golang.org/x/term v0.46.0 - golang.org/x/text v0.42.0 + golang.org/x/oauth2 v0.37.0 + golang.org/x/sync v0.24.0 + golang.org/x/sys v0.49.0 + golang.org/x/term v0.47.0 + golang.org/x/text v0.43.0 k8s.io/client-go v12.0.0+incompatible sigs.k8s.io/yaml v1.6.0 ) @@ -36,6 +36,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.13.0 // indirect + github.com/evanphx/json-patch v5.9.11+incompatible // indirect github.com/fxamacker/cbor/v2 v2.9.1 // indirect github.com/go-logr/logr v1.4.4 // indirect github.com/go-openapi/jsonpointer v1.0.0 // indirect @@ -64,22 +65,23 @@ require ( github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.70.0 // indirect github.com/prometheus/procfs v0.21.1 // indirect - github.com/rancher/aks-operator v1.16.0-rc.2 // indirect - github.com/rancher/ali-operator v1.16.0-rc.1 // indirect - github.com/rancher/eks-operator v1.16.0-rc.2 // indirect - github.com/rancher/fleet/pkg/apis v0.17.0-alpha.1 // indirect - github.com/rancher/gke-operator v1.16.0-rc.2 // indirect + github.com/rancher/aks-operator v1.16.0-rc.5 // indirect + github.com/rancher/ali-operator v1.16.0-rc.3 // indirect + github.com/rancher/eks-operator v1.16.0-rc.3 // indirect + github.com/rancher/fleet/pkg/apis v0.17.0-beta.2 // indirect + github.com/rancher/gke-operator v1.16.0-rc.4 // indirect github.com/rancher/lasso v0.2.10 // indirect - github.com/rancher/wrangler/v3 v3.8.0-rc.2 // indirect + github.com/rancher/wrangler/v3 v3.8.0-rc.3 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/x448/float16 v0.8.4 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect - golang.org/x/net v0.60.0 // indirect - golang.org/x/time v0.15.0 // indirect + golang.org/x/net v0.61.0 // indirect + golang.org/x/time v0.16.0 // indirect google.golang.org/protobuf v1.36.12 // indirect + gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect k8s.io/api v0.37.1 // indirect k8s.io/apimachinery v0.37.1 // indirect diff --git a/go.sum b/go.sum index 49333e14..5b28c71d 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes= github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8= +github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fxamacker/cbor/v2 v2.9.1 h1:2rWm8B193Ll4VdjsJY28jxs70IdDsHRWgQYAI80+rMQ= github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= @@ -78,26 +80,26 @@ github.com/prometheus/common v0.70.0 h1:bcpru3tWPVnxGnETLgOV5jbp/JRXgYEyv65CuBLA github.com/prometheus/common v0.70.0/go.mod h1:S/SFasQmgGiYH6C81LKCtYa8QACgthGg5zxL2udV7SY= github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI= github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY= -github.com/rancher/aks-operator v1.16.0-rc.2 h1:NonAkAWRkWnlZiiSV/Jb1NPZWdPh/CUnTK8WcIlcyog= -github.com/rancher/aks-operator v1.16.0-rc.2/go.mod h1:i5tSeSkhswjoX+p95dh2aVXXkDRow6comdNLxBit24U= -github.com/rancher/ali-operator v1.16.0-rc.1 h1:oqQkKHaqoKLJdUmm3SmXczNioW68d/9NHL0Spr+BWiU= -github.com/rancher/ali-operator v1.16.0-rc.1/go.mod h1:/6QoId34BBnCOz3q73yTxJoko0bTngtaWqIW/Y7zJ14= -github.com/rancher/eks-operator v1.16.0-rc.2 h1:ES8EEmXS45NtKPLBGuTlynk0PT1MzvXRvTnp76lHsVw= -github.com/rancher/eks-operator v1.16.0-rc.2/go.mod h1:cw11LJDfalvs0s8cHPos1/yH3rIY+EWAJB6Ap77k9XI= -github.com/rancher/fleet/pkg/apis v0.17.0-alpha.1 h1:rtjAwj6YNSo6570OHDQIRoj78KNwi4WEUOF2mZ8sdj4= -github.com/rancher/fleet/pkg/apis v0.17.0-alpha.1/go.mod h1:aXKyYDfC0a6pmsgwt3Lqd2F+wMYZNpewhyo/RgE3I+0= -github.com/rancher/gke-operator v1.16.0-rc.2 h1:sSyGZSkqkiQQdADZk0AAdb3obJ0NcLUezgwAgN5j7oU= -github.com/rancher/gke-operator v1.16.0-rc.2/go.mod h1:d2Gc7C0/dI6LgGRm9pIX4FcRAV/iHlTcEycon5HVTrs= +github.com/rancher/aks-operator v1.16.0-rc.5 h1:ldAw1RA+6AlkxZBemucHq1n0cneLOlRMMfrjF8GTEKM= +github.com/rancher/aks-operator v1.16.0-rc.5/go.mod h1:T/c3ngz/89TEONAwU/OuQdmNdSoQYwwI+9QNWNiWuYg= +github.com/rancher/ali-operator v1.16.0-rc.3 h1:urr48sqec36QZBZi9UTjZphGSj3pznNuFsX13UtaKsw= +github.com/rancher/ali-operator v1.16.0-rc.3/go.mod h1:4bmLWdv7SEcxGzivxBcUwBtwXNB63JfOFzlA+uQusPY= +github.com/rancher/eks-operator v1.16.0-rc.3 h1:4qI9Chcgl1zPL7Mr9Ty3zKndhxo+UeWlP/A+FA4DqyE= +github.com/rancher/eks-operator v1.16.0-rc.3/go.mod h1:jxtD/lIs6icpOtdytWKJ2xeynU0y/sWIr077jcl69BA= +github.com/rancher/fleet/pkg/apis v0.17.0-beta.2 h1:wP4ks/ghJKEUvnF4aql8Rxq+/k638cJgUWSOs6sLEpQ= +github.com/rancher/fleet/pkg/apis v0.17.0-beta.2/go.mod h1:Hd/CoLUr8LtBQVdP4zq8fATy+R4hHNEugoLhKXvThxk= +github.com/rancher/gke-operator v1.16.0-rc.4 h1:OHWIRsrDf5uwL63vYSkZlL5hMb9hKWAlB5ZGT76Bgho= +github.com/rancher/gke-operator v1.16.0-rc.4/go.mod h1:NYaV13vfY1k1oQCp3G8/2S4EX0RYXXZle/sKo5LEE4k= github.com/rancher/lasso v0.2.10 h1:8yz31RMjSDQkg0K4+2EuaO+FGorbNDgWDfdCVTNzElk= github.com/rancher/lasso v0.2.10/go.mod h1:O/+Qi1B0rDFsDuIbPecaUzvAdKNUFg9eZZFAuegnTh0= github.com/rancher/norman v0.10.1 h1:GHLNikXHoZksFRG1IGbq4ZQcuUuztU2ENO921F0M5ek= github.com/rancher/norman v0.10.1/go.mod h1:iL9cTzRqCJFjxizVA6bcdrmurVUl/xIM5zbjq7ODGCI= -github.com/rancher/rancher/pkg/apis v0.0.0-20261009144438-9262b09fcc6d h1:ReVZqbJaWRttejQgYDlxHvkyTxp9MpAcGBE9oXV05M4= -github.com/rancher/rancher/pkg/apis v0.0.0-20261009144438-9262b09fcc6d/go.mod h1:qWqt6qvM1iqtCB3GatAuxxe/d5BHqrzifOdsnlitVrM= -github.com/rancher/rancher/pkg/client v0.0.0-20261009144438-9262b09fcc6d h1:lCY1FhL16/pzHs3KKn5KhP3PyR+osT62wsWH0EfLnWc= -github.com/rancher/rancher/pkg/client v0.0.0-20261009144438-9262b09fcc6d/go.mod h1:Z7GYobcvnZ8bssVLzkI9Icv6A6NjVVHSVNbuq2gR04U= -github.com/rancher/wrangler/v3 v3.8.0-rc.2 h1:Hw+l7mkWqnFBjenphvyEjSANhUL1MY0PsKCmQT+FqT8= -github.com/rancher/wrangler/v3 v3.8.0-rc.2/go.mod h1:IaBqAfzbG9qCwF9c3sCb17Z4TKiCEyO7JUx+4tMwrAo= +github.com/rancher/rancher/pkg/apis v0.0.0-20261026073715-7758e3eb8c0f h1:wzaxAsQy2Ok2Vx1tikxSjSIGKSc9fgc2UAinQRURng4= +github.com/rancher/rancher/pkg/apis v0.0.0-20261026073715-7758e3eb8c0f/go.mod h1:MGkcTv1k7tBGRhDy9nu3C9xRgapI2QEZsn0XjA3IDtY= +github.com/rancher/rancher/pkg/client v0.0.0-20261026073715-7758e3eb8c0f h1:Ox8N7H2AaxfbcBlP1UzuXHO7wN4RNdARDtOJ2rGQvSU= +github.com/rancher/rancher/pkg/client v0.0.0-20261026073715-7758e3eb8c0f/go.mod h1:oF3pqn1f3/Epw+f6z0N/wevynkqzs4Ilhy6zuckGOaM= +github.com/rancher/wrangler/v3 v3.8.0-rc.3 h1:9KJuSBroB7wgNRXLk8tJ05Lj2ZHd7jAxgA+5wzAWNfE= +github.com/rancher/wrangler/v3 v3.8.0-rc.3/go.mod h1:IaBqAfzbG9qCwF9c3sCb17Z4TKiCEyO7JUx+4tMwrAo= github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo= github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= @@ -128,20 +130,20 @@ go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80= -golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU= -golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= -golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= -golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= -golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= -golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= -golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE= -golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc= -golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= -golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= -golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= -golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= +golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw= +golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= +golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= +golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM= +golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY= +golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= +golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= +golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE= +golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s= google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc= google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo= From 4a99233a012b65ee4d4c37afb4414a06a026b1c7 Mon Sep 17 00:00:00 2001 From: Andreas Kupries Date: Mon, 26 Oct 2026 12:15:21 +0100 Subject: [PATCH 3/4] bump golangci-lint to v2.15.0 (match older release lines) also bump the go minimum --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 722a8091..05a60194 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1 with: - version: v2.14.0 + version: v2.15.0 - name: Validate Go modules run: ./scripts/validate diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7d1ad53a..b6725df4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1 with: - version: v2.14.0 + version: v2.15.0 - name: Validate Go modules run: ./scripts/validate diff --git a/go.mod b/go.mod index 10e161ae..72089d01 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/cli -go 1.27.2 +go 1.27.3 toolchain go1.27.3 From 868a4cedb78eecde89175e029ae05707ebf08b71 Mon Sep 17 00:00:00 2001 From: Andreas Kupries Date: Mon, 26 Oct 2026 12:17:09 +0100 Subject: [PATCH 4/4] fix go.mod --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 72089d01..d4fa6ebb 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/rancher/cli go 1.27.3 -toolchain go1.27.3 - replace ( k8s.io/api => k8s.io/api v0.37.1 k8s.io/apimachinery => k8s.io/apimachinery v0.37.1