From 481ebce73232330a17e450cb2d811750365db9dc Mon Sep 17 00:00:00 2001
From: Hongchao Deng <hongchaodeng1@gmail.com>
Date: Thu, 22 Feb 2018 13:24:38 -0800
Subject: [PATCH] generator: update main() to use latest Watch()

---
 pkg/generator/gen_main.go  | 35 ++---------------------------------
 pkg/generator/generator.go | 10 +++-------
 pkg/generator/main_tmpl.go |  3 +--
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/pkg/generator/gen_main.go b/pkg/generator/gen_main.go
index 5c329c7ae80..8633d20e3da 100644
--- a/pkg/generator/gen_main.go
+++ b/pkg/generator/gen_main.go
@@ -16,39 +16,11 @@ const (
 type Main struct {
 	// imports
 	OperatorSDKImport string
-	APIImport         string
 	StubImport        string
-
-	// Service defintion in pkg/apis/..
-	ServicePlural string
-	Service       string
 }
 
-// renderMainFile generates the cmd/<projectName>/main.go file given a repo path ("github.com/coreos/play"), apiVersion ("v1alpha1"),
-// api dir name ("play"), service ("PlayService"), and servicePlural ("PlayServicePlural").
-//
-// for example:
-// renderMain(w, "github.com/coreos/play", "v1alpha1", "play", "PlayService", "PlayServicePlural" )
-// output:
-//
-// package main
-//
-// import (
-// 	"context"
-//
-// 	sdk "github.com/coreos/operator-sdk/pkg/sdk"
-// 	api "github.com/coreos/play/pkg/apis/play/v1alpha1"
-// 	stub "github.com/coreos/play/pkg/stub"
-// )
-//
-// func main() {
-// 	namespace := "default"
-// 	sdk.Watch(api.PlayServicePlural, namespace, api.PlayService)
-//  	sdk.Handle(&stub.Handler{})
-//  	sdk.Run(context.TODO())
-// }
-//
-func renderMainFile(w io.Writer, repo, version, apiDirName, service, servicePlural string) error {
+// renderMainFile generates the cmd/<projectName>/main.go file given a repo path ("github.com/coreos/play")
+func renderMainFile(w io.Writer, repo string) error {
 	t := template.New("cmd/<projectName>/main.go")
 	t, err := t.Parse(mainTmpl)
 	if err != nil {
@@ -57,10 +29,7 @@ func renderMainFile(w io.Writer, repo, version, apiDirName, service, servicePlur
 
 	m := Main{
 		OperatorSDKImport: sdkImport,
-		APIImport:         filepath.Join(repo, apisDir, apiDirName, version),
 		StubImport:        filepath.Join(repo, stubDir),
-		ServicePlural:     servicePlural,
-		Service:           service,
 	}
 	return t.Execute(w, m)
 }
diff --git a/pkg/generator/generator.go b/pkg/generator/generator.go
index c32b147a953..91dd6476589 100644
--- a/pkg/generator/generator.go
+++ b/pkg/generator/generator.go
@@ -90,21 +90,17 @@ func (g *Generator) renderCmd() error {
 	if err := os.MkdirAll(cpDir, defaultDirFileMode); err != nil {
 		return err
 	}
-	return renderCmdFiles(cpDir, g.repoPath, version(g.apiVersion), apiDirName(g.apiVersion), g.kind, toPlural(g.kind))
+	return renderCmdFiles(cpDir, g.repoPath)
 }
 
-func renderCmdFiles(cmdProjectDir, repoPath, version, apiDirName, kind, kindPlural string) error {
+func renderCmdFiles(cmdProjectDir, repoPath string) error {
 	buf := &bytes.Buffer{}
-	if err := renderMainFile(buf, repoPath, version, apiDirName, kind, kindPlural); err != nil {
+	if err := renderMainFile(buf, repoPath); err != nil {
 		return err
 	}
 	return ioutil.WriteFile(filepath.Join(cmdProjectDir, main), buf.Bytes(), defaultFileMode)
 }
 
-func toPlural(kind string) string {
-	return kind + "Plural"
-}
-
 func (g *Generator) renderConfig() error {
 	if err := os.MkdirAll(filepath.Join(g.projectName, configDir), defaultDirFileMode); err != nil {
 		return err
diff --git a/pkg/generator/main_tmpl.go b/pkg/generator/main_tmpl.go
index 2dda7627af8..b56e42ed642 100644
--- a/pkg/generator/main_tmpl.go
+++ b/pkg/generator/main_tmpl.go
@@ -7,13 +7,12 @@ import (
 	"context"
 
 	sdk "{{.OperatorSDKImport}}"
-	api "{{.APIImport}}"
 	stub "{{.StubImport}}"
 )
 
 func main() {
 	namespace := "default"
-	sdk.Watch(api.{{.ServicePlural}}, namespace, api.{{.Service}})
+	sdk.Watch("apps/v1", "Deployment", namespace)
  	sdk.Handle(&stub.Handler{})
  	sdk.Run(context.TODO())
 }