From c809dcaef3ef93169171bbb2104e639f2903cb06 Mon Sep 17 00:00:00 2001 From: Peter Matseykanets Date: Mon, 20 Apr 2026 10:31:48 -0400 Subject: [PATCH 1/2] Update k8s to v1.33.10 --- go.mod | 14 +++++++------- go.sum | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index c3b3ff34c..45d673dca 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ go 1.25.0 toolchain go1.25.7 replace ( - k8s.io/apiserver => k8s.io/apiserver v0.33.7 - k8s.io/client-go => k8s.io/client-go v0.33.7 - k8s.io/component-base => k8s.io/component-base v0.33.7 - k8s.io/kubernetes => k8s.io/kubernetes v1.33.7 + k8s.io/apiserver => k8s.io/apiserver v0.33.10 + k8s.io/client-go => k8s.io/client-go v0.33.10 + k8s.io/component-base => k8s.io/component-base v0.33.10 + k8s.io/kubernetes => k8s.io/kubernetes v1.33.10 ) require ( @@ -79,10 +79,10 @@ require ( 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.33.7 // indirect - k8s.io/apimachinery v0.33.7 // indirect + k8s.io/api v0.33.10 // indirect + k8s.io/apimachinery v0.33.10 // indirect k8s.io/apiserver v0.33.7 // indirect - k8s.io/component-base v0.33.7 // indirect + k8s.io/component-base v0.33.10 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect k8s.io/kubernetes v1.33.7 // indirect diff --git a/go.sum b/go.sum index b6807a5a4..64da64c06 100644 --- a/go.sum +++ b/go.sum @@ -206,22 +206,22 @@ 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.33.7 h1:Koh06KurzmXwCwe/DOaIiM1A8vEXTZ6B1tTDnmLLfxw= -k8s.io/api v0.33.7/go.mod h1:pu6qwFzTj0ijPbNYAbMgLFDEWgLFu2VUB6PVvQNtswc= -k8s.io/apimachinery v0.33.7 h1:f1kF3V+Stdr+2IGB8QhrfZ6J9JkXF6e1gWX2wKP5slU= -k8s.io/apimachinery v0.33.7/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= -k8s.io/apiserver v0.33.7 h1:A+3bpgxp9PUy8SEqVCrq5BoFxwUujYYwkrTXpv621cU= -k8s.io/apiserver v0.33.7/go.mod h1:d7/iHfHmI7WF+z+xuMi+O1osC1lHv6irtPua/7yVPto= -k8s.io/client-go v0.33.7 h1:sEcU4syZnbwaiGDctJE6G/IKsuays3wjEWGuyrD7M8c= -k8s.io/client-go v0.33.7/go.mod h1:0MEM10zY5dGdc3FdkyNCTKXiTr8P+2Vj65njzvE0Vhw= -k8s.io/component-base v0.33.7 h1:r3xd2l2lngeiOrQhpnD7CYtgbbrTDBnO3qyDUUfwTXw= -k8s.io/component-base v0.33.7/go.mod h1:3v7hH1NvNLID9BUBAR/FqM9StQ/Sa4yBDxEzE1yvGFg= +k8s.io/api v0.33.10 h1:8OHPP+ybXl9UKq1gpqvQPvfnwDtilBqfCY3+LQl4TK4= +k8s.io/api v0.33.10/go.mod h1:pVsaVIqAFpx/8NDmICPI0VOgnIc6oZJoGCpOgXrPGxY= +k8s.io/apimachinery v0.33.10 h1:XHdu/6MeJHzh7H2y31XVOL5GIYjP/tH5jcHofNYWaDc= +k8s.io/apimachinery v0.33.10/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/apiserver v0.33.10 h1:+qlZkMEwDyNlNjdAtKN9rk9+sWTlI6Xu7Sdz0HkMt0w= +k8s.io/apiserver v0.33.10/go.mod h1:yveZou7ScTWl/MKwnyqGf4u7ghgGHuoPC1z25g7k4tg= +k8s.io/client-go v0.33.10 h1:Q3KkTB0zPnGlrs6mS2p6LaJ2zM5ehBVz0JO9ZKQied0= +k8s.io/client-go v0.33.10/go.mod h1:pEg4JnHgHR+m6tZ23SUWj+md2iPdszmVG8KD9/pHtec= +k8s.io/component-base v0.33.10 h1:lqF51ldyCT3723fwmFZ3B/GLEY4s33VBjrw2GOGyfIA= +k8s.io/component-base v0.33.10/go.mod h1:SXzog0UR4MeP6ZwZFdt7g64X83BS+brXdDHQ6m4Tnd0= 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-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= -k8s.io/kubernetes v1.33.7 h1:Qhp1gwCPSOqt3du6A0uTGrrTcZDtShdSCIR5IZag16Y= -k8s.io/kubernetes v1.33.7/go.mod h1:eJiHC143tnNSvmDkCRwGNKA80yXqBvYC3U8L/i67nAY= +k8s.io/kubernetes v1.33.10 h1:TCsmKmuPY4uu23A5czT5SVhz847lCUddTahsf5VQeM4= +k8s.io/kubernetes v1.33.10/go.mod h1:BV62EkkitqrC6EiWYhJ4CuZiE5LwZZkjdoD7EtkeueA= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= From 96d3c7a1ace990c8d879d31e7b3750d8755946df Mon Sep 17 00:00:00 2001 From: Peter Matseykanets Date: Mon, 20 Apr 2026 10:33:05 -0400 Subject: [PATCH 2/2] Bump rancher to v2.12.9-alpha2 --- go.mod | 18 +++++++++--------- go.sum | 28 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 45d673dca..99cc24f25 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.6.1 - github.com/rancher/rancher/pkg/apis v0.0.0-20260325203238-fc88b11c7f6e - github.com/rancher/rancher/pkg/client v0.0.0-20260325203238-fc88b11c7f6e + github.com/rancher/rancher/pkg/apis v0.0.0-20260417115337-cf0cf7dd2764 + github.com/rancher/rancher/pkg/client v0.0.0-20260417115337-cf0cf7dd2764 github.com/sirupsen/logrus v1.9.4 github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.17.0 @@ -57,10 +57,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.7 // indirect - github.com/rancher/eks-operator v1.12.7 // indirect + github.com/rancher/aks-operator v1.12.8-rc.1 // indirect + github.com/rancher/eks-operator v1.12.8-rc.1 // indirect github.com/rancher/fleet/pkg/apis v0.13.7 // indirect - github.com/rancher/gke-operator v1.12.7 // indirect + github.com/rancher/gke-operator v1.12.8-rc.1 // indirect github.com/rancher/lasso v0.2.4 // indirect github.com/rancher/rke v1.8.0 // indirect github.com/rancher/wrangler/v3 v3.2.4 // indirect @@ -69,8 +69,8 @@ require ( 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.opentelemetry.io/otel v1.37.0 // indirect - go.opentelemetry.io/otel/trace v1.37.0 // indirect + go.opentelemetry.io/otel v1.39.0 // indirect + go.opentelemetry.io/otel/trace v1.39.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect golang.org/x/net v0.49.0 // indirect golang.org/x/sys v0.40.0 // indirect @@ -81,11 +81,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.33.10 // indirect k8s.io/apimachinery v0.33.10 // indirect - k8s.io/apiserver v0.33.7 // indirect + k8s.io/apiserver v0.33.10 // indirect k8s.io/component-base v0.33.10 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect - k8s.io/kubernetes v1.33.7 // indirect + k8s.io/kubernetes v1.33.10 // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect sigs.k8s.io/randfill v1.0.0 // indirect diff --git a/go.sum b/go.sum index 64da64c06..24c7a4c36 100644 --- a/go.sum +++ b/go.sum @@ -84,22 +84,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.7 h1:x7qj/u11mxxVO0bx/GJiHEJ0HKd5uPk+mkdXgWmBekE= -github.com/rancher/aks-operator v1.12.7/go.mod h1:jcD1iaxwrlo/ak6jz3e5y8z74DO1fElSd/pxNXeq99M= -github.com/rancher/eks-operator v1.12.7 h1:fJfri0vyA15SDiyF0U/a2/TI3cfkebtOo5A9kYDcjjQ= -github.com/rancher/eks-operator v1.12.7/go.mod h1:6Gx5v0AEnsGAmAZdnB433cypUVy1cesxtqjHtVwPySQ= +github.com/rancher/aks-operator v1.12.8-rc.1 h1:1AlfNEd3F66wUPzt/V5Tq8A+lmjm/sAMpulRnHliESw= +github.com/rancher/aks-operator v1.12.8-rc.1/go.mod h1:jcD1iaxwrlo/ak6jz3e5y8z74DO1fElSd/pxNXeq99M= +github.com/rancher/eks-operator v1.12.8-rc.1 h1:neCD4c/fBxuV/eNhMTU91gSuZCJnvnefHVNzwTWUfOc= +github.com/rancher/eks-operator v1.12.8-rc.1/go.mod h1:wxI5QJJTBIbh0xsbIZnanVi/o6Kqz0OIhzLR8Ittq7E= github.com/rancher/fleet/pkg/apis v0.13.7 h1:Te5sYbpE3jggoXkxpcg8L1hX1HdBH0vXK1byyCbmh18= github.com/rancher/fleet/pkg/apis v0.13.7/go.mod h1:dQVXeqW+jH4l57tYVD3Tz6vDMKVqyjyt6kBrFBTez18= -github.com/rancher/gke-operator v1.12.7 h1:C565pLPI9bonLLXq5qYdLnINmZjnvmz3nAvyvEmq12c= -github.com/rancher/gke-operator v1.12.7/go.mod h1:t6nfpoVEGVzb4g4DCCXEaC3FnG3jYgIdKgOu7AO7Cg8= +github.com/rancher/gke-operator v1.12.8-rc.1 h1:xnutT9SlpPw6C5xb2A9M+jgmLj8Ft5o1p9CzKdsMnHU= +github.com/rancher/gke-operator v1.12.8-rc.1/go.mod h1:UHN3xBvMynmqPWIcgbNqtRaU2mWIR874CpbEemOKrqA= github.com/rancher/lasso v0.2.4 h1:rCoVo32q4cgUap2uyyzSLVdMeRJHBF/QOQwwSX/3oWI= github.com/rancher/lasso v0.2.4/go.mod h1:G+KeeOaKRjp+qGp0bV6VbLhYrq1vHbJPbDh40ejg5yE= 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-20260325203238-fc88b11c7f6e h1:Sya7LBqBQNtq/ddRHURk9BTJqYf8RANk7eg+1lBREtQ= -github.com/rancher/rancher/pkg/apis v0.0.0-20260325203238-fc88b11c7f6e/go.mod h1:MtMIlD400HqCA3AkU/OpuohTNuFmpMzboUOLM/ThQmg= -github.com/rancher/rancher/pkg/client v0.0.0-20260325203238-fc88b11c7f6e h1:YNgQrRYKlZxhoSts2/HjsMOwtdVbuLE3g3bi6KgYOoo= -github.com/rancher/rancher/pkg/client v0.0.0-20260325203238-fc88b11c7f6e/go.mod h1:WjqrJCtQiDih4XzP+in8VaUUFP2AseuISgGvHy46XRQ= +github.com/rancher/rancher/pkg/apis v0.0.0-20260417115337-cf0cf7dd2764 h1:FhwyNgJIW3e3nXMtHGgEqJysEjcrz/8eaB4isEoMGDs= +github.com/rancher/rancher/pkg/apis v0.0.0-20260417115337-cf0cf7dd2764/go.mod h1:rzdfp7hZCOrflR7MQdghwcml3wlHefHlT64mSItqDaM= +github.com/rancher/rancher/pkg/client v0.0.0-20260417115337-cf0cf7dd2764 h1:H0rBIZU/W2EAlT1ur56hSa2wXwkkBUJ/ydGkOX4exOU= +github.com/rancher/rancher/pkg/client v0.0.0-20260417115337-cf0cf7dd2764/go.mod h1:+x7LByFN9+W164V3JrCxsCO3udyp1xLZcv94okfPzTk= 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.2.4 h1:pgpLwsmgQvTSSknxddJDq+ObIiOXFggCWdDyB0z7YcA= @@ -135,10 +135,10 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= -go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= -go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= -go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= +go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48= +go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8= +go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI= +go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=