From 819b96c6a65773b4b54681a1cb94ba4b327e6068 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, 14 Apr 2025 18:39:11 +0000 Subject: [PATCH 1/2] Sync dependencies --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index aad647302..c3f627c51 100644 --- a/go.mod +++ b/go.mod @@ -42,11 +42,11 @@ 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.1 + github.com/rancher/dynamiclistener v0.6.2-rc.3 github.com/rancher/lasso v0.2.1 - github.com/rancher/rancher/pkg/apis v0.0.0-20250408155037-6659d967e2c7 + github.com/rancher/rancher/pkg/apis v0.0.0-20250414182110-de07f66da816 github.com/rancher/rke v1.8.0-rc.4 - github.com/rancher/wrangler v1.1.1 + github.com/rancher/wrangler v1.1.2 github.com/rancher/wrangler/v3 v3.2.0 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 955a317b1..13ca9a0f3 100644 --- a/go.sum +++ b/go.sum @@ -170,8 +170,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.0 h1:4bDrQ+7jO4nNCLciVM2WQNPKreRKOh1ieu8QxRzGLUs= github.com/rancher/aks-operator v1.11.0/go.mod h1:iipTP7sdC7XgmwMgTa+dkmzNFwabkrlAwbC0rIsbmH4= -github.com/rancher/dynamiclistener v0.6.1 h1:sw4fxjutSedm7uIPD4I/hhAS2zIJIk3wOZLEZEElcYI= -github.com/rancher/dynamiclistener v0.6.1/go.mod h1:0KhUMHy3VcGMGavTY3i1/Mr8rVM02wFqNlUzjc+Cplg= +github.com/rancher/dynamiclistener v0.6.2-rc.3 h1:HEF7yvLXJ3HJpV0vlG36F3/U8+KbXh4aUcKZi+V+mrw= +github.com/rancher/dynamiclistener v0.6.2-rc.3/go.mod h1:ncmVR7qR8kR1o6xNkTcVS2mZ9WtlljimBilIlNjdyzc= github.com/rancher/eks-operator v1.11.0 h1:o7HgTKGPr/UNskkAmUik5pDyIATeDbOo+3k2yGqejN8= github.com/rancher/eks-operator v1.11.0/go.mod h1:7G0kfoUs7qKMVgBdmeL/Mci7moV7OnyPkeX2MIvEBV8= github.com/rancher/fleet/pkg/apis v0.12.0 h1:ZzDB63LFLrtwu0wOMDSrmtboixEnwPnNS4sY0KfCr9M= @@ -182,12 +182,12 @@ github.com/rancher/lasso v0.2.1 h1:SZTqMVQn8cAOqvwGBd1/EYOIJ/MGN+UfJrOWvHd4jHU= github.com/rancher/lasso v0.2.1/go.mod h1:KSV3jBXfdXqdCuMm2uC8kKB9q/wuDYb3h0eHZoRjShM= github.com/rancher/norman v0.6.0 h1:8CyY9cVcw0L+YYZRGvXHPMENefLaDkmi6vpscrVjXew= github.com/rancher/norman v0.6.0/go.mod h1:CQ0/1CoEqbeJXvOXuRQvsmiBd7QIgxZG5IvQFOPAHOg= -github.com/rancher/rancher/pkg/apis v0.0.0-20250408155037-6659d967e2c7 h1:J4l35eMx0rusH7K9C9++MWt0TkOJUhimwweYJVGu0Ms= -github.com/rancher/rancher/pkg/apis v0.0.0-20250408155037-6659d967e2c7/go.mod h1:hc8fdG6FIRMmt9DEaolO/AmZku9so2R840mImM5HhD8= +github.com/rancher/rancher/pkg/apis v0.0.0-20250414182110-de07f66da816 h1:k2JyZHCqq/Dl652FEMEzslztIzCnisIVF1PMSUJ4lZc= +github.com/rancher/rancher/pkg/apis v0.0.0-20250414182110-de07f66da816/go.mod h1:hc8fdG6FIRMmt9DEaolO/AmZku9so2R840mImM5HhD8= github.com/rancher/rke v1.7.2 h1:+2fcl0gCjRHzf1ev9C9ptQ1pjYbDngC1Qv8V/0ki/dk= github.com/rancher/rke v1.7.2/go.mod h1:+x++Mvl0A3jIzNLiu8nkraqZXiHg6VPWv0Xl4iQCg+A= -github.com/rancher/wrangler v1.1.1 h1:wmqUwqc2M7ADfXnBCJTFkTB5ZREWpD78rnZMzmxwMvM= -github.com/rancher/wrangler v1.1.1/go.mod h1:ioVbKupzcBOdzsl55MvEDN0R1wdGggj8iNCYGFI5JvM= +github.com/rancher/wrangler v1.1.2 h1:oXbXo9k7y/H4drUpb4RM1c++vT9O3rpoNEfyusGykiU= +github.com/rancher/wrangler v1.1.2/go.mod h1:2k9MyhlBdjcutcBGoOJSUAz0HgDAXnMjv81d3n/AaQc= github.com/rancher/wrangler/v3 v3.2.0 h1:fZmhSOczW+pxAhyOaGG+9xbEwETPGA5gbS0x0Im2zWs= github.com/rancher/wrangler/v3 v3.2.0/go.mod h1:0C5QyvSrQOff8gQQzpB/L/FF03EQycjR3unSJcKCHno= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= From a6b72d67193e03b4f0b9d5c5b4f41b1b7ab86fa8 Mon Sep 17 00:00:00 2001 From: Tom Lebreux Date: Mon, 14 Apr 2025 14:41:11 -0400 Subject: [PATCH 2/2] Remove wrangler v1 --- go.mod | 1 - go.sum | 2 -- pkg/resources/management.cattle.io/v3/project/mutator.go | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c3f627c51..9e8f0efe9 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,6 @@ require ( github.com/rancher/lasso v0.2.1 github.com/rancher/rancher/pkg/apis v0.0.0-20250414182110-de07f66da816 github.com/rancher/rke v1.8.0-rc.4 - github.com/rancher/wrangler v1.1.2 github.com/rancher/wrangler/v3 v3.2.0 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 13ca9a0f3..f41b9a5a1 100644 --- a/go.sum +++ b/go.sum @@ -186,8 +186,6 @@ github.com/rancher/rancher/pkg/apis v0.0.0-20250414182110-de07f66da816 h1:k2JyZH github.com/rancher/rancher/pkg/apis v0.0.0-20250414182110-de07f66da816/go.mod h1:hc8fdG6FIRMmt9DEaolO/AmZku9so2R840mImM5HhD8= github.com/rancher/rke v1.7.2 h1:+2fcl0gCjRHzf1ev9C9ptQ1pjYbDngC1Qv8V/0ki/dk= github.com/rancher/rke v1.7.2/go.mod h1:+x++Mvl0A3jIzNLiu8nkraqZXiHg6VPWv0Xl4iQCg+A= -github.com/rancher/wrangler v1.1.2 h1:oXbXo9k7y/H4drUpb4RM1c++vT9O3rpoNEfyusGykiU= -github.com/rancher/wrangler v1.1.2/go.mod h1:2k9MyhlBdjcutcBGoOJSUAz0HgDAXnMjv81d3n/AaQc= github.com/rancher/wrangler/v3 v3.2.0 h1:fZmhSOczW+pxAhyOaGG+9xbEwETPGA5gbS0x0Im2zWs= github.com/rancher/wrangler/v3 v3.2.0/go.mod h1:0C5QyvSrQOff8gQQzpB/L/FF03EQycjR3unSJcKCHno= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= diff --git a/pkg/resources/management.cattle.io/v3/project/mutator.go b/pkg/resources/management.cattle.io/v3/project/mutator.go index 1f2845c9a..27d041c1e 100644 --- a/pkg/resources/management.cattle.io/v3/project/mutator.go +++ b/pkg/resources/management.cattle.io/v3/project/mutator.go @@ -10,8 +10,8 @@ import ( ctrlv3 "github.com/rancher/webhook/pkg/generated/controllers/management.cattle.io/v3" objectsv3 "github.com/rancher/webhook/pkg/generated/objects/management.cattle.io/v3" "github.com/rancher/webhook/pkg/patch" - "github.com/rancher/wrangler/pkg/name" corev1controller "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v3/pkg/name" "github.com/sirupsen/logrus" admissionv1 "k8s.io/api/admission/v1" admissionregistrationv1 "k8s.io/api/admissionregistration/v1"