@@ -3,12 +3,15 @@ package rsync

 import (

 	"bytes"

 	"errors"

+	"fmt"

 	"io"

 	"strings"

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

+	"github.com/spf13/pflag"

 	kerrors "k8s.io/kubernetes/pkg/util/errors"

+	"k8s.io/kubernetes/pkg/util/sets"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

@@ -24,13 +27,19 @@ type rsyncStrategy struct {

 	RemoteExecutor executor

 }

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

+

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

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

 	rsh := siblingCommand(c, "rsh")

-	rshCmd := []string{rsh, "-n", o.Namespace}

-	if len(o.ContainerName) > 0 {

-		rshCmd = append(rshCmd, "-c", o.ContainerName)

-	}

+	rshCmd := []string{rsh}

+	// Append all original flags to rsh command

+	c.Flags().Visit(func(flag *pflag.Flag) {

+		if rshExcludeFlags.Has(flag.Name) {

+			return

+		}

+		rshCmd = append(rshCmd, fmt.Sprintf("--%s=%s", flag.Name, flag.Value.String()))

+	})

 	rshCmdStr := strings.Join(rshCmd, " ")

 	glog.V(4).Infof("Rsh command: %s", rshCmdStr)

new file mode 100644

@@ -0,0 +1,24 @@

+package rsync

+

+import (

+	"io/ioutil"

+	"testing"

+

+	"github.com/spf13/pflag"

+	"k8s.io/kubernetes/pkg/util/sets"

+)

+

+// rshAllowedFlags is the set of flags in the rsync command that

+// can be passed to the rsh command

+var rshAllowedFlags = sets.NewString("container")

+

+// TestRshExcludeFlags ensures that only rsync flags that are allowed to be set on the rsh flag

+// are not included in the rshExcludeFlags set.

+func TestRshExcludeFlags(t *testing.T) {

+	rsyncCmd := NewCmdRsync("rsync", "oc", nil, ioutil.Discard, ioutil.Discard)

+	rsyncCmd.Flags().VisitAll(func(flag *pflag.Flag) {

+		if !rshExcludeFlags.Has(flag.Name) && !rshAllowedFlags.Has(flag.Name) {

+			t.Errorf("Unknown flag %s. Please add to rshExcludeFlags or to rshAllowedFlags", flag.Name)

+		}

+	})

+}

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

 		},

 	}

+	// NOTE: When adding new flags to the command, please update the rshExcludeFlags in copyrsync.go

+	// if those flags should not be passed to the rsh command.

+

 	cmd.Flags().StringVarP(&o.ContainerName, "container", "c", "", "Container within the pod")

 	cmd.Flags().StringVar(&o.StrategyName, "strategy", "", "Specify which strategy to use for copy: rsync, rsync-daemon, or tar")