From 936361da9f98c9531495faa0d9aa20288c74aaea Mon Sep 17 00:00:00 2001 From: "rancher-pr-and-push-webhook[bot]" <181785884+rancher-pr-and-push-webhook[bot]@users.noreply.github.com> Date: Mon, 17 Nov 2025 17:40:39 +0000 Subject: [PATCH 1/2] Sync dependencies --- go.mod | 10 +++++----- go.sum | 26 ++++++++++++-------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 5a2c160ee..066e58dc0 100644 --- a/go.mod +++ b/go.mod @@ -44,9 +44,9 @@ require ( github.com/evanphx/json-patch v5.9.11+incompatible github.com/go-ldap/ldap/v3 v3.4.10 github.com/gorilla/mux v1.8.1 - github.com/rancher/dynamiclistener v0.6.4-rc.2 + github.com/rancher/dynamiclistener v0.6.2 github.com/rancher/lasso v0.2.4 - github.com/rancher/rancher/pkg/apis v0.0.0-20250919133431-8e6245f06426 + github.com/rancher/rancher/pkg/apis v0.0.0-20251117152414-4c6aae24ab59 github.com/rancher/rke v1.8.5 github.com/rancher/wrangler/v3 v3.2.4 github.com/robfig/cron v1.2.0 @@ -116,10 +116,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.11.6 // indirect - github.com/rancher/eks-operator v1.11.6 // indirect + github.com/rancher/aks-operator v1.11.7-rc.3 // indirect + github.com/rancher/eks-operator v1.11.7-rc.2 // indirect github.com/rancher/fleet/pkg/apis v0.12.3 // indirect - github.com/rancher/gke-operator v1.11.6 // indirect + github.com/rancher/gke-operator v1.11.7-rc.2 // indirect github.com/rancher/norman v0.5.2 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/go.sum b/go.sum index 2ea263316..d70029ca9 100644 --- a/go.sum +++ b/go.sum @@ -152,8 +152,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/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.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw= -github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE= +github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns= +github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -171,22 +171,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.11.6 h1:8MS9FupLEdRa2Edfe7nsk/yGyKr9ETPRrsioE8mmUGI= -github.com/rancher/aks-operator v1.11.6/go.mod h1:IfhwFivRMaREoGJjO0J6/337iN7Ek4gITuFQeBFx1p0= -github.com/rancher/dynamiclistener v0.6.4-rc.2 h1:2ko4gSmSTXnn8Yk8cJWcEGUoYYA0ESR5WmfbfBD/EmI= -github.com/rancher/dynamiclistener v0.6.4-rc.2/go.mod h1:MqdVm4tlq7jPyd0+PrdVxSROPpvRnlaat65rqtXjCak= -github.com/rancher/eks-operator v1.11.6 h1:ilGH/H6+YXktg0yHRlAba7rUFn9zN9cGxRNx00ZskDY= -github.com/rancher/eks-operator v1.11.6/go.mod h1:n+NAS/0MzYHvhoQFLjM9znz4Qa6lU+qSJ71Erw8hb80= +github.com/rancher/aks-operator v1.11.7-rc.3 h1:QbCdKu70jBv4nN4Uo3+h3A+UZKmEdlCAwchsc/JOY3E= +github.com/rancher/aks-operator v1.11.7-rc.3/go.mod h1:qCRocens+NBidwsUaPi3IN5KW38DO3beRXriKw4phs0= +github.com/rancher/dynamiclistener v0.6.2 h1:F0SEJhvO2aFe0eTvKGlQoy5x7HtwK8oJbyITVfBSb90= +github.com/rancher/dynamiclistener v0.6.2/go.mod h1:ncmVR7qR8kR1o6xNkTcVS2mZ9WtlljimBilIlNjdyzc= +github.com/rancher/eks-operator v1.11.7-rc.2 h1:IsMV7k4RIyhBINI2fjqEAly+Fv2QYoBOgsH4Bx+/Wkk= +github.com/rancher/eks-operator v1.11.7-rc.2/go.mod h1:Jon/pwvOs5yy9tBcUqUdHVcYtPzprGXSxeKnDk96pAI= github.com/rancher/fleet/pkg/apis v0.12.3 h1:GMO3V0AK+V5BmuTMH7EPrL3QcrgFWUItEQCqPj1zNZQ= github.com/rancher/fleet/pkg/apis v0.12.3/go.mod h1:KAjRE0EDXanNiohC/OQyeQvxBmGqIX+yh/Y1kSF4OyE= -github.com/rancher/gke-operator v1.11.6 h1:CM2hyVgJebn3izujjDBmS6nBVg/g6+Blebm3wKJECfo= -github.com/rancher/gke-operator v1.11.6/go.mod h1:pgC87wYJi/h2votAfzGTKynwpVwvypn8BntxiEgym5Y= +github.com/rancher/gke-operator v1.11.7-rc.2 h1:2e6yH7aQVhKKgLMg3BWb+R3SHEqB1WopumPg4EgQOfc= +github.com/rancher/gke-operator v1.11.7-rc.2/go.mod h1:P3Yy6dztn2RJYzSETYfiE0HZNo6IqlKLMnq/yyCRifs= 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.5.2 h1:rwUKZ0QeVKJEtznhRdNQUMJtKjSoLYbFuPQGXm6xTxw= github.com/rancher/norman v0.5.2/go.mod h1:lDO9ylAYBwch9FiYyuuWlYd7+IxgRgh0ioDJBweC7t4= -github.com/rancher/rancher/pkg/apis v0.0.0-20250919133431-8e6245f06426 h1:DKhDteLSTiHeGhJ2G3lUqJ6GvGOK+oJ5x6ADp191PRo= -github.com/rancher/rancher/pkg/apis v0.0.0-20250919133431-8e6245f06426/go.mod h1:1ZRTZ0+iJDdpFOPSZmOaNwxLkZ24Izo3tP2s9VI21lQ= +github.com/rancher/rancher/pkg/apis v0.0.0-20251117152414-4c6aae24ab59 h1:JLIV2andfsOrq6QebjeJ7JyOJcWhBqIf86fTzvuenNQ= +github.com/rancher/rancher/pkg/apis v0.0.0-20251117152414-4c6aae24ab59/go.mod h1:QvXrxUs0jXcYciZsuqRVpQNYKVA2PrNsnHyVthIdz2I= github.com/rancher/rke v1.8.4 h1:BXcHJ6nkxpoIaaagFXvSbwW3S2AW4Jx4ruYZ53bl9tE= github.com/rancher/rke v1.8.4/go.mod h1:EaAkq796bgmmx/s15Xz0TvCkBOfepMOqO8tFockOmis= github.com/rancher/wrangler/v3 v3.2.4 h1:pgpLwsmgQvTSSknxddJDq+ObIiOXFggCWdDyB0z7YcA= @@ -264,8 +264,6 @@ go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg= go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY= -go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= -go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= 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= From d85c8bd4fde88221d3bf7dc8b79a30bfa23ddabc Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Mon, 17 Nov 2025 17:54:05 -0500 Subject: [PATCH 2/2] revert dynamiclistener dependency --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 066e58dc0..eaa83a834 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/evanphx/json-patch v5.9.11+incompatible github.com/go-ldap/ldap/v3 v3.4.10 github.com/gorilla/mux v1.8.1 - github.com/rancher/dynamiclistener v0.6.2 + github.com/rancher/dynamiclistener v0.6.4 github.com/rancher/lasso v0.2.4 github.com/rancher/rancher/pkg/apis v0.0.0-20251117152414-4c6aae24ab59 github.com/rancher/rke v1.8.5 diff --git a/go.sum b/go.sum index d70029ca9..95baf754a 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rancher/aks-operator v1.11.7-rc.3 h1:QbCdKu70jBv4nN4Uo3+h3A+UZKmEdlCAwchsc/JOY3E= github.com/rancher/aks-operator v1.11.7-rc.3/go.mod h1:qCRocens+NBidwsUaPi3IN5KW38DO3beRXriKw4phs0= -github.com/rancher/dynamiclistener v0.6.2 h1:F0SEJhvO2aFe0eTvKGlQoy5x7HtwK8oJbyITVfBSb90= -github.com/rancher/dynamiclistener v0.6.2/go.mod h1:ncmVR7qR8kR1o6xNkTcVS2mZ9WtlljimBilIlNjdyzc= +github.com/rancher/dynamiclistener v0.6.4 h1:Mpm/jNiI03k+HWEkKgz816k9t+EV6xI0off6dd1dSH4= +github.com/rancher/dynamiclistener v0.6.4/go.mod h1:MqdVm4tlq7jPyd0+PrdVxSROPpvRnlaat65rqtXjCak= github.com/rancher/eks-operator v1.11.7-rc.2 h1:IsMV7k4RIyhBINI2fjqEAly+Fv2QYoBOgsH4Bx+/Wkk= github.com/rancher/eks-operator v1.11.7-rc.2/go.mod h1:Jon/pwvOs5yy9tBcUqUdHVcYtPzprGXSxeKnDk96pAI= github.com/rancher/fleet/pkg/apis v0.12.3 h1:GMO3V0AK+V5BmuTMH7EPrL3QcrgFWUItEQCqPj1zNZQ=