add columns to plan crd

Author: Robert Schuh

hack/crdgen.go

@@ -1,18 +1,17 @@
 package main
 
 import (
-	"os"
-
-	v1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1"
 	_ "github.com/rancher/system-upgrade-controller/pkg/generated/controllers/upgrade.cattle.io/v1"
+	"github.com/rancher/system-upgrade-controller/pkg/upgrade/plan"
 	"github.com/rancher/wrangler/pkg/crd"
+	"os"
 )
 
 func main() {
-	plan := crd.NamespacedType("Plan.upgrade.cattle.io/v1").
-		WithSchemaFromStruct(v1.Plan{}).
-		WithColumn("Image", ".spec.upgrade.image").
-		WithColumn("Channel", ".spec.channel").
-		WithColumn("Version", ".spec.version")
-	crd.Print(os.Stdout, []crd.CRD{plan})
+	planCrd, err := plan.CRD()
+	if err != nil {
+		print(err)
+		return
+	}
+	crd.Print(os.Stdout, []crd.CRD{*planCrd})
 }

pkg/upgrade/plan/plan.go

@@ -49,13 +49,17 @@ func CRD() (*crd.CRD, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &crd.CRD{
+	plan := crd.CRD{
 		GVK:        prototype.GroupVersionKind(),
 		PluralName: upgradeapiv1.PlanResourceName,
 		Status:     true,
 		Schema:     schema,
 		Categories: []string{"upgrade"},
-	}, nil
+	}.
+		WithColumn("Image", ".spec.upgrade.image").
+		WithColumn("Channel", ".spec.channel").
+		WithColumn("Version", ".spec.version")
+	return &plan, nil
 }
 
 func DigestStatus(plan *upgradeapiv1.Plan, secretCache corectlv1.SecretCache) (upgradeapiv1.PlanStatus, error) {