diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89f9212e0..e45d93745 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,14 +28,15 @@ jobs: with: go-version-file: go.mod cache: false - # https://github.com/golang/go/issues/75031 + + # 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.1 + version: v2.11.3 - name: Validate Go modules run: ./scripts/validate diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bcf55d418..d52a670ee 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.6+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.1 + version: v2.11.3 - name: Validate Go modules run: ./scripts/validate diff --git a/go.mod b/go.mod index d08a6e84a..90373e6d2 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 ( k8s.io/apiserver => k8s.io/apiserver v0.35.6 @@ -13,19 +11,19 @@ replace ( require ( github.com/ghodss/yaml v1.0.0 - github.com/rancher/norman v0.8.8 - github.com/rancher/rancher/pkg/apis v0.0.0-20260826145222-63d8501ec849 - github.com/rancher/rancher/pkg/client v0.0.0-20260826145222-63d8501ec849 + github.com/rancher/norman v0.8.9 + github.com/rancher/rancher/pkg/apis v0.0.0-20260923184115-e15475cd89c2 + github.com/rancher/rancher/pkg/client v0.0.0-20260923184115-e15475cd89c2 github.com/sirupsen/logrus v1.9.4 github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.17.0 github.com/urfave/cli v1.22.17 - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 + golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 golang.org/x/oauth2 v0.36.0 golang.org/x/sync v0.22.0 golang.org/x/sys v0.47.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 ) @@ -57,14 +55,14 @@ require ( github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.66.1 // indirect github.com/prometheus/procfs v0.16.1 // indirect - github.com/rancher/aks-operator v1.14.5 // indirect - github.com/rancher/ali-operator v1.14.4 // indirect - github.com/rancher/eks-operator v1.14.5 // indirect - github.com/rancher/fleet/pkg/apis v0.15.5 // indirect - github.com/rancher/gke-operator v1.14.5 // indirect + github.com/rancher/aks-operator v1.14.6 // indirect + github.com/rancher/ali-operator v1.14.5 // indirect + github.com/rancher/eks-operator v1.14.6 // indirect + github.com/rancher/fleet/pkg/apis v0.15.7 // indirect + github.com/rancher/gke-operator v1.14.7 // indirect github.com/rancher/lasso v0.2.8 // indirect github.com/rancher/rke v1.8.0 // indirect - github.com/rancher/wrangler/v3 v3.6.0 // indirect + github.com/rancher/wrangler/v3 v3.6.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -74,14 +72,14 @@ require ( go.opentelemetry.io/otel/trace v1.44.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/net v0.57.0 // indirect + golang.org/x/net v0.58.0 // indirect golang.org/x/time v0.15.0 // indirect - google.golang.org/protobuf v1.36.11 // indirect + google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.35.6 // indirect - k8s.io/apimachinery v0.35.6 // indirect + k8s.io/api v0.35.7 // indirect + k8s.io/apimachinery v0.35.7 // indirect k8s.io/apiserver v0.35.6 // indirect k8s.io/component-base v0.35.6 // indirect k8s.io/klog/v2 v2.130.1 // indirect diff --git a/go.sum b/go.sum index a36ff698a..31cef9bfa 100644 --- a/go.sum +++ b/go.sum @@ -79,28 +79,28 @@ github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9Z github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= -github.com/rancher/aks-operator v1.14.5 h1:oC4fUDETYSp7bX360WPQP/j39eLOnhLrR8YnaNahh94= -github.com/rancher/aks-operator v1.14.5/go.mod h1:9vPplZMznOOTpuQSF6QA1XmCD7h9JZLmBjWeMPIDa7Y= -github.com/rancher/ali-operator v1.14.4 h1:NQw7BavNNVcVOvVA4uYUBLDKqK67QHQlsRlstYSLdQA= -github.com/rancher/ali-operator v1.14.4/go.mod h1:+i9z6C+l9j2ZE9ayrvW6SPoh/huxWT7KuPb0ExXuzEw= -github.com/rancher/eks-operator v1.14.5 h1:nVy/T1HZYeQz4PnQb7ThVoFpNIkgDR7sM7ONuCY0mMc= -github.com/rancher/eks-operator v1.14.5/go.mod h1:lXBGKlX+ZwyFJsrK3LQd69BoQIKl4G0jsWsXHYp0a4o= -github.com/rancher/fleet/pkg/apis v0.15.5 h1:fBxt9tcSg9Rp+wzBGQIF0/mjX/I9/y0tRHyawvBsx8I= -github.com/rancher/fleet/pkg/apis v0.15.5/go.mod h1:Ra19ippBU2JIpVTPPUcT5a2dfBaD/Asqtgah21rST+U= -github.com/rancher/gke-operator v1.14.5 h1:uqjnVGei1Fzs4fZaKaC9PfrSLNsc7T1BxeabYhROmeM= -github.com/rancher/gke-operator v1.14.5/go.mod h1:YwL+YTqJ5zrY1qNwEkiyfpoI7MdMOy0pJlN3frIiB/Q= +github.com/rancher/aks-operator v1.14.6 h1:xTuqzeX9Pp/e7s6qO5h+TYdywaPu2ZePRpuAHsoEeaM= +github.com/rancher/aks-operator v1.14.6/go.mod h1:XJciH9udsLW2cibVaCEvBIqFW8s6geC4+dzgl6HLoYs= +github.com/rancher/ali-operator v1.14.5 h1:jYzl56pV4ouvzmFU2QFXcCmaqiN7imBWflF2s6vQ6N0= +github.com/rancher/ali-operator v1.14.5/go.mod h1:haW0qlMxm5YdEOS3W0+5vSU/Io0mXP7TGaY6GghQigg= +github.com/rancher/eks-operator v1.14.6 h1:Zi5QEcwcBwzz5cVbM55CUn8C2dTVmtaig5AMjHMyhQU= +github.com/rancher/eks-operator v1.14.6/go.mod h1:fUSq8XrOtfM/Svbpcq6VBb3kJkrLEn5ynS+mC5yjVww= +github.com/rancher/fleet/pkg/apis v0.15.7 h1:dnp1G7/Pn2nEJu9SV8ejvPKip3zu+4bQsR87hzwcR1M= +github.com/rancher/fleet/pkg/apis v0.15.7/go.mod h1:1b0aKFEk6756TwXvKE5gawKTJTXQRpc0TsJVOZZIem0= +github.com/rancher/gke-operator v1.14.7 h1:1amPyklNZ2JfoPPqVyiaFGKgwbDMz/vYNt5qy28nKLA= +github.com/rancher/gke-operator v1.14.7/go.mod h1:MSAy+pazjs+hywilCKp4GVBvDeCMQLrqO0/oJnLxOFk= github.com/rancher/lasso v0.2.8 h1:AhAk1AKz9ZpvPlFj07JKRYGzIxaPNywUs2LpSwcyGDU= github.com/rancher/lasso v0.2.8/go.mod h1:HyENYowaiGY9jnsyxLnhGfoOBZlU3y+lws8qCYyuBOc= -github.com/rancher/norman v0.8.8 h1:cVNESbv74o4URBtZx9mxJf/19IZR6RrarV8VhVATzQk= -github.com/rancher/norman v0.8.8/go.mod h1:EveXXWPG4JTum/PD4thJn5kUew3xwSAHAClbZTUHA+U= -github.com/rancher/rancher/pkg/apis v0.0.0-20260826145222-63d8501ec849 h1:7fsADDsCvc/tOQ94X1pIw6jDhHRWSFZkfI0uryluUGM= -github.com/rancher/rancher/pkg/apis v0.0.0-20260826145222-63d8501ec849/go.mod h1:Nt+MGXSpyH1//yAQRCTPg7RPLIKSF+zjfncht836+I4= -github.com/rancher/rancher/pkg/client v0.0.0-20260826145222-63d8501ec849 h1:8HtEEHgmv2n5UbmK+aG6bogslN0RJebwviVbbPn59rc= -github.com/rancher/rancher/pkg/client v0.0.0-20260826145222-63d8501ec849/go.mod h1:xFosWHGNp70XwxgG1tFLgPAegCUl52lgKHROkq0S81Q= +github.com/rancher/norman v0.8.9 h1:k1CjAHnyUY9ucA3kjRerYfIRDmZNJcXyQ5zVmShyW48= +github.com/rancher/norman v0.8.9/go.mod h1:Ll1/gje7x5fCwT4k4lIkX+OeT7LC0dDycMzmGaJlVac= +github.com/rancher/rancher/pkg/apis v0.0.0-20260923184115-e15475cd89c2 h1:6D39eFM1LnNFXBC2CdWN/ynPZPCm94X8iWGWN51Br+s= +github.com/rancher/rancher/pkg/apis v0.0.0-20260923184115-e15475cd89c2/go.mod h1:DKZLT/BetBw9wOm/AJFuGXBGtexyotPA/VshNZ2aqPs= +github.com/rancher/rancher/pkg/client v0.0.0-20260923184115-e15475cd89c2 h1:IRrlbjuI+oEOCrDPRzc+OJu/VcX6pdzYtq2KFDwEp0w= +github.com/rancher/rancher/pkg/client v0.0.0-20260923184115-e15475cd89c2/go.mod h1:U3vp5qN39WRrRH4ZA8VZcsAtYYLjIzJOb5h8sh+J59o= 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.6.0 h1:pY5zWfRAij29x6VquOgvigONxQB8/b5ep2Gjt/r7QY4= -github.com/rancher/wrangler/v3 v3.6.0/go.mod h1:faWkkqF2HwWxEiK+pwuYE1mbOvs+BNEnVXVGHJT8bbw= +github.com/rancher/wrangler/v3 v3.6.1 h1:0+WbiVCtDqgJtIDiOVjkdfebK3eiaP4gsG6y9qim104= +github.com/rancher/wrangler/v3 v3.6.1/go.mod h1:2CNz+xBj0y+wSKWv7gD1aNVyQxyTtiC2yPDzkXQhmRU= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -143,12 +143,12 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= -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/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/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +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.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.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= @@ -157,14 +157,14 @@ golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= 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.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= -golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= +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.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= -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= -google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= -google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= +golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= +google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI= +google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -177,10 +177,10 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.35.6 h1:phPzP79F3kcONsD2TzmDiITNCV6/1Z5U3CCEcjtsXzI= -k8s.io/api v0.35.6/go.mod h1:GWKUaIp24fuDFigAgnhr9EJOKDqspnwPjYlpDca5B4U= -k8s.io/apimachinery v0.35.6 h1:ASSpfmmsOArKb2Hsu8gGlIcbIcEMVTboI3FfsfYuQ8k= -k8s.io/apimachinery v0.35.6/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc= +k8s.io/api v0.35.7 h1:qzjBIl6HRlZ4TXvVELrWC50d30RZu/uLJFE9efpLgxk= +k8s.io/api v0.35.7/go.mod h1:rXqZY94EWBj+9wVgdVOVS46MtnAEF09khzjCR4EOqiE= +k8s.io/apimachinery v0.35.7 h1:dIMi/gFnUDiASbeBqx1wqLAB8jlNo4kysncMZceV0OM= +k8s.io/apimachinery v0.35.7/go.mod h1:1I6w9iM6v//hXKgxe1g3ybZgcOaJrcYg9sQGtndFrmc= k8s.io/apiserver v0.35.6 h1:VWYg2S0wlAmN3URFpVeuLa4PP2RCpTFg1nvlUHOy2C8= k8s.io/apiserver v0.35.6/go.mod h1:wajGSrXO9w+lx69jYq4SaE4Xxw5KxxwvVD1zbttYA2E= k8s.io/client-go v0.35.6 h1:qZQv9a5B4YlIpXhFBwsI9qPOOJC6Z8lk9lkEWmrmus8=