crdutil: Add feature to also apply also single files

Signed-off-by: Tobias Giese <[email protected]>

Author: tobiasgiese

pkg/crdutil/crdutil.go

@@ -50,21 +50,29 @@ func (s *StringList) Set(value string) error {
 
 var (
 	crdsDir StringList
+	crds    StringList
 )
 
 func initFlags() {
 	flag.Var(&crdsDir, "crds-dir", "Path to the directory containing the CRD manifests")
+	flag.Var(&crds, "crds-file", "Single CRDs file with CRD manifests to apply")
 	flag.Parse()
 
-	if len(crdsDir) == 0 {
-		log.Fatalf("CRDs directory is required")
+	if len(crdsDir) == 0 && len(crds) == 0 {
+		log.Fatalf("CRDs directory or single CRDs are required")
 	}
 
 	for _, crdDir := range crdsDir {
 		if _, err := os.Stat(crdDir); os.IsNotExist(err) {
 			log.Fatalf("CRDs directory %s does not exist", crdsDir)
 		}
 	}
+
+	for _, crd := range crds {
+		if _, err := os.Stat(crd); os.IsNotExist(err) {
+			log.Fatalf("CRD file %s does not exist", crd)
+		}
+	}
 }
 
 // EnsureCRDsCmd reads each YAML file in the directory, splits it into documents, and applies each CRD to the cluster.
@@ -87,6 +95,10 @@ func EnsureCRDsCmd() {
 	if err := walkCrdsDir(ctx, client.ApiextensionsV1().CustomResourceDefinitions()); err != nil {
 		log.Fatalf("Failed to apply CRDs: %v", err)
 	}
+
+	if err := applyCrdFiles(ctx, client.ApiextensionsV1().CustomResourceDefinitions()); err != nil {
+		log.Fatalf("Failed to apply CRDs: %v", err)
+	}
 }
 
 // walkCrdsDir walks the CRDs directory and applies each YAML file.
@@ -114,6 +126,16 @@ func walkCrdsDir(ctx context.Context, crdClient v1.CustomResourceDefinitionInter
 	return nil
 }
 
+func applyCrdFiles(ctx context.Context, crdClient v1.CustomResourceDefinitionInterface) error {
+	for _, crdFile := range crds {
+		log.Printf("Apply CRDs from file: %s", crdFile)
+		if err := applyCRDsFromFile(ctx, crdClient, crdFile); err != nil {
+			return fmt.Errorf("apply CRD %s: %w", crdFile, err)
+		}
+	}
+	return nil
+}
+
 // applyCRDsFromFile reads a YAML file, splits it into documents, and applies each CRD to the cluster.
 func applyCRDsFromFile(ctx context.Context, crdClient v1.CustomResourceDefinitionInterface, filePath string) error {
 	file, err := os.Open(filePath)

pkg/crdutil/crdutil_test.go

@@ -52,6 +52,16 @@ var _ = Describe("CRD Application", func() {
 			Expect(crds.Items).To(HaveLen(2))
 		})
 
+		It("should apply CRDs from a valid YAML file", func() {
+			By("applying CRDs")
+			Expect(applyCRDsFromFile(ctx, testCRDClient, "test-files/test-crds.yaml")).To(Succeed())
+
+			By("verifying CRDs are applied")
+			crds, err := testCRDClient.List(ctx, metav1.ListOptions{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(crds.Items).To(HaveLen(2))
+		})
+
 		It("should update CRDs", func() {
 			By("applying CRDs")
 			Expect(applyCRDsFromFile(ctx, testCRDClient, "test-files/test-crds.yaml")).To(Succeed())