From 8d9460b7182b25f41b31cf11cdcd451ae8d46e58 Mon Sep 17 00:00:00 2001 From: Peter Matseykanets Date: Thu, 30 Jul 2026 16:22:53 -0400 Subject: [PATCH 1/4] Bump Go toolchain to go1.25.12 --- go.mod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7221a937d..b16a4e0d7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/rancher/cli -go 1.25.11 +go 1.25.8 + +toolchain go1.25.12 replace ( k8s.io/apiserver => k8s.io/apiserver v0.35.5 From 6127599170a0602191e9dfae5aef611fafeb38b3 Mon Sep 17 00:00:00 2001 From: Peter Matseykanets Date: Thu, 30 Jul 2026 16:23:02 -0400 Subject: [PATCH 2/4] Update k8s to v1.35.6 --- go.mod | 10 +++++----- go.sum | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index b16a4e0d7..66ad52980 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ module github.com/rancher/cli -go 1.25.8 +go 1.25.11 toolchain go1.25.12 replace ( - k8s.io/apiserver => k8s.io/apiserver v0.35.5 - k8s.io/client-go => k8s.io/client-go v0.35.5 - k8s.io/component-base => k8s.io/component-base v0.35.5 - k8s.io/kubernetes => k8s.io/kubernetes v1.35.5 + k8s.io/apiserver => k8s.io/apiserver v0.35.6 + k8s.io/client-go => k8s.io/client-go v0.35.6 + k8s.io/component-base => k8s.io/component-base v0.35.6 + k8s.io/kubernetes => k8s.io/kubernetes v1.35.6 ) require ( diff --git a/go.sum b/go.sum index 69cfdb8fa..764c1e4cb 100644 --- a/go.sum +++ b/go.sum @@ -181,18 +181,18 @@ 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/apiserver v0.35.5 h1:ZtFpSEmxf/VmOdbL3bo7hLxyNRorRegqOLmYSW0mxEo= -k8s.io/apiserver v0.35.5/go.mod h1:6NNWFTq/UosCwUmqhQDC+3ApzSx5ekeYMIwzSG+49VU= -k8s.io/client-go v0.35.5 h1:wUrgqVSmFRw75bgSHY7X0G/hZM/QYpV0Hg7SYYOYpFk= -k8s.io/client-go v0.35.5/go.mod h1:Z0mDcAJsX1Y7RQfuQlJipiRtqf8Mhk2VDu1/JvRqdGo= -k8s.io/component-base v0.35.5 h1:1y1xxfpFNkNi4RMi6bvPNN4aDr9VhOijtEfrqnhPijs= -k8s.io/component-base v0.35.5/go.mod h1:n/+aL98XYINubqIu/Okh6mS/kZT2nMeN4IQkQR4VXRg= +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= +k8s.io/client-go v0.35.6/go.mod h1:LOO6N1EhxdQAzYIZ/73cJVyb3gixrMY6ZDJcJ/ANfsY= +k8s.io/component-base v0.35.6 h1:dTkck9uefkIrKn7wRCEYiDWNUvHd8UdwZCcVafmHgL4= +k8s.io/component-base v0.35.6/go.mod h1:qcNKrspACsqR+vgUJXkWzwtgUGkURcnrus41o92jjpk= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE= k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= -k8s.io/kubernetes v1.35.5 h1:xnHap3r0mqp36mFaLOt1Jreh8Az2+ZEhiUtIJGhou2w= -k8s.io/kubernetes v1.35.5/go.mod h1:fPfnQs8GtfrLQ+KuOcpvwQ+mV17jVcgdvPL6ZHxKp10= +k8s.io/kubernetes v1.35.6 h1:Kh9V2tfdF+yNVZ1UX5lVfd1zNpa94vdIkfhyAmWXzQI= +k8s.io/kubernetes v1.35.6/go.mod h1:fPfnQs8GtfrLQ+KuOcpvwQ+mV17jVcgdvPL6ZHxKp10= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= From 4c75f17ca5c6004317bd67a5cd7beb2b744f26f5 Mon Sep 17 00:00:00 2001 From: Peter Matseykanets Date: Thu, 30 Jul 2026 16:24:05 -0400 Subject: [PATCH 3/4] Bump rancher to v2.14.4-rc1 --- go.mod | 14 +++++++------- go.sum | 36 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 66ad52980..5a4806d6a 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ 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-20260629201752-4603afd27648 - github.com/rancher/rancher/pkg/client v0.0.0-20260629201752-4603afd27648 + github.com/rancher/rancher/pkg/apis v0.0.0-20260730152724-2b16899cac68 + github.com/rancher/rancher/pkg/client v0.0.0-20260730152724-2b16899cac68 github.com/sirupsen/logrus v1.9.4 github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.17.0 @@ -56,11 +56,11 @@ 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.3 // indirect - github.com/rancher/ali-operator v1.14.2 // indirect - github.com/rancher/eks-operator v1.14.3 // indirect - github.com/rancher/fleet/pkg/apis v0.15.4 // indirect - github.com/rancher/gke-operator v1.14.3 // indirect + github.com/rancher/aks-operator v1.14.4 // indirect + github.com/rancher/ali-operator v1.14.3 // indirect + github.com/rancher/eks-operator v1.14.4 // indirect + github.com/rancher/fleet/pkg/apis v0.15.5 // indirect + github.com/rancher/gke-operator v1.14.4 // 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 diff --git a/go.sum b/go.sum index 764c1e4cb..b55f3536b 100644 --- a/go.sum +++ b/go.sum @@ -62,10 +62,10 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.29.0 h1:rfh+ZFjgJhYWRoIqVf3Uwx/W20yLrcrE2h2GmYVRaag= -github.com/onsi/ginkgo/v2 v2.29.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= -github.com/onsi/gomega v1.41.0 h1:OwKp4pXNgVxf6sCplzYo794OFNuoL2q2SBMU5NSWOjA= -github.com/onsi/gomega v1.41.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= +github.com/onsi/ginkgo/v2 v2.32.0 h1:Hw7s2pVrQo/8Yz5N77qdnpHaoc+c6cC9WIV1Jce+J6E= +github.com/onsi/ginkgo/v2 v2.32.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= +github.com/onsi/gomega v1.42.1 h1:iN1rCUX+44NZ1Dc97MPoeFYbFR0vh8zxoxMFwKdyZ6I= +github.com/onsi/gomega v1.42.1/go.mod h1:REff/hsDsodHoKlWsP2mAPhu1+5/6hVYNf9rIEBpeSg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -79,24 +79,24 @@ 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.3 h1:XIL99+7+4DyuUH+ScIbRsn12YeQORO3VRSnlBWnN9UM= -github.com/rancher/aks-operator v1.14.3/go.mod h1:EK1+/rZWiKxD8F9WfwoYqJLU3ZW4kntu2IpzcS7QPfg= -github.com/rancher/ali-operator v1.14.2 h1:phEf5NfbhUOtRAA6EFM1bfOEnkHBBB4QR9riArPSyJc= -github.com/rancher/ali-operator v1.14.2/go.mod h1:uSNLJazCzqJY87fDvdyP3X+szyxv20G8mT5CneuYjCs= -github.com/rancher/eks-operator v1.14.3 h1:gc7BzleFY1AySaQqCFEoogzxhvkWmT68htybLXTHjs0= -github.com/rancher/eks-operator v1.14.3/go.mod h1:UjsdHMUSRKe3WVfUwUFlgf6j0Z2ow4YUXCTMXiBGd0k= -github.com/rancher/fleet/pkg/apis v0.15.4 h1:qk18X7NLbYUiqMD10BGVfNlmF5WfmPrrHaq6IQmSjVA= -github.com/rancher/fleet/pkg/apis v0.15.4/go.mod h1:0zKqgb4oGrf5FupqlKa9L6SotEHdOIVruGKkekBVVU4= -github.com/rancher/gke-operator v1.14.3 h1:p7TprFgDCzeZis3ohRSzW6FhDHOq+txbPo9Y1lqA0oQ= -github.com/rancher/gke-operator v1.14.3/go.mod h1:zVaeYM+VlrIeEgkbNHYGLd5ZX4yIkkjhoBWSuWCjXgo= +github.com/rancher/aks-operator v1.14.4 h1:Fo3X2mPeEuU5XGVA6SsIdVxTEK3AD/3q9z3oW6H5bUM= +github.com/rancher/aks-operator v1.14.4/go.mod h1:ygBMM/8VcFzo3Et4aRdAEREWSyC9eGue8sdHhW5PVlw= +github.com/rancher/ali-operator v1.14.3 h1:bSH1QGbl4M8b5mu4eFfHuFE/gnOY2OXsUxk/ewUApg4= +github.com/rancher/ali-operator v1.14.3/go.mod h1:TSdwQjkRzqXoGg65y2pGtEwwYyLR9mrSHDvGXPnGOd4= +github.com/rancher/eks-operator v1.14.4 h1:yExVq9P2ets0W7YmeSkTXAAYWIufz7x6tqKzvW3/0bI= +github.com/rancher/eks-operator v1.14.4/go.mod h1:HChuU+tg6egbz+AyKf+vejSgy0xV6/OzdDM/r6mD10o= +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.4 h1:mFwMBinMQ6BuTLhA2utSrrsCC25BuPdNGaANw81AdjE= +github.com/rancher/gke-operator v1.14.4/go.mod h1:lpbcJKDc6QugUJBDvmhApQmSPu5DpC5v/mmWsuwdraE= 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-20260629201752-4603afd27648 h1:QFXhn1vvaa9Ai0J6XGfkbQL05VyfeDKY5REHKymT3NM= -github.com/rancher/rancher/pkg/apis v0.0.0-20260629201752-4603afd27648/go.mod h1:CU77Xvtmy0+FnlYXztgt65AcBXD2j0T4Jks5puCMqMo= -github.com/rancher/rancher/pkg/client v0.0.0-20260629201752-4603afd27648 h1:21NHpYWKJ8+0W9G/4gnokMjh/HkWhhLNUzGCYjBbRRo= -github.com/rancher/rancher/pkg/client v0.0.0-20260629201752-4603afd27648/go.mod h1:+uhyiHaWXV4RT2H3T+0zSDN0FnXzTU1RG5OSMeG2S3A= +github.com/rancher/rancher/pkg/apis v0.0.0-20260730152724-2b16899cac68 h1:VEeePapU56egkT8akRaLw5aZ+uq28BSY7rVeHkpq4uk= +github.com/rancher/rancher/pkg/apis v0.0.0-20260730152724-2b16899cac68/go.mod h1:Z0pzIQyheG1kip2ZJ4FtvddUGTaO/gMjGuh3H1ZPxjg= +github.com/rancher/rancher/pkg/client v0.0.0-20260730152724-2b16899cac68 h1:HYAjQNhuiH5hT6CbI8Ny3Oe7KLhLoBJYzsKE8yfwyXU= +github.com/rancher/rancher/pkg/client v0.0.0-20260730152724-2b16899cac68/go.mod h1:Y1dQHqWNLqabWAPJp+ji8aWyCZb9hUmPr03buiBhl6w= 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= From 3270523421a9fd1420c41471b56269840f0b0f80 Mon Sep 17 00:00:00 2001 From: Peter Matseykanets Date: Thu, 30 Jul 2026 16:24:43 -0400 Subject: [PATCH 4/4] Bump golang.org/x/text to v0.39.0 --- go.mod | 2 +- go.sum | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 5a4806d6a..a29642a6c 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( golang.org/x/oauth2 v0.36.0 golang.org/x/sync v0.21.0 golang.org/x/term v0.44.0 - golang.org/x/text v0.38.0 + golang.org/x/text v0.39.0 k8s.io/client-go v12.0.0+incompatible ) diff --git a/go.sum b/go.sum index b55f3536b..5be843e2a 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ 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.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= +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.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= @@ -157,12 +157,12 @@ golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc= golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y= -golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE= -golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4= +golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus= +golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM= 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.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8= -golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0= +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= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=