Merge pull request #18599 from fbac/rsync-compression

Add --compress option to oc rsync

Author: openshift-merge-robot

contrib/completions/bash/oc

@@ -30,7 +30,7 @@ type rsyncStrategy struct {
 }
 
 // rshExcludeFlags are flags that are passed to oc rsync, and should not be passed on to the underlying command being invoked via oc rsh.
-var rshExcludeFlags = sets.NewString("delete", "strategy", "quiet", "include", "exclude", "progress", "no-perms", "watch")
+var rshExcludeFlags = sets.NewString("delete", "strategy", "quiet", "include", "exclude", "progress", "no-perms", "watch", "compress")
 
 func newRsyncStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (copyStrategy, error) {
 	// Determine the rsh command to pass to the local rsync command

contrib/completions/zsh/oc

@@ -79,6 +79,7 @@ type RsyncOptions struct {
 	Quiet             bool
 	Delete            bool
 	Watch             bool
+	Compress          bool
 	SuggestedCmdUsage string
 
 	RsyncInclude  []string
@@ -122,6 +123,8 @@ func NewCmdRsync(name, parent string, f *clientcmd.Factory, out, errOut io.Write
 	cmd.Flags().BoolVar(&o.RsyncProgress, "progress", false, "If true, show progress during transfer")
 	cmd.Flags().BoolVar(&o.RsyncNoPerms, "no-perms", false, "If true, do not transfer permissions")
 	cmd.Flags().BoolVarP(&o.Watch, "watch", "w", false, "Watch directory for changes and resync automatically")
+	cmd.Flags().BoolVar(&o.Compress, "compress", false, "compress file data during the transfer")
+
 	return cmd
 }
 

pkg/oc/cli/cmd/rsync/copyrsync.go

@@ -65,6 +65,9 @@ func rsyncFlagsFromOptions(o *RsyncOptions) []string {
 	if o.Delete {
 		flags = append(flags, "--delete")
 	}
+	if o.Compress {
+		flags = append(flags, "-z")
+	}
 	if len(o.RsyncInclude) > 0 {
 		for _, include := range o.RsyncInclude {
 			flags = append(flags, fmt.Sprintf("--include=%s", include))
@@ -98,6 +101,9 @@ func rsyncSpecificFlags(o *RsyncOptions) []string {
 	if o.RsyncNoPerms {
 		flags = append(flags, "--no-perms")
 	}
+	if o.Compress {
+		flags = append(flags, "-z")
+	}
 	return flags
 }