commands/operator-sdk/*: add Info statements for SDK steps

Author: estroz

commands/operator-sdk/cmd/add/api.go

@@ -64,6 +64,9 @@ Example:
 func apiRun(cmd *cobra.Command, args []string) {
 	// Create and validate new resource
 	projutil.MustInProjectRoot()
+
+	log.Infof("Generating api version %s for kind %s.", apiVersion, kind)
+
 	r, err := scaffold.NewResource(apiVersion, kind)
 	if err != nil {
 		log.Fatal(err)
@@ -96,4 +99,6 @@ func apiRun(cmd *cobra.Command, args []string) {
 
 	// Run k8s codegen for deepcopy
 	generate.K8sCodegen()
+
+	log.Info("Api generation complete.")
 }

commands/operator-sdk/cmd/add/controller.go

@@ -57,6 +57,9 @@ Example:
 
 func controllerRun(cmd *cobra.Command, args []string) {
 	projutil.MustInProjectRoot()
+
+	log.Infof("Generating controller version %s for kind %s.", apiVersion, kind)
+
 	// Create and validate new resource
 	r, err := scaffold.NewResource(apiVersion, kind)
 	if err != nil {
@@ -76,4 +79,6 @@ func controllerRun(cmd *cobra.Command, args []string) {
 	if err != nil {
 		log.Fatalf("add scaffold failed: (%v)", err)
 	}
+
+	log.Info("Controller generation complete.")
 }

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

@@ -15,7 +15,6 @@
 package add
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -60,7 +59,7 @@ func crdFunc(cmd *cobra.Command, args []string) {
 	verifyCrdFlags()
 	verifyCrdDeployPath()
 
-	fmt.Println("Generating custom resource definition (CRD) file")
+	log.Infof("Generating Custom Resource Definition (CRD) version %s for kind %s.", apiVersion, kind)
 
 	// generate CR/CRD file
 	resource, err := scaffold.NewResource(apiVersion, kind)
@@ -81,6 +80,8 @@ func crdFunc(cmd *cobra.Command, args []string) {
 	if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
 		log.Fatalf("failed to update the RBAC manifest for the resource (%v, %v): (%v)", resource.APIVersion, resource.Kind, err)
 	}
+
+	log.Info("CRD generation complete.")
 }
 
 func verifyCrdFlags() {

commands/operator-sdk/cmd/build.go

@@ -163,6 +163,9 @@ func buildFunc(cmd *cobra.Command, args []string) {
 	if enableTests {
 		baseImageName += "-intermediate"
 	}
+
+	log.Infof("Building Docker image %s", baseImageName)
+
 	dbcmd := exec.Command("docker", "build", ".", "-f", "build/Dockerfile", "-t", baseImageName)
 	dbcmd.Stdout = os.Stdout
 	dbcmd.Stderr = os.Stderr
@@ -190,6 +193,8 @@ func buildFunc(cmd *cobra.Command, args []string) {
 		_, err = os.Stat(testDockerfile)
 		if err != nil && os.IsNotExist(err) {
 
+			log.Info("Generating operator test files.")
+
 			absProjectPath := projutil.MustGetwd()
 			cfg := &input.Config{
 				Repo:           projutil.CheckAndGetCurrPkg(),
@@ -208,6 +213,8 @@ func buildFunc(cmd *cobra.Command, args []string) {
 			}
 		}
 
+		log.Infof("Building test Docker image %s", image)
+
 		testDbcmd := exec.Command("docker", "build", ".", "-f", testDockerfile, "-t", image, "--build-arg", "NAMESPACEDMAN="+namespacedManBuild, "--build-arg", "BASEIMAGE="+baseImageName)
 		testDbcmd.Stdout = os.Stdout
 		testDbcmd.Stderr = os.Stderr
@@ -218,6 +225,8 @@ func buildFunc(cmd *cobra.Command, args []string) {
 		// Check image name of deployments in namespaced manifest
 		verifyTestManifest(image)
 	}
+
+	log.Info("Operator build complete.")
 }
 
 func mainExists() bool {

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

@@ -57,10 +57,10 @@ func K8sCodegen() {
 		log.Fatalf("failed to parse group versions: (%v)", err)
 	}
 
-	log.Printf("Running code-generation for custom resource group versions: [%s]\n", groupVersions)
+	log.Infof("Running code-generation for Custom Resource group versions: [%s]\n", groupVersions)
+
 	// TODO: Replace generate-groups.sh by building the vendored generators(deepcopy, lister etc)
 	// and running them directly
-	// TODO: remove dependency on boilerplate.go.txt
 	genGroupsCmd := "vendor/k8s.io/code-generator/generate-groups.sh"
 	args := []string{
 		"deepcopy",
@@ -75,6 +75,8 @@ func K8sCodegen() {
 	if err != nil {
 		log.Fatalf("failed to perform code-generation: (%v)", err)
 	}
+
+	log.Info("Code-generation complete.")
 }
 
 // getGroupVersions parses the layout of pkg/apis to return the API groups and versions

commands/operator-sdk/cmd/new.go

@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -82,6 +81,8 @@ func newFunc(cmd *cobra.Command, args []string) {
 	mustBeNewProject()
 	verifyFlags()
 
+	log.Infof("Creating new %s operator '%s'.", strings.Title(operatorType), projectName)
+
 	switch operatorType {
 	case projutil.OperatorTypeGo:
 		doScaffold()
@@ -90,6 +91,8 @@ func newFunc(cmd *cobra.Command, args []string) {
 		doAnsibleScaffold()
 	}
 	initGit()
+
+	log.Info("Project creation complete.")
 }
 
 func parse(args []string) {
@@ -119,6 +122,8 @@ func mustBeNewProject() {
 }
 
 func doScaffold() {
+	log.Infof("Generating %s project scaffold.", strings.Title(operatorType))
+
 	cfg := &input.Config{
 		Repo:           filepath.Join(projutil.CheckAndGetCurrPkg(), projectName),
 		AbsProjectPath: filepath.Join(projutil.MustGetwd(), projectName),
@@ -145,6 +150,8 @@ func doScaffold() {
 }
 
 func doAnsibleScaffold() {
+	log.Infof("Generating %s project scaffold.", strings.Title(operatorType))
+
 	cfg := &input.Config{
 		AbsProjectPath: filepath.Join(projutil.MustGetwd(), projectName),
 		ProjectName:    projectName,
@@ -192,6 +199,8 @@ func doAnsibleScaffold() {
 
 	// Decide on playbook.
 	if generatePlaybook {
+		log.Infof("Generating %s playbook.", strings.Title(operatorType))
+
 		err := s.Execute(cfg,
 			&ansible.Playbook{
 				Resource: *resource,
@@ -202,11 +211,14 @@ func doAnsibleScaffold() {
 		}
 	}
 
+	log.Info("Running galaxy-init.")
+
 	// Run galaxy init.
 	cmd := exec.Command(filepath.Join(galaxyInit.AbsProjectPath, galaxyInit.Path))
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.Run()
+
 	// Delete Galxy INIT
 	// Mac OS tmp directory is /var/folders/_c/..... this means we have to make sure that we get the top level directory to remove
 	// everything.
@@ -287,18 +299,18 @@ func pullDep() {
 	if err != nil {
 		log.Fatalf("looking for dep in $PATH: (%v)", err)
 	}
-	fmt.Fprintln(os.Stdout, "Run dep ensure ...")
+	log.Info("Run dep ensure ...")
 	execCmd(os.Stdout, dep, ensureCmd, "-v")
-	fmt.Fprintln(os.Stdout, "Run dep ensure done")
+	log.Info("Run dep ensure done")
 }
 
 func initGit() {
 	if skipGit {
 		return
 	}
-	fmt.Fprintln(os.Stdout, "Run git init ...")
+	log.Info("Run git init ...")
 	execCmd(os.Stdout, "git", "init")
 	execCmd(os.Stdout, "git", "add", "--all")
 	execCmd(os.Stdout, "git", "commit", "-q", "-m", "INITIAL COMMIT")
-	fmt.Fprintln(os.Stdout, "Run git init done")
+	log.Info("Run git init done")
 }

commands/operator-sdk/cmd/test/cluster.go

@@ -69,6 +69,9 @@ func testClusterFunc(cmd *cobra.Command, args []string) error {
 	if len(args) != 1 {
 		return fmt.Errorf("operator-sdk test cluster requires exactly 1 argument")
 	}
+
+	log.Info("Testing operator in cluster.")
+
 	var pullPolicy v1.PullPolicy
 	if strings.ToLower(tcConfig.imagePullPolicy) == "always" {
 		pullPolicy = v1.PullAlways
@@ -144,7 +147,7 @@ func testClusterFunc(cmd *cobra.Command, args []string) error {
 			time.Sleep(time.Second * 5)
 			continue
 		} else if testPod.Status.Phase == v1.PodSucceeded {
-			fmt.Println("Test Successfully Completed")
+			log.Info("Cluster test successfully completed.")
 			return nil
 		} else if testPod.Status.Phase == v1.PodFailed {
 			req := kubeclient.CoreV1().Pods(tcConfig.namespace).GetLogs(testPod.Name, &v1.PodLogOptions{})

commands/operator-sdk/cmd/test/local.go

@@ -67,6 +67,9 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 	if len(args) != 1 {
 		log.Fatal("operator-sdk test local requires exactly 1 argument")
 	}
+
+	log.Info("Testing operator locally.")
+
 	// if no namespaced manifest path is given, combine deploy/service_account.yaml, deploy/role.yaml, deploy/role_binding.yaml and deploy/operator.yaml
 	if tlConfig.namespacedManPath == "" {
 		err := os.MkdirAll(deployTestDir, os.FileMode(fileutil.DefaultDirFileMode))
@@ -165,6 +168,8 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 	if err != nil {
 		log.Fatalf("failed to exec `go %s`: (%v)", strings.Join(testArgs, " "), err)
 	}
+
+	log.Info("Local operator test successfully completed.")
 }
 
 // combineManifests combines a given manifest with a base manifest and adds yaml

commands/operator-sdk/cmd/up/local.go

@@ -70,6 +70,9 @@ const (
 
 func upLocalFunc(cmd *cobra.Command, args []string) {
 	mustKubeConfig()
+
+	log.Info("Bringing operator up locally.")
+
 	switch projutil.GetOperatorType() {
 	case projutil.OperatorTypeGo:
 		projutil.MustInProjectRoot()
@@ -155,7 +158,7 @@ func upLocalAnsible() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	log.Info("Ansible operator started succesfully. Exiting.")
+	log.Info("Exiting.")
 }
 
 func printVersion() {

commands/operator-sdk/main.go

@@ -15,15 +15,12 @@
 package main
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd"
+	log "github.com/sirupsen/logrus"
 )
 
 func main() {
 	if err := cmd.NewRootCmd().Execute(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(-1)
+		log.Fatal(err)
 	}
 }