@@ -5823,6 +5823,104 @@ _oc_convert()

     must_have_one_noun=()

 }

+_oc_autoscale()

+{

+    last_command="oc_autoscale"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--cpu-percent=")

+    flags+=("--dry-run")

+    flags+=("--filename=")

+    flags_with_completion+=("--filename")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    two_word_flags+=("-f")

+    flags_with_completion+=("-f")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    flags+=("--generator=")

+    flags+=("--max=")

+    flags+=("--min=")

+    flags+=("--name=")

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

+    flags+=("--output=")

+    two_word_flags+=("-o")

+    flags+=("--output-version=")

+    flags+=("--save-config")

+    flags+=("--show-all")

+    flags+=("-a")

+    flags+=("--sort-by=")

+    flags+=("--template=")

+    two_word_flags+=("-t")

+    flags+=("--alsologtostderr")

+    flags+=("--api-version=")

+    flags+=("--boot-id-file=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--container-hints=")

+    flags+=("--context=")

+    flags+=("--docker=")

+    flags+=("--docker-only")

+    flags+=("--docker-root=")

+    flags+=("--docker-run=")

+    flags+=("--enable-load-reader")

+    flags+=("--event-storage-age-limit=")

+    flags+=("--event-storage-event-limit=")

+    flags+=("--global-housekeeping-interval=")

+    flags+=("--google-json-key=")

+    flags+=("--housekeeping-interval=")

+    flags+=("--httptest.serve=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--ir-data-source=")

+    flags+=("--ir-dbname=")

+    flags+=("--ir-influxdb-host=")

+    flags+=("--ir-namespace-only")

+    flags+=("--ir-password=")

+    flags+=("--ir-percentile=")

+    flags+=("--ir-user=")

+    flags+=("--log-backtrace-at=")

+    flags+=("--log-cadvisor-usage")

+    flags+=("--log-dir=")

+    flags+=("--log-flush-frequency=")

+    flags+=("--logtostderr")

+    flags+=("--machine-id-file=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--nosystemd")

+    flags+=("--server=")

+    flags+=("--stderrthreshold=")

+    flags+=("--storage-driver-buffer-duration=")

+    flags+=("--storage-driver-db=")

+    flags+=("--storage-driver-host=")

+    flags+=("--storage-driver-password=")

+    flags+=("--storage-driver-secure")

+    flags+=("--storage-driver-table=")

+    flags+=("--storage-driver-user=")

+    flags+=("--token=")

+    flags+=("--user=")

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

+    flags+=("--vmodule=")

+

+    must_have_one_flag=()

+    must_have_one_flag+=("--max=")

+    must_have_one_noun=()

+}

+

 _oc_logout()

 {

     last_command="oc_logout"

@@ -6968,6 +7066,7 @@ _oc()

     commands+=("policy")

     commands+=("secrets")

     commands+=("convert")

+    commands+=("autoscale")

     commands+=("logout")

     commands+=("config")

     commands+=("whoami")

@@ -11594,6 +11594,104 @@ _openshift_cli_convert()

     must_have_one_noun=()

 }

+_openshift_cli_autoscale()

+{

+    last_command="openshift_cli_autoscale"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--cpu-percent=")

+    flags+=("--dry-run")

+    flags+=("--filename=")

+    flags_with_completion+=("--filename")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    two_word_flags+=("-f")

+    flags_with_completion+=("-f")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    flags+=("--generator=")

+    flags+=("--max=")

+    flags+=("--min=")

+    flags+=("--name=")

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

+    flags+=("--output=")

+    two_word_flags+=("-o")

+    flags+=("--output-version=")

+    flags+=("--save-config")

+    flags+=("--show-all")

+    flags+=("-a")

+    flags+=("--sort-by=")

+    flags+=("--template=")

+    two_word_flags+=("-t")

+    flags+=("--alsologtostderr")

+    flags+=("--api-version=")

+    flags+=("--boot-id-file=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--container-hints=")

+    flags+=("--context=")

+    flags+=("--docker=")

+    flags+=("--docker-only")

+    flags+=("--docker-root=")

+    flags+=("--docker-run=")

+    flags+=("--enable-load-reader")

+    flags+=("--event-storage-age-limit=")

+    flags+=("--event-storage-event-limit=")

+    flags+=("--global-housekeeping-interval=")

+    flags+=("--google-json-key=")

+    flags+=("--housekeeping-interval=")

+    flags+=("--httptest.serve=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--ir-data-source=")

+    flags+=("--ir-dbname=")

+    flags+=("--ir-influxdb-host=")

+    flags+=("--ir-namespace-only")

+    flags+=("--ir-password=")

+    flags+=("--ir-percentile=")

+    flags+=("--ir-user=")

+    flags+=("--log-backtrace-at=")

+    flags+=("--log-cadvisor-usage")

+    flags+=("--log-dir=")

+    flags+=("--log-flush-frequency=")

+    flags+=("--logtostderr")

+    flags+=("--machine-id-file=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--nosystemd")

+    flags+=("--server=")

+    flags+=("--stderrthreshold=")

+    flags+=("--storage-driver-buffer-duration=")

+    flags+=("--storage-driver-db=")

+    flags+=("--storage-driver-host=")

+    flags+=("--storage-driver-password=")

+    flags+=("--storage-driver-secure")

+    flags+=("--storage-driver-table=")

+    flags+=("--storage-driver-user=")

+    flags+=("--token=")

+    flags+=("--user=")

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

+    flags+=("--vmodule=")

+

+    must_have_one_flag=()

+    must_have_one_flag+=("--max=")

+    must_have_one_noun=()

+}

