Upgrade wrangler to fix race condition and use resource version

rancher · Nov 10, 2023 · fba1260 · fba1260
1 parent 523e955
commit fba1260
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 83 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/rancher/fleet
 go 1.19
 
 // Use changes from https://github.com/aruiz14/wrangler/commits/v1.1.1-debug-1842
-replace github.com/rancher/wrangler => github.com/aruiz14/wrangler v1.1.2-0.20231108100522-b20191ad7a9c
+replace github.com/rancher/wrangler => github.com/aruiz14/wrangler v1.1.2-0.20231110113925-46de5facad2e
 
 replace (
 	github.com/rancher/fleet/pkg/apis => ./pkg/apis

diff --git a/go.sum b/go.sum
@@ -252,8 +252,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/aruiz14/wrangler v1.1.2-0.20231108100522-b20191ad7a9c h1:QhX+jGL6PUClbp3a6ehVzSoN9RmWTt3O2nypN5AJEy8=
-github.com/aruiz14/wrangler v1.1.2-0.20231108100522-b20191ad7a9c/go.mod h1:ioVbKupzcBOdzsl55MvEDN0R1wdGggj8iNCYGFI5JvM=
+github.com/aruiz14/wrangler v1.1.2-0.20231110113925-46de5facad2e h1:ynnMBenEwXiti5AbVkqjwaGLtvaZ6fB8vf0zQqo0SA4=
+github.com/aruiz14/wrangler v1.1.2-0.20231110113925-46de5facad2e/go.mod h1:ioVbKupzcBOdzsl55MvEDN0R1wdGggj8iNCYGFI5JvM=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=

diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundle.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundle.go
diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundledeployment.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundledeployment.go
diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/cluster.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/cluster.go
diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clustergroup.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clustergroup.go
diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistration.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistration.go
diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistrationtoken.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistrationtoken.go