Add upgradeContainerSpec to ManagedOS and update wrangler (#66)

* Allow to specify a upgradeContainerSpec on ManagedOS #59 Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com> * Run go generate and update wrangler Also pin golang.org/x/tools to latest, to workaround golang/go#37617 Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com> * Update docs Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com> * Adapt to new wrangler signal context rancher/wrangler@9460166 Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com> * Fixup license headers Signed-off-by: Ettore Di Giacinto <edigiacinto@suse.com>
rancher · Mar 23, 2022 · b1331ab · b1331ab
1 parent 3a40ede
commit b1331ab
Show file tree

Hide file tree

Showing 33 changed files with 87 additions and 54 deletions.
diff --git a/cmd/ros-operator/main.go b/cmd/ros-operator/main.go
@@ -17,7 +17,6 @@ limitations under the License.
 package main
 
 import (
-	"context"
 	"flag"
 	"os"
 
@@ -33,7 +32,7 @@ var (
 func main() {
 	flag.Parse()
 	logrus.Info("Starting controller")
-	ctx := signals.SetupSignalHandler(context.Background())
+	ctx := signals.SetupSignalContext()
 
 	if os.Getenv("NAMESPACE") != "" {
 		*namespace = os.Getenv("NAMESPACE")

diff --git a/docs/operator.md b/docs/operator.md
@@ -94,6 +94,18 @@ spec:
   # multiple clusters.  The syntax of this field matches the
   # Fleet targets and is described at https://fleet.rancher.io/gitrepo-targets/
   targets: []
+
+  # Overrides the default container created for running the upgrade with a custom one
+  # This is optional and used only if specific upgrading mechanisms needs to be applied
+  # in place of the default behavior.
+  # The image used here overrides ones specified in osImage, depending on the upgrade strategy.
+  upgradeContainer:
+    image: ubuntu
+    command: ["/bin/sh"]
+    args: ["-c", "true"]
+    env:
+    - name: TEST_ENV
+      value: testValue
 ```
 
 ## Inventory Management

diff --git a/go.mod b/go.mod
@@ -46,11 +46,11 @@ require (
 	github.com/rancher/rancher/pkg/apis v0.0.0-20211013185633-a636bda2a00e
 	github.com/rancher/steve v0.0.0-20210922195510-7224dc21013d
 	github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210929162341-5e6e996d9486
-	github.com/rancher/wrangler v0.8.7
+	github.com/rancher/wrangler v0.8.11-0.20220217210408-3ecd23dfea3b
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tredoe/osutil v1.0.5
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
+	golang.org/x/tools v0.1.10 // indirect
 	gopkg.in/pin/tftp.v2 v2.1.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	gotest.tools v2.2.0+incompatible

diff --git a/go.sum b/go.sum
@@ -992,8 +992,8 @@ github.com/rancher/wrangler v0.8.1-0.20210506052526-673b7f8692d9/go.mod h1:aj/st
 github.com/rancher/wrangler v0.8.3/go.mod h1:dKEaHNB4izxmPUtpq1Hvr3z3Oh+9k5pCZyFO9sUhlaY=
 github.com/rancher/wrangler v0.8.5/go.mod h1:dKEaHNB4izxmPUtpq1Hvr3z3Oh+9k5pCZyFO9sUhlaY=
 github.com/rancher/wrangler v0.8.6-0.20210819203859-0babd42fbad8/go.mod h1:dKEaHNB4izxmPUtpq1Hvr3z3Oh+9k5pCZyFO9sUhlaY=
-github.com/rancher/wrangler v0.8.7 h1:WN9EWycceZ9gP5hEqIRJMrwi7cprxETMyKk/qXl+9ZU=
-github.com/rancher/wrangler v0.8.7/go.mod h1:dKEaHNB4izxmPUtpq1Hvr3z3Oh+9k5pCZyFO9sUhlaY=
+github.com/rancher/wrangler v0.8.11-0.20220217210408-3ecd23dfea3b h1:nFwp2dz+JHH96joqSVRYelOgmTQS9K8DSC3A/d1Gc9I=
+github.com/rancher/wrangler v0.8.11-0.20220217210408-3ecd23dfea3b/go.mod h1:Lte9WjPtGYxYacIWeiS9qawvu2R4NujFU9xuXWJvc/0=
 github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e/go.mod h1:2lcWR98q8HU3U4mVETnXc8quNG0uXxrt8vKd6cAa/30=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -1117,6 +1117,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
@@ -1236,8 +1237,9 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1274,8 +1276,9 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1338,8 +1341,9 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1472,6 +1476,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210629170331-7dc0b73dc9fb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -1486,8 +1491,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1579,8 +1585,9 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
+golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

diff --git a/pkg/apis/rancheros.cattle.io/v1/doc.go b/pkg/apis/rancheros.cattle.io/v1/doc.go
diff --git a/pkg/apis/rancheros.cattle.io/v1/machine.go b/pkg/apis/rancheros.cattle.io/v1/machine.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
+	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 	"github.com/rancher/wrangler/pkg/genericcondition"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -35,10 +35,10 @@ type MachineRegistration struct {
 }
 
 type MachineRegistrationSpec struct {
-	MachineName                 string               `json:"machineName,omitempty"`
-	MachineInventoryLabels      map[string]string    `json:"machineInventoryLabels,omitempty"`
-	MachineInventoryAnnotations map[string]string    `json:"machineInventoryAnnotations,omitempty"`
-	CloudConfig                 *v1alpha1.GenericMap `json:"cloudConfig,omitempty"`
+	MachineName                 string            `json:"machineName,omitempty"`
+	MachineInventoryLabels      map[string]string `json:"machineInventoryLabels,omitempty"`
+	MachineInventoryAnnotations map[string]string `json:"machineInventoryAnnotations,omitempty"`
+	CloudConfig                 *fleet.GenericMap `json:"cloudConfig,omitempty"`
 }
 
 type MachineRegistrationStatus struct {
@@ -60,7 +60,7 @@ type MachineInventory struct {
 
 type MachineInventorySpec struct {
 	TPMHash                string               `json:"tpmHash,omitempty"`
-	SMBIOS                 *v1alpha1.GenericMap `json:"smbios,omitempty"`
+	SMBIOS                 *fleet.GenericMap    `json:"smbios,omitempty"`
 	ClusterName            string               `json:"clusterName"`
 	MachineTokenSecretName string               `json:"machineTokenSecretName,omitempty"`
 	Config                 MachineRuntimeConfig `json:"config,omitempty"`

diff --git a/pkg/apis/rancheros.cattle.io/v1/os.go b/pkg/apis/rancheros.cattle.io/v1/os.go
@@ -39,9 +39,10 @@ type ManagedOSImageSpec struct {
 	NodeSelector *metav1.LabelSelector `json:"nodeSelector,omitempty"`
 	Concurrency  *int64                `json:"concurrency,omitempty"`
 
-	Prepare *upgradev1.ContainerSpec `json:"prepare,omitempty"`
-	Cordon  *bool                    `json:"cordon,omitempty"`
-	Drain   *upgradev1.DrainSpec     `json:"drain,omitempty"`
+	Prepare          *upgradev1.ContainerSpec `json:"prepare,omitempty"`
+	Cordon           *bool                    `json:"cordon,omitempty"`
+	Drain            *upgradev1.DrainSpec     `json:"drain,omitempty"`
+	UpgradeContainer *upgradev1.ContainerSpec `json:"upgradeContainer,omitempty"`
 
 	ClusterRolloutStrategy *fleet.RolloutStrategy `json:"clusterRolloutStrategy,omitempty"`
 	Targets                []fleet.BundleTarget   `json:"clusterTargets,omitempty"`

diff --git a/pkg/apis/rancheros.cattle.io/v1/zz_generated_deepcopy.go b/pkg/apis/rancheros.cattle.io/v1/zz_generated_deepcopy.go
diff --git a/pkg/apis/rancheros.cattle.io/v1/zz_generated_list_types.go b/pkg/apis/rancheros.cattle.io/v1/zz_generated_list_types.go
diff --git a/pkg/apis/rancheros.cattle.io/v1/zz_generated_register.go b/pkg/apis/rancheros.cattle.io/v1/zz_generated_register.go
diff --git a/pkg/apis/rancheros.cattle.io/zz_generated_register.go b/pkg/apis/rancheros.cattle.io/zz_generated_register.go
diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go
@@ -19,7 +19,7 @@ package main
 import (
 	"os"
 
-	"github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
+	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 	v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
 	provv1 "github.com/rancher/rancher/pkg/apis/provisioning.cattle.io/v1"
 	controllergen "github.com/rancher/wrangler/pkg/controller-gen"
@@ -45,7 +45,7 @@ func main() {
 			},
 			"fleet.cattle.io": {
 				Types: []interface{}{
-					v1alpha1.Bundle{},
+					fleet.Bundle{},
 				},
 			},
 			"rancheros.cattle.io": {

diff --git a/pkg/controllers/managedos/template.go b/pkg/controllers/managedos/template.go
@@ -67,6 +67,16 @@ func objects(mos *osv1.ManagedOSImage, prefix string) ([]runtime.Object, error)
 		selector = &metav1.LabelSelector{}
 	}
 
+	upgradeContainerSpec := mos.Spec.UpgradeContainer
+	if upgradeContainerSpec == nil {
+		upgradeContainerSpec = &upgradev1.ContainerSpec{
+			Image: PrefixPrivateRegistry(image[0], prefix),
+			Command: []string{
+				"/usr/sbin/suc-upgrade",
+			},
+		}
+	}
+
 	return []runtime.Object{
 		&rbacv1.ClusterRole{
 			ObjectMeta: metav1.ObjectMeta{
@@ -132,12 +142,7 @@ func objects(mos *osv1.ManagedOSImage, prefix string) ([]runtime.Object, error)
 					Name: "os-upgrader-data",
 					Path: "/run/data",
 				}},
-				Upgrade: &upgradev1.ContainerSpec{
-					Image: PrefixPrivateRegistry(image[0], prefix),
-					Command: []string{
-						"/usr/sbin/suc-upgrade",
-					},
-				},
+				Upgrade: upgradeContainerSpec,
 			},
 		},
 	}, nil

diff --git a/pkg/generated/controllers/fleet.cattle.io/factory.go b/pkg/generated/controllers/fleet.cattle.io/factory.go
diff --git a/pkg/generated/controllers/fleet.cattle.io/interface.go b/pkg/generated/controllers/fleet.cattle.io/interface.go
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/interface.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/interface.go
diff --git a/pkg/generated/controllers/management.cattle.io/factory.go b/pkg/generated/controllers/management.cattle.io/factory.go
diff --git a/pkg/generated/controllers/management.cattle.io/interface.go b/pkg/generated/controllers/management.cattle.io/interface.go
diff --git a/pkg/generated/controllers/management.cattle.io/v3/clusterregistrationtoken.go b/pkg/generated/controllers/management.cattle.io/v3/clusterregistrationtoken.go
diff --git a/pkg/generated/controllers/management.cattle.io/v3/interface.go b/pkg/generated/controllers/management.cattle.io/v3/interface.go
diff --git a/pkg/generated/controllers/management.cattle.io/v3/setting.go b/pkg/generated/controllers/management.cattle.io/v3/setting.go
diff --git a/pkg/generated/controllers/provisioning.cattle.io/factory.go b/pkg/generated/controllers/provisioning.cattle.io/factory.go
diff --git a/pkg/generated/controllers/provisioning.cattle.io/interface.go b/pkg/generated/controllers/provisioning.cattle.io/interface.go
diff --git a/pkg/generated/controllers/provisioning.cattle.io/v1/cluster.go b/pkg/generated/controllers/provisioning.cattle.io/v1/cluster.go
diff --git a/pkg/generated/controllers/provisioning.cattle.io/v1/interface.go b/pkg/generated/controllers/provisioning.cattle.io/v1/interface.go
diff --git a/pkg/generated/controllers/rancheros.cattle.io/factory.go b/pkg/generated/controllers/rancheros.cattle.io/factory.go
diff --git a/pkg/generated/controllers/rancheros.cattle.io/interface.go b/pkg/generated/controllers/rancheros.cattle.io/interface.go