@@ -2630,6 +2630,10 @@ _oc_rsync()

     flags+=("--container=")

     two_word_flags+=("-c")

     flags+=("--delete")

+    flags+=("--exclude=")

+    flags+=("--include=")

+    flags+=("--no-perms")

+    flags+=("--progress")

     flags+=("--quiet")

     flags+=("-q")

     flags+=("--strategy=")

@@ -7602,6 +7602,10 @@ _openshift_cli_rsync()

     flags+=("--container=")

     two_word_flags+=("-c")

     flags+=("--delete")

+    flags+=("--exclude=")

+    flags+=("--include=")

+    flags+=("--no-perms")

+    flags+=("--progress")

     flags+=("--quiet")

     flags+=("-q")

     flags+=("--strategy=")

@@ -27,7 +27,7 @@ type rsyncStrategy struct {

 	RemoteExecutor executor

 }

-var rshExcludeFlags = sets.NewString("delete", "strategy", "quiet")

+var rshExcludeFlags = sets.NewString("delete", "strategy", "quiet", "include", "exclude", "progress", "no-perms")

 func newRsyncStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (copyStrategy, error) {

 	// Determine the rsh command to pass to the local rsync command

@@ -48,19 +48,10 @@ func newRsyncStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (

 		return nil, err

 	}

-	// TODO: Expose more flags to send to the rsync command

-	// either as a special argument or any unrecognized arguments.

 	// The blocking-io flag is used to resolve a sync issue when

 	// copying from the pod to the local machine

 	flags := []string{"-a", "--blocking-io", "--omit-dir-times", "--numeric-ids"}

-	if o.Quiet {

-		flags = append(flags, "-q")

-	} else {

-		flags = append(flags, "-v")

-	}

-	if o.Delete {

-		flags = append(flags, "--delete")

-	}

+	flags = append(flags, rsyncFlagsFromOptions(o)...)

 	return &rsyncStrategy{

 		Flags:          flags,

@@ -259,17 +259,8 @@ func (s *rsyncDaemonStrategy) Validate() error {

 }

 func newRsyncDaemonStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (copyStrategy, error) {

-	// TODO: Expose more flags to send to the rsync command

-	// either as a special argument or any unrecognized arguments.

 	flags := []string{"-a", "--omit-dir-times", "--numeric-ids"}

-	if o.Quiet {

-		flags = append(flags, "-q")

-	} else {

-		flags = append(flags, "-v")

-	}

-	if o.Delete {

-		flags = append(flags, "--delete")

-	}

+	flags = append(flags, rsyncFlagsFromOptions(o)...)

 	remoteExec, err := newRemoteExecutor(f, o)

 	if err != nil {

@@ -30,6 +30,7 @@ type tarStrategy struct {

 	Delete         bool

 	Tar            tar.Tar

 	RemoteExecutor executor

+	IgnoredFlags   []string

 }

 func newTarStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (copyStrategy, error) {

@@ -37,6 +38,8 @@ func newTarStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (co

 	tarHelper := tar.New()

 	tarHelper.SetExclusionPattern(nil)

+	ignoredFlags := rsyncSpecificFlags(o)

+

 	remoteExec, err := newRemoteExecutor(f, o)

 	if err != nil {

 		return nil, err

@@ -47,6 +50,7 @@ func newTarStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (co

 		Delete:         o.Delete,

 		Tar:            tarHelper,

 		RemoteExecutor: remoteExec,

+		IgnoredFlags:   ignoredFlags,

 	}, nil

 }

@@ -110,6 +114,11 @@ func deleteFiles(source, dest *pathSpec, remoteExecutor executor) error {

 func (r *tarStrategy) Copy(source, destination *pathSpec, out, errOut io.Writer) error {

 	glog.V(3).Infof("Copying files with tar")

+

+	if len(r.IgnoredFlags) > 0 {

+		fmt.Fprintf(errOut, "Ignoring the following flags because they only apply to rsync: %s\n", strings.Join(r.IgnoredFlags, ", "))

+	}

+

 	if r.Delete {

 		// Implement the rsync --delete flag as a separate call to first delete directory contents

 		err := deleteFiles(source, destination, r.RemoteExecutor)

@@ -34,8 +34,8 @@ for the copy.`

   # Synchronize a pod directory with a local directory

   $ %[1]s POD:/remote/dir/ ./local/dir`

-	noRsyncUnixWarning    = "WARNING: rsync command not found in path. Please use your package manager to install it."

-	noRsyncWindowsWarning = "WARNING: rsync command not found in path. Download cwRsync for Windows and add it to your PATH."

+	noRsyncUnixWarning    = "WARNING: rsync command not found in path. Please use your package manager to install it.\n"

+	noRsyncWindowsWarning = "WARNING: rsync command not found in path. Download cwRsync for Windows and add it to your PATH.\n"

 )

 // copyStrategy

@@ -66,6 +66,11 @@ type RsyncOptions struct {

 	Quiet         bool

 	Delete        bool

+	RsyncInclude  string

+	RsyncExclude  string

+	RsyncProgress bool

+	RsyncNoPerms  bool

+

 	Out    io.Writer

 	ErrOut io.Writer

 }

@@ -97,6 +102,10 @@ func NewCmdRsync(name, parent string, f *clientcmd.Factory, out, errOut io.Write

 	// Flags for rsync options, Must match rsync flag names

 	cmd.Flags().BoolVarP(&o.Quiet, "quiet", "q", false, "Suppress non-error messages")

 	cmd.Flags().BoolVar(&o.Delete, "delete", false, "Delete files not present in source")

+	cmd.Flags().StringVar(&o.RsyncExclude, "exclude", "", "rsync - exclude files matching specified pattern")

+	cmd.Flags().StringVar(&o.RsyncInclude, "include", "", "rsync - include files matching specified pattern")

+	cmd.Flags().BoolVar(&o.RsyncProgress, "progress", false, "rsync - show progress during transfer")

+	cmd.Flags().BoolVar(&o.RsyncNoPerms, "no-perms", false, "rsync - do not transfer permissions")

 	return cmd

 }

@@ -2,6 +2,7 @@ package rsync

 import (

 	"bytes"

+	"fmt"

 	"os"

 	"os/exec"

 	"runtime"

@@ -75,3 +76,45 @@ func checkRsync(e executor) error {

 func checkTar(e executor) error {

 	return executeWithLogging(e, testTarCommand)

 }

+

+func rsyncFlagsFromOptions(o *RsyncOptions) []string {

+	flags := []string{}

+	if o.Quiet {

+		flags = append(flags, "-q")

+	} else {

+		flags = append(flags, "-v")

+	}

+	if o.Delete {

+		flags = append(flags, "--delete")

+	}

+	if len(o.RsyncInclude) > 0 {

+		flags = append(flags, fmt.Sprintf("--include=%s", o.RsyncInclude))

+	}

+	if len(o.RsyncExclude) > 0 {

+		flags = append(flags, fmt.Sprintf("--exclude=%s", o.RsyncExclude))

+	}

+	if o.RsyncProgress {

+		flags = append(flags, "--progress")

+	}

+	if o.RsyncNoPerms {

+		flags = append(flags, "--no-perms")

+	}

+	return flags

+}

+

+func rsyncSpecificFlags(o *RsyncOptions) []string {

+	flags := []string{}

+	if len(o.RsyncInclude) > 0 {

+		flags = append(flags, "--include")

+	}

+	if len(o.RsyncExclude) > 0 {

+		flags = append(flags, "--exclude")

+	}

+	if o.RsyncProgress {

+		flags = append(flags, "--progress")

+	}

+	if o.RsyncNoPerms {

+		flags = append(flags, "--no-perms")

+	}

+	return flags

+}

@@ -26,27 +26,27 @@ var _ = g.Describe("cli: parallel: oc rsync", func() {

 		strategies   = []string{"rsync", "rsync-daemon", "tar"}

 	)

-	g.Describe("copy by strategy", func() {

-		var podName string

-

-		g.JustBeforeEach(func() {

-			oc.SetOutputDir(exutil.TestContext.OutputDir)

-

-			g.By(fmt.Sprintf("calling oc new-app -f %q", templatePath))

-			err := oc.Run("new-app").Args("-f", templatePath).Execute()

-			o.Expect(err).NotTo(o.HaveOccurred())

-

-			g.By("expecting the jenkins service get endpoints")

-			err = oc.KubeFramework().WaitForAnEndpoint("jenkins")

-			o.Expect(err).NotTo(o.HaveOccurred())

+	var podName string

+	g.JustBeforeEach(func() {

+		oc.SetOutputDir(exutil.TestContext.OutputDir)

+

+		g.By(fmt.Sprintf("calling oc new-app -f %q", templatePath))

+		err := oc.Run("new-app").Args("-f", templatePath).Execute()

+		o.Expect(err).NotTo(o.HaveOccurred())

+

+		g.By("expecting the jenkins service get endpoints")

+		err = oc.KubeFramework().WaitForAnEndpoint("jenkins")

+		o.Expect(err).NotTo(o.HaveOccurred())

+

+		g.By("Getting the jenkins pod name")

+		selector, _ := labels.Parse("name=jenkins")

+		pods, err := oc.KubeREST().Pods(oc.Namespace()).List(selector, fields.Everything())

+		o.Expect(err).NotTo(o.HaveOccurred())

+		o.Expect(len(pods.Items)).ToNot(o.BeZero())

+		podName = pods.Items[0].Name

+	})

-			g.By("Getting the jenkins pod name")

-			selector, _ := labels.Parse("name=jenkins")

-			pods, err := oc.KubeREST().Pods(oc.Namespace()).List(selector, fields.Everything())

-			o.Expect(err).NotTo(o.HaveOccurred())

-			o.Expect(len(pods.Items)).ToNot(o.BeZero())

-			podName = pods.Items[0].Name

-		})

+	g.Describe("copy by strategy", func() {

 		testRsyncFn := func(strategy string) func() {

 			return func() {

@@ -143,4 +143,80 @@ var _ = g.Describe("cli: parallel: oc rsync", func() {

 			g.It(fmt.Sprintf("should copy files with the %s strategy", strategy), testRsyncFn(strategy))

 		}

 	})

+

+	g.Describe("rsync specific flags", func() {

+

+		g.It("should honor the --exclude flag", func() {

+			g.By(fmt.Sprintf("Calling oc rsync %s %s:/tmp --exclude=image-streams-rhel7.json", sourcePath1, podName))

+			err := oc.Run("rsync").Args(

+				sourcePath1,

+				fmt.Sprintf("%s:/tmp", podName),

+				"--exclude=image-streams-rhel7.json").Execute()

+			o.Expect(err).NotTo(o.HaveOccurred())

+

+			g.By("Verifying that files are copied to the container")

+			result, err := oc.Run("rsh").Args(podName, "ls", "/tmp/image-streams").Output()

+			o.Expect(err).NotTo(o.HaveOccurred())

+			o.Expect(result).To(o.ContainSubstring("image-streams-centos7.json"))

+			o.Expect(result).NotTo(o.ContainSubstring("image-streams-rhel7.json"))

+		})

+

+		g.It("should honor the --include flag", func() {

+			g.By(fmt.Sprintf("Calling oc rsync %s %s:/tmp --exclude=*.json --include=image-streams-rhel7.json", sourcePath1, podName))

+			err := oc.Run("rsync").Args(

+				sourcePath1,

+				fmt.Sprintf("%s:/tmp", podName),

+				"--exclude=*.json",

+				"--include=image-streams-rhel7.json").Execute()

+			o.Expect(err).NotTo(o.HaveOccurred())

+

+			g.By("Verifying that files are copied to the container")

+			result, err := oc.Run("rsh").Args(podName, "ls", "/tmp/image-streams").Output()

+			o.Expect(err).NotTo(o.HaveOccurred())

+			o.Expect(result).To(o.ContainSubstring("image-streams-rhel7.json"))

+			o.Expect(result).NotTo(o.ContainSubstring("image-streams-centos7.json"))

+		})

+

+		g.It("should honor the --progress flag", func() {

+			g.By(fmt.Sprintf("Calling oc rsync %s %s:/tmp --progress", sourcePath1, podName))

+			result, err := oc.Run("rsync").Args(

+				sourcePath1,

+				fmt.Sprintf("%s:/tmp", podName),

+				"--progress").Output()

+			o.Expect(err).NotTo(o.HaveOccurred())

+			o.Expect(result).To(o.ContainSubstring("100%"))

+		})

+

+		g.It("should honor the --no-perms flag", func() {

+			g.By("Creating a temporary destination directory")

+			tempDir, err := ioutil.TempDir("", "rsync")

+			o.Expect(err).NotTo(o.HaveOccurred())

+

+			g.By(fmt.Sprintf("Copying the jenkins directory from the pod to the temp directory: oc rsync %s:/var/lib/jenkins %s", podName, tempDir))

+			err = oc.Run("rsync").Args(

+				fmt.Sprintf("%s:/var/lib/jenkins", podName),

+				tempDir).Execute()

+			o.Expect(err).NotTo(o.HaveOccurred())

+

+			localJenkinsDir := filepath.Join(tempDir, "jenkins")

+			g.By("By changing the permissions on the local jenkins directory")

+			err = os.Chmod(localJenkinsDir, 0700)

+			o.Expect(err).NotTo(o.HaveOccurred())

+

+			g.By(fmt.Sprintf("Copying the local jenkins directory to the pod with no flags: oc rsync %s/ %s:/var/lib/jenkins", localJenkinsDir, podName))

+			err = oc.Run("rsync").Args(

+				fmt.Sprintf("%s/", localJenkinsDir),

+				fmt.Sprintf("%s:/var/lib/jenkins", podName)).Execute()

+			// An error should occur trying to set permissions on the directory

+			o.Expect(err).To(o.HaveOccurred())

+

+			g.By(fmt.Sprintf("Copying the local jenkins directory to the pod with: oc rsync %s/ %s:/var/lib/jenkins --no-perms", localJenkinsDir, podName))

+			err = oc.Run("rsync").Args(

+				fmt.Sprintf("%s/", localJenkinsDir),

+				fmt.Sprintf("%s:/var/lib/jenkins", podName),

+				"--no-perms").Execute()

+			o.Expect(err).NotTo(o.HaveOccurred())

+		})

+	})

+

 })