Simulator: load simulator CRDs earlier

The NodeConfig CRD was loaded just before loading NodeConfig objects.
There is a chance the client can't get the mapping.
Move the CRD loading to the first stage.

Signed-off-by: Kiefer Chang <[email protected]>

Author: bk201

pkg/simulator/objects/apply.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/client-go/restmapper"
 
 	supportbundlekit "github.com/rancher/support-bundle-kit/pkg/simulator/apis/supportbundlekit.io/v1"
+	"github.com/rancher/support-bundle-kit/pkg/simulator/crd"
 )
 
 type ProgressHandler func(int, int)
@@ -90,6 +91,13 @@ func (o *ObjectManager) CreateUnstructuredClusterObjects() error {
 
 	progressMgr := NewProgressManager("Step 1/4: Cluster CRDs")
 
+	// add simulator CRDs
+	simCRDs, err := crd.Objects(false)
+	if err != nil {
+		return fmt.Errorf("error generating Simulator CRD objects: %v", err)
+	}
+	crds = append(crds, simCRDs...)
+
 	// apply CRDs first
 	err = o.ApplyObjects(crds, false, nil, progressMgr.progress)
 	if err != nil {

pkg/simulator/objects/process_node_zips.go

@@ -15,7 +15,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	bundlekit "github.com/rancher/support-bundle-kit/pkg/simulator/apis/supportbundlekit.io/v1"
-	"github.com/rancher/support-bundle-kit/pkg/simulator/crd"
 )
 
 const (
@@ -94,11 +93,6 @@ func (o *ObjectManager) ProcessNodeZipObjects() (noStatusObjs []runtime.Object,
 		return noStatusObjs, withStatusObjs, fmt.Errorf("error evaulating absolute path to node dirs: %v", err)
 	}
 
-	crdObjects, err := crd.Objects(false)
-	if err != nil {
-		return noStatusObjs, withStatusObjs, fmt.Errorf("error generating CRD objects: %v", err)
-	}
-
 	nodeZipList, err := generateNodeZipList(bundleAbsPath)
 
 	if err != nil {
@@ -114,8 +108,6 @@ func (o *ObjectManager) ProcessNodeZipObjects() (noStatusObjs []runtime.Object,
 		&NodeInfoNS, &NodeInfoSASecret, &NodeInfoSA,
 	}
 
-	noStatusObjs = append(noStatusObjs, crdObjects...)
-
 	for _, v := range podList {
 		withStatusObjs = append(withStatusObjs, v)
 	}