generate cr.yaml file as well

Author: John Kim

commands/operator-sdk/cmd/generate/crd.go

@@ -39,10 +39,11 @@ const (
 func NewGenerateCrdCmd() *cobra.Command {
 	crdCmd := &cobra.Command{
 		Use:   "crd",
-		Short: "Generates a custom resource definition",
-		Long: `The operator-sdk generate command will create a custom resource definition (CRD) file for the specified api-version and kind.
+		Short: "Generates a custom resource definition (CRD) and the custom resource (CR) files",
+		Long: `The operator-sdk generate command will create a custom resource definition (CRD) and the custom resource (CR) files for the specified api-version and kind.
 
 Generated CRD filename: <project-name>/deploy/<kind>_crd.yaml
+Generated CR  filename: <project-name>/deploy/<kind>_cr.yaml
 
 	<project-name>/deploy path must already exist
 	--api-version and --kind are required flags to generate the new operator application.
@@ -67,8 +68,8 @@ func crdFunc(cmd *cobra.Command, args []string) {
 
 	// generate CRD file
 	wd, _ := os.Getwd()
-	if err := generator.RenderDeployCrdFile(filepath.Join(wd, deployCrdDir), apiVersion, kind); err != nil {
-		cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to generate CRD file: (%v)", err))
+	if err := generator.RenderDeployCrdFiles(filepath.Join(wd, deployCrdDir), apiVersion, kind); err != nil {
+		cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to generate CRD and CR files: (%v)", err))
 	}
 }
 

pkg/generator/generator.go

@@ -333,15 +333,24 @@ func renderRBAC(deployDir, projectName, groupName string) error {
 	return renderWriteFile(filepath.Join(deployDir, rbacYaml), rbacTmplName, rbacYamlTmpl, td)
 }
 
-func RenderDeployCrdFile(crdDeployPath, apiVersion, kind string) error {
+func RenderDeployCrdFiles(deployPath, apiVersion, kind string) error {
+	crTd := tmplData{
+		APIVersion: apiVersion,
+		Kind:       kind,
+	}
+	crFilePath := filepath.Join(deployPath, strings.ToLower(kind)+"_cr.yaml")
+	if err := renderWriteFile(crFilePath, crFilePath, crYamlTmpl, crTd); err != nil {
+		return err
+	}
+
 	crdTd := tmplData{
 		Kind:         kind,
 		KindSingular: strings.ToLower(kind),
 		KindPlural:   toPlural(strings.ToLower(kind)),
 		GroupName:    groupName(apiVersion),
 		Version:      version(apiVersion),
 	}
-	crdFilePath := filepath.Join(crdDeployPath, strings.ToLower(kind)+"_crd.yaml")
+	crdFilePath := filepath.Join(deployPath, strings.ToLower(kind)+"_crd.yaml")
 	return renderWriteFile(crdFilePath, crdFilePath, crdYamlTmpl, crdTd)
 }