Skip to content

Commit 2d673a4

Browse files
committed
commands/operator-sdk: operator-sdk new now performs k8s codegen
1 parent 48caa79 commit 2d673a4

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import (
2727

2828
const (
2929
k8sGenerated = "./tmp/codegen/update-generated.sh"
30+
// dot represents current dir.
31+
dot = "."
3032
)
3133

3234
func NewGenerateK8SCmd() *cobra.Command {
@@ -44,8 +46,14 @@ func k8sFunc(cmd *cobra.Command, args []string) {
4446
if len(args) != 0 {
4547
cmdError.ExitWithError(cmdError.ExitBadArgs, errors.New("k8s command doesn't accept any arguments."))
4648
}
49+
K8sCodegen(dot)
50+
}
4751

52+
// K8sCodegen performs code-generation for custom resources of this project given the projectDir.
53+
func K8sCodegen(projectDir string) {
54+
fmt.Fprintln(os.Stdout, "Run code-generation for custom resources")
4855
kcmd := exec.Command(k8sGenerated)
56+
kcmd.Dir = projectDir
4957
o, err := kcmd.CombinedOutput()
5058
if err != nil {
5159
cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to perform code-generation for CustomResources: (%v)", string(o)))

commands/operator-sdk/cmd/new.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25+
"github.com/coreos/operator-sdk/commands/operator-sdk/cmd/generate"
2526
cmdError "github.com/coreos/operator-sdk/commands/operator-sdk/error"
2627
"github.com/coreos/operator-sdk/pkg/generator"
2728

@@ -82,6 +83,7 @@ func newFunc(cmd *cobra.Command, args []string) {
8283
cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to create project %v: %v", projectName, err))
8384
}
8485
pullDep()
86+
generate.K8sCodegen(projectName)
8587
}
8688

8789
func parse(args []string) {

0 commit comments

Comments
 (0)