From e633042084e9f5e26be90067defbd8f1f23e8d7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2026 19:15:54 +0000 Subject: [PATCH 1/3] Update Rancher refs to v2.12.14 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- go.mod | 22 ++++++++++------------ go.sum | 44 ++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index bcd8df110..5c760da97 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/rancher/cli -go 1.25.11 - -toolchain go1.25.14 +go 1.26.0 replace ( github.com/google/gnostic-models => github.com/google/gnostic-models v0.6.9 @@ -20,8 +18,8 @@ replace ( require ( github.com/ghodss/yaml v1.0.0 github.com/rancher/norman v0.6.1 - github.com/rancher/rancher/pkg/apis v0.0.0-20260825235006-b09edb7237d1 - github.com/rancher/rancher/pkg/client v0.0.0-20260825235006-b09edb7237d1 + github.com/rancher/rancher/pkg/apis v0.0.0-20260923184132-21f6886d3791 + github.com/rancher/rancher/pkg/client v0.0.0-20260923184132-21f6886d3791 github.com/sirupsen/logrus v1.9.4 github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.17.0 @@ -30,7 +28,7 @@ require ( golang.org/x/oauth2 v0.36.0 golang.org/x/sync v0.22.0 golang.org/x/term v0.45.0 - golang.org/x/text v0.40.0 + golang.org/x/text v0.41.0 k8s.io/client-go v12.0.0+incompatible ) @@ -63,10 +61,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/rancher/aks-operator v1.12.12 // indirect - github.com/rancher/eks-operator v1.12.12 // indirect - github.com/rancher/fleet/pkg/apis v0.13.14 // indirect - github.com/rancher/gke-operator v1.12.12 // indirect + github.com/rancher/aks-operator v1.12.13 // indirect + github.com/rancher/eks-operator v1.12.13 // indirect + github.com/rancher/fleet/pkg/apis v0.13.16 // indirect + github.com/rancher/gke-operator v1.12.14 // indirect github.com/rancher/lasso v0.2.5 // indirect github.com/rancher/rke v1.8.0 // indirect github.com/rancher/wrangler/v3 v3.3.5 // indirect @@ -78,9 +76,9 @@ require ( go.opentelemetry.io/otel v1.44.0 // indirect go.opentelemetry.io/otel/trace v1.44.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect - golang.org/x/net v0.57.0 // indirect + golang.org/x/net v0.58.0 // indirect golang.org/x/sys v0.47.0 // indirect - golang.org/x/time v0.13.0 // indirect + golang.org/x/time v0.14.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 8030d140f..1bfb6c95c 100644 --- a/go.sum +++ b/go.sum @@ -85,22 +85,22 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rancher/aks-operator v1.12.12 h1:my5Zoz0ZIAfOkXrjXvYqjaApEWco82Cu7SBUO0gANeI= -github.com/rancher/aks-operator v1.12.12/go.mod h1:MTOWoZ1F5KFIiKF0ylUCszgaXFZO4oX8ggB8eg2sEik= -github.com/rancher/eks-operator v1.12.12 h1:gq5YJOrKj9Y7PvtIFH0aEj4RDcGZnl+phgZY9izbffY= -github.com/rancher/eks-operator v1.12.12/go.mod h1:H9M+ftkh1E7yZP4ojarGwUaF+Ylky16D/pCo/r1vMVY= -github.com/rancher/fleet/pkg/apis v0.13.14 h1:lSAft6abJKq34NKpYTVqokyx83j5c+GNYw20uG8MbcA= -github.com/rancher/fleet/pkg/apis v0.13.14/go.mod h1:o8wZCQtMMu0iToBfYmCOHqVA/7dRWeC44vENnwOttOw= -github.com/rancher/gke-operator v1.12.12 h1:iyZauEphGB0HGUXuZYRSRwIMwhgAKY8/wAk/O1+k4MY= -github.com/rancher/gke-operator v1.12.12/go.mod h1:KdGGcfupS+FxOT/Iy/na2ArX056s1V/OifCqUuAsmqo= +github.com/rancher/aks-operator v1.12.13 h1:EzELgMzBNnawiAc7nGNseYTKSdPWjraTRyaUC+B+Xsc= +github.com/rancher/aks-operator v1.12.13/go.mod h1:lz+8783fUrh7t5wSA9SWADUfYLspskmbMLYb525e1a8= +github.com/rancher/eks-operator v1.12.13 h1:4zriP7Shrjot7JiCDIZU6XKY/Comr/9YOg5cyMGKoZU= +github.com/rancher/eks-operator v1.12.13/go.mod h1:VMTrtindZkcGwYO6uf6xYNryGkuEZjqzaxm+POa0g6w= +github.com/rancher/fleet/pkg/apis v0.13.16 h1:aEwADZ79UnA1TBwIdImAZyxpu0hhi2HbQqaXKvIgbwM= +github.com/rancher/fleet/pkg/apis v0.13.16/go.mod h1:sZ93ULmzY2daARTZqVf7vUYJRNvytZo81OFleHQfKMU= +github.com/rancher/gke-operator v1.12.14 h1:P1Do6TVwubEOU0mqBVHQnaXuNtyF3Aof7L0RRe3fvRo= +github.com/rancher/gke-operator v1.12.14/go.mod h1:1G/EjjMgMVl4GYER5hSaGms1HFr2oEmzGGbsESyHZYQ= github.com/rancher/lasso v0.2.5 h1:K++lWDDdfeN98Ixc1kCfUq0/q6tLjoHN++Np6QntXw0= github.com/rancher/lasso v0.2.5/go.mod h1:71rWfv+KkdSmSxZ9Ly5QYhxAu0nEUcaq9N2ByjcHqAM= github.com/rancher/norman v0.6.1 h1:JVIxkWZcbxtrcSK4WIwsmyB07TzTvoqqf/R0fZB7ylk= github.com/rancher/norman v0.6.1/go.mod h1:jRcnEruyY6olqtImy+q+zw0/iXX7YqLF4/K4kh5hR40= -github.com/rancher/rancher/pkg/apis v0.0.0-20260825235006-b09edb7237d1 h1:f/XDqvKi7pnKu8u+gHE00kVKltYwcy5bjmux1ilP2jA= -github.com/rancher/rancher/pkg/apis v0.0.0-20260825235006-b09edb7237d1/go.mod h1:kz6nb1YBfxDnTEY6Zm5U0ltU5GXulx4lhHbJiYtqOKM= -github.com/rancher/rancher/pkg/client v0.0.0-20260825235006-b09edb7237d1 h1:G33gYlnMwLpsB9MUOfOxq2DMsafEdeHc6fVQI2mz5Wc= -github.com/rancher/rancher/pkg/client v0.0.0-20260825235006-b09edb7237d1/go.mod h1:OnDP2YRPSzCPcEcHkrDJABJ4Ic2/1dqFiJrLOHugvlc= +github.com/rancher/rancher/pkg/apis v0.0.0-20260923184132-21f6886d3791 h1:qT8mbSrOtWnzkJruoBDJ8k43xgFobocf17dlLnxLqTE= +github.com/rancher/rancher/pkg/apis v0.0.0-20260923184132-21f6886d3791/go.mod h1:tAQdCOBTt+8NeuWW+W5mCy1VdVNhLs2WpKgeVAxc8s4= +github.com/rancher/rancher/pkg/client v0.0.0-20260923184132-21f6886d3791 h1:pE1svJ/3NcjXsvke+WXJtADoTj2cPzH7LE1Mn3kShsc= +github.com/rancher/rancher/pkg/client v0.0.0-20260923184132-21f6886d3791/go.mod h1:4uMkyaAUxC/pKHGnHW57c5RuB8sWimOHBydWXxa1uEA= github.com/rancher/rke v1.8.0 h1:87jeoOccnnNCq27YgWgMh4o0GVrrVKbw+zfo+cHMZlo= github.com/rancher/rke v1.8.0/go.mod h1:x9N1abruzDFMwTpqq2cnaDYpKCptlNoW8VraNWB6Pc4= github.com/rancher/wrangler/v3 v3.3.5 h1:z05UoabtD/JZxy9nJ6HdaOiQbB8hh5kFPouu2bUTCqg= @@ -155,14 +155,14 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= -golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= +golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= -golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= +golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= 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.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -179,16 +179,16 @@ golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= -golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= -golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= -golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= +golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= +golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= +golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= +golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= -golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= +golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= +golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From ff155ae32f505ff12079594d93e651749fda4846 Mon Sep 17 00:00:00 2001 From: tashima42 Date: Wed, 23 Sep 2026 16:53:12 -0300 Subject: [PATCH 2/3] bump golangci-lint --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bb108466..e45d93745 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,12 +31,12 @@ jobs: # https://github.com/golang/go/issues/75031 - name: Set toolchain version - run: go env -w GOTOOLCHAIN=go1.25.4+auto + run: go env -w GOTOOLCHAIN=go1.26.1+auto - name: Lint - uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0 + uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1 with: - version: v2.7.2 + version: v2.11.3 - name: Validate Go modules run: ./scripts/validate From 1b5f09942455602e7117abfd070d90bd74020daf Mon Sep 17 00:00:00 2001 From: tashima42 Date: Wed, 23 Sep 2026 18:12:28 -0300 Subject: [PATCH 3/3] bump golangci-lint --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e2584e35..3bd1dc292 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,12 +45,12 @@ jobs: # https://github.com/golang/go/issues/75031 - name: Set toolchain version - run: go env -w GOTOOLCHAIN=go1.25.4+auto + run: go env -w GOTOOLCHAIN=go1.26.1+auto - name: Lint - uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0 + uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1 with: - version: v2.7.2 + version: v2.11.3 - name: Validate Go modules run: ./scripts/validate