Configure wrangler to use FastApply

rancher · Oct 31, 2023 · efcfd48 · efcfd48
1 parent d463f59
commit efcfd48
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -5,6 +5,8 @@ go 1.21
 replace (
 	github.com/rancher/fleet/pkg/apis => ./pkg/apis
 
+	github.com/rancher/wrangler/v2 => github.com/moio/wrangler/v2 v2.0.0-20231030151433-a52f62db4ca1
+
 	helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.12.3-fleet1
 	k8s.io/api => k8s.io/api v0.28.0
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.0
@@ -65,7 +67,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.12.3
 	k8s.io/api v0.28.0
-	k8s.io/apiextensions-apiserver v0.28.0
 	k8s.io/apimachinery v0.28.0
 	k8s.io/cli-runtime v0.28.0
 	k8s.io/client-go v12.0.0+incompatible
@@ -231,6 +232,7 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiextensions-apiserver v0.28.0 // indirect
 	k8s.io/apiserver v0.28.0 // indirect
 	k8s.io/code-generator v0.28.0 // indirect
 	k8s.io/component-base v0.28.0 // indirect

diff --git a/go.sum b/go.sum
@@ -743,6 +743,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/moio/wrangler/v2 v2.0.0-20231030151433-a52f62db4ca1 h1:IAqnyWkpyu71YBcvwR7nVmD3Spyi4THMKgPi8GvA2Jc=
+github.com/moio/wrangler/v2 v2.0.0-20231030151433-a52f62db4ca1/go.mod h1:2pCXUgRUaiiIZYqFe/nK2xwujNs6JK+SgAcyB+xs+Tg=
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -820,8 +822,6 @@ github.com/rancher/helm/v3 v3.12.3-fleet1 h1:CCvZttHJChIG097BZIMYHX9rcuPFhgjmmnc
 github.com/rancher/helm/v3 v3.12.3-fleet1/go.mod h1:KPKQiX9IP5HX7o5YnnhViMnNuKiL/lJBVQ47GHe1R0k=
 github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB5NUIHz/pWiW/lFpqcTUkN5uulY=
 github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29/go.mod h1:kgk9kJVMj9FIrrXU0iyM6u/9Je4bEjPImqswkTVaKsQ=
-github.com/rancher/wrangler/v2 v2.1.1 h1:EWAg2UNm+6EEACsUf/Pc7lcjswFpfkU2mCaQdxUkRPM=
-github.com/rancher/wrangler/v2 v2.1.1/go.mod h1:LgpEqT2ATL0MevUsL5rohrAEU419MIPeswsMNHw35d4=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=

diff --git a/internal/cmd/controller/controllers/controllers.go b/internal/cmd/controller/controllers/controllers.go
@@ -290,7 +290,9 @@ func newContext(cfg clientcmd.ClientConfig) (*appContext, error) {
 	if err != nil {
 		return nil, err
 	}
-	apply = apply.WithSetOwnerReference(false, false)
+	apply = apply.
+		WithFastApply().
+		WithSetOwnerReference(false, false)
 
 	k8s, err := kubernetes.NewForConfig(client)
 	if err != nil {