Merge pull request #666 from vaikas-google/master

Add client-only flag to helm init that skips installing tiller.

cmd/helm/init.go

@@ -15,11 +15,13 @@ Kubernetes Cluster and sets up local configuration in $HELM_HOME (default: ~/.he
 `
 
 var (
-	tillerImg string
+	tillerImg  string
+	clientOnly bool
 )
 
 func init() {
 	initCmd.Flags().StringVarP(&tillerImg, "tiller-image", "i", "", "override tiller image")
+	initCmd.Flags().BoolVarP(&clientOnly, "client-only", "c", false, "If set does not install tiller")
 	RootCommand.AddCommand(initCmd)
 }
 
@@ -40,8 +42,12 @@ func runInit(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if err := installTiller(); err != nil {
+	if !clientOnly {
-		return err
+		if err := installTiller(); err != nil {
+			return err
+		}
+	} else {
+		fmt.Println("Not installing tiller due to 'client-only' flag having been set")
 	}
 
 	fmt.Println("Happy Helming!")
@@ -105,6 +111,6 @@ func ensureHome() error {
 		return fmt.Errorf("%s must be a file, not a directory", localRepoCacheFile)
 	}
 
-	fmt.Printf("$HELM_HOME has been configured at %s.", helmHome)
+	fmt.Printf("$HELM_HOME has been configured at %s.\n", helmHome)
 	return nil
 }