Bug fix:'operator-sdk add crd' doesn't work after add kubebuilder tags (#1660)

xm2 · Eric Stroczynski · Eric Stroczynski · commit 9d6ffddcd86f · 2019-08-08T20:32:48.000-07:00
* fix bug: 'operator-sdk add crd' doesn't work after add kubebuilder tag in _types.go

* add fix info to changelog

* Update CHANGELOG.md

Co-Authored-By: Eric Stroczynski &lt;estroczy@redhat.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Removed
 
 ### Bug Fixes
+- Configure the repo path correctly in `operator-sdk add crd` and prevent the command from running outside of an operator project. ([#1660](https://github.com/operator-framework/operator-sdk/pull/1660))
 
 ## v0.10.0
 
diff --git a/cmd/operator-sdk/add/crd.go b/cmd/operator-sdk/add/crd.go
@@ -55,8 +55,11 @@ Generated CR  filename: <project-name>/deploy/crds/<group>_<version>_<kind>_cr.y
 }
 
 func crdFunc(cmd *cobra.Command, args []string) error {
+	projutil.MustInProjectRoot()
+
 	cfg := &input.Config{
 		AbsProjectPath: projutil.MustGetwd(),
+		Repo:           projutil.GetGoPkg(),
 	}
 	if len(args) != 0 {
 		return fmt.Errorf("command %s doesn't accept any arguments", cmd.CommandPath())

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,11 @@ Generated CR filename: <project-name>/deploy/crds/<group>_<version>_<kind>_cr.y`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func crdFunc(cmd *cobra.Command, args []string) error {`
	`58`	`+ projutil.MustInProjectRoot()`
	`59`	`+`
`58`	`60`	`cfg := &input.Config{`
`59`	`61`	`AbsProjectPath: projutil.MustGetwd(),`
	`62`	`+ Repo: projutil.GetGoPkg(),`
`60`	`63`	`}`
`61`	`64`	`if len(args) != 0 {`
`62`	`65`	`return fmt.Errorf("command %s doesn't accept any arguments", cmd.CommandPath())`