deprecate -R, allow use of directories by default

docs/apps.md

@@ -22,7 +22,7 @@ $ kapp ls
 To create or update an application use `deploy` command:
 
 ```bash
-$ kapp deploy -a my-name -R -f my-app-config/
+$ kapp deploy -a my-name -f my-app-config/
 ```
 
 Deploy command consists of two stages: [resource "diff" stage](diff.md), and [resource "apply" stage](apply.md).

examples/kapp-on-cluster/README.md

@@ -5,7 +5,7 @@ This example shows how to run `kapp` continiously in cluster, and converge a set
 To install perform:
 
 ```bash
-$ ytt t -R -f examples/kapp-on-cluster/ | kapp --yes deploy -a kapp-on-cluster -f - --diff-changes
+$ ytt t -f examples/kapp-on-cluster/ | kapp --yes deploy -a kapp-on-cluster -f - --diff-changes
 ```
 
 See `cron.yml` for details on what this script does every 1m.

hack/build.sh

@@ -10,7 +10,7 @@ go fmt ./cmd/... ./pkg/... ./test/...
 	cd pkg/kapp/website; 
 
 	ytt version || { echo >&2 "ytt is required for building. Install from https://github.com/k14s/ytt"; exit 1; }
-	ytt template -R \
+	ytt template \
 		-f . \
 		-f ../../../hack/build-values.yml \
 		--file-mark 'generated.go.txt:exclusive-for-output=true' \

pkg/kapp/cmd/app/deploy.go

@@ -170,7 +170,7 @@ func (o *DeployOptions) newResources() ([]ctlres.Resource, error) {
 	var allResources []ctlres.Resource
 
 	for _, file := range o.FileFlags.Files {
-		fileRs, err := ctlres.NewFileResources(file, o.FileFlags.Recursive)
+		fileRs, err := ctlres.NewFileResources(file)
 		if err != nil {
 			return nil, err
 		}

pkg/kapp/cmd/tools/diff.go

@@ -34,12 +34,12 @@ func NewDiffCmd(o *DiffOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman
 }
 
 func (o *DiffOptions) Run() error {
-	newResources, err := o.fileResources(o.FileFlags.Files, o.FileFlags.Recursive)
+	newResources, err := o.fileResources(o.FileFlags.Files)
 	if err != nil {
 		return err
 	}
 
-	existingResources, err := o.fileResources(o.FileFlags2.Files, o.FileFlags2.Recursive)
+	existingResources, err := o.fileResources(o.FileFlags2.Files)
 	if err != nil {
 		return err
 	}
@@ -56,11 +56,11 @@ func (o *DiffOptions) Run() error {
 	return nil
 }
 
-func (o *DiffOptions) fileResources(files []string, recursive bool) ([]ctlres.Resource, error) {
+func (o *DiffOptions) fileResources(files []string) ([]ctlres.Resource, error) {
 	var newResources []ctlres.Resource
 
 	for _, file := range files {
-		fileRs, err := ctlres.NewFileResources(file, recursive)
+		fileRs, err := ctlres.NewFileResources(file)
 		if err != nil {
 			return nil, err
 		}

pkg/kapp/cmd/tools/file_flags.go

@@ -12,7 +12,7 @@ type FileFlags struct {
 
 func (s *FileFlags) Set(cmd *cobra.Command) {
 	cmd.Flags().StringSliceVarP(&s.Files, "file", "f", nil, "Set file (format: /tmp/foo, https://..., -) (can be specified multiple times)")
-	cmd.Flags().BoolVarP(&s.Recursive, "recursive", "R", false, "Process directory used in -f recursively")
+	cmd.Flags().BoolVarP(&s.Recursive, "recursive", "R", true, "Process directory used in -f recursively (deprecated; set to true by default)")
 	cmd.Flags().BoolVar(&s.Sort, "sort", true, "Sort by namespace, name, etc.")
 }
 
@@ -23,5 +23,5 @@ type FileFlags2 struct {
 
 func (s *FileFlags2) Set(cmd *cobra.Command) {
 	cmd.Flags().StringSliceVar(&s.Files, "file2", nil, "Set second file (format: /tmp/foo, https://..., -) (can be specified multiple times)")
-	cmd.Flags().BoolVar(&s.Recursive, "file2-recursive", false, "Process directory used in --file2 recursively")
+	cmd.Flags().BoolVar(&s.Recursive, "file2-recursive", true, "Process directory used in --file2 recursively (deprecated; set to true by default)")
 }

pkg/kapp/cmd/tools/inspect.go

@@ -46,7 +46,7 @@ func (o *InspectOptions) inspectFiles() error {
 	}
 
 	for _, file := range o.FileFlags.Files {
-		fileRs, err := ctlres.NewFileResources(file, o.FileFlags.Recursive)
+		fileRs, err := ctlres.NewFileResources(file)
 		if err != nil {
 			return err
 		}

pkg/kapp/cmd/tools/list_images.go

@@ -34,7 +34,7 @@ func (o *ListImagesOptions) Run() error {
 	var resWithSources []ResourceWithSource
 
 	for _, file := range o.FileFlags.Files {
-		fileRs, err := ctlres.NewFileResources(file, o.FileFlags.Recursive)
+		fileRs, err := ctlres.NewFileResources(file)
 		if err != nil {
 			return err
 		}

pkg/kapp/resources/file_resources.go

@@ -16,7 +16,7 @@ type FileResource struct {
 	fileSrc FileSource
 }
 
-func NewFileResources(file string, recursive bool) ([]FileResource, error) {
+func NewFileResources(file string) ([]FileResource, error) {
 	var fileRs []FileResource
 
 	switch {
@@ -33,10 +33,6 @@ func NewFileResources(file string, recursive bool) ([]FileResource, error) {
 		}
 
 		if fileInfo.IsDir() {
-			if !recursive {
-				return nil, fmt.Errorf("Expected file '%s' to not be a directory", file)
-			}
-
 			var paths []string
 
 			err := filepath.Walk(file, func(path string, fi os.FileInfo, err error) error {

pkg/kapp/website/templates/index.html

@@ -30,7 +30,7 @@ <h1><span class="logo">$ kapp</span></h1>
           <h2>Basic Usage</h2>
           <pre class="terminal">
 <span class="gray"># Configurations picked up from a directory</span>
-$ kapp deploy -a cass1 -R -f examples/cassandra/
+$ kapp deploy -a cass1 -f examples/cassandra/
 
 <span class="gray"># Can be used with helm charts, removing need for Tiller</span>
 $ helm template my-chart --values my-vals.yml | kapp -y deploy -a my-chart -f -
@@ -39,7 +39,7 @@ <h2>Basic Usage</h2>
 $ kustomize build ./some-app | kapp -y deploy -a some-app -f -
 
 <span class="gray"># ... or templated with ytt</span>
-$ ytt template -R -f ./some-app | kapp -y deploy -a some-app -f -</pre>
+$ ytt template -f ./some-app | kapp -y deploy -a some-app -f -</pre>
         </div>
 
         <div id="features">