Merge pull request #18376 from deads2k/cli-17-autoscale

Automatic merge from submit-queue (batch tested with PRs 18376, 18355). UPSTREAM: <carry>: hack in working autoscale reference for oc autoscale I lost your bugzilla. This adds a nasty hack to recognize that we need to specify a different group for autoscaling DCs. /assign @DirectXMan12 /assign @juanvallejo
openshift · Feb 2, 2018 · 7a6d8cd · 7a6d8cd
2 parents 413056b + e0ff016
commit 7a6d8cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/test/cmd/deployments.sh b/test/cmd/deployments.sh
@@ -140,6 +140,7 @@ os::test::junit::declare_suite_start "cmd/deployments/autoscale"
 os::cmd::expect_success 'oc create -f test/integration/testdata/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_and_text "oc get hpa/test-deployment-config -o jsonpath='{.spec.scaleTargetRef.apiVersion}'" "apps.openshift.io/v1"
 os::cmd::expect_success 'oc delete dc/test-deployment-config'
 os::cmd::expect_success 'oc delete hpa/test-deployment-config'
 echo "autoscale: ok"

diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/autoscale.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/autoscale.go