+

 _openshift_cli_logout()

 {

     last_command="openshift_cli_logout"

@@ -12739,6 +12837,7 @@ _openshift_cli()

     commands+=("policy")

     commands+=("secrets")

     commands+=("convert")

+    commands+=("autoscale")

     commands+=("logout")

     commands+=("config")

     commands+=("whoami")

@@ -68,6 +68,22 @@ Attach to a running container.

 ====

+== oc autoscale

+Autoscale a deployment config or replication controller

+

+====

+

+[options="nowrap"]

+----

+  # Auto scale a deployment config "foo", with the number of pods between 2 to 10, target CPU utilization at a default value that server applies:

+  $ oc autoscale dc/foo --min=2 --max=10

+

+  # Auto scale a replication controller "foo", with the number of pods between 1 to 5, target CPU utilization at 80%

+  $ oc autoscale rc/foo --max=5 --cpu-percent=80

+----

+====

+

+

 == oc cancel-build

 Cancel a pending or running build

@@ -131,6 +131,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *

 				policy.NewCmdPolicy(policy.PolicyRecommendedName, fullName+" "+policy.PolicyRecommendedName, f, out),

 				secrets.NewCmdSecrets(secrets.SecretsRecommendedName, fullName+" "+secrets.SecretsRecommendedName, f, in, out, fullName+" edit"),

 				cmd.NewCmdConvert(fullName, f, out),

+				cmd.NewCmdAutoscale(fullName, f, out),

 			},

 		},

 		{

@@ -273,6 +273,29 @@ func NewCmdScale(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Co

 }

 const (

+	autoScaleLong = `Autoscale a deployment config or replication controller.

+

+Looks up a deployment config or replication controller by name and creates an autoscaler that uses

+this deployment config or replication controller as a reference. An autoscaler can automatically

+increase or decrease number of pods deployed within the system as needed.`

+

+	autoScaleExample = `  # Auto scale a deployment config "foo", with the number of pods between 2 to 10, target CPU utilization at a default value that server applies:

+  $ %[1]s autoscale dc/foo --min=2 --max=10

+

+  # Auto scale a replication controller "foo", with the number of pods between 1 to 5, target CPU utilization at 80%%

+  $ %[1]s autoscale rc/foo --max=5 --cpu-percent=80`

+)

+

+// NewCmdAutoscale is a wrapper for the Kubernetes cli autoscale command

+func NewCmdAutoscale(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

+	cmd := kcmd.NewCmdAutoscale(f.Factory, out)

+	cmd.Short = "Autoscale a deployment config or replication controller"

+	cmd.Long = autoScaleLong

+	cmd.Example = fmt.Sprintf(autoScaleExample, fullName)

+	return cmd

+}

+

+const (

 	runLong = `Create and run a particular image, possibly replicated

 Creates a deployment config to manage the created container(s). You can choose to run in the

@@ -19,7 +19,6 @@ import (

 var MissingCommands = sets.NewString(

 	"namespace", "rolling-update",

 	"cluster-info", "api-versions",

-	"autoscale", // TODO

 	"stop",

 	"cordon",

 	"drain",

@@ -355,6 +355,13 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 		}

 		return kCanBeExposed(kind)

 	}

+	kCanBeAutoscaled := w.Factory.CanBeAutoscaled

+	w.CanBeAutoscaled = func(kind unversioned.GroupKind) error {

+		if kind == deployapi.Kind("DeploymentConfig") {

+			return nil

+		}

+		return kCanBeAutoscaled(kind)

+	}

 	kAttachablePodForObjectFunc := w.Factory.AttachablePodForObject

 	w.AttachablePodForObject = func(object runtime.Object) (*api.Pod, error) {

 		oc, kc, err := w.Clients()

@@ -97,3 +97,11 @@ os::cmd::expect_success 'oc delete dc/database'

 os::cmd::expect_failure 'oc get dc/database'

 os::cmd::expect_failure 'oc get rc/database-1'

 echo "stop: ok"

+

+os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

+os::cmd::expect_success 'oc autoscale dc/test-deployment-config --max 5'

+os::cmd::expect_success_and_text "oc get hpa/test-deployment-config --template='{{.spec.maxReplicas}}'" "5"

+os::cmd::expect_success 'oc delete dc/test-deployment-config'

+os::cmd::expect_success 'oc delete hpa/test-deployment-config'

+echo "autoscale: ok"

+