Merge pull request #46686 from CaoShuFeng/deprecated-flags

Automatic merge from submit-queue (batch tested with PRs 46686, 45049, 46323, 45708, 46487) Update deprecated flags for "make test-cmd" **Release note**: ``` NONE ```

Merge pull request #46686 from CaoShuFeng/deprecated-flags
bcc674bc · Kubernetes Submit Queue · GitHub · c13d8917 · 33cecc34 · bcc674bc
Commit bcc674bc authored Jun 01, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

test-cmd-util.sh hack/make-rules/test-cmd-util.sh +0 -1

test-cmd.sh hack/make-rules/test-cmd.sh +3 -5

No files found.
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -30,7 +30,6 @@ ETCD_PORT=${ETCD_PORT:-2379}
 API_PORT=${API_PORT:-8080}
 SECURE_API_PORT=${SECURE_API_PORT:-6443}
 API_HOST=${API_HOST:-127.0.0.1}
-KUBELET_PORT=${KUBELET_PORT:-10250}
 KUBELET_HEALTHZ_PORT=${KUBELET_HEALTHZ_PORT:-10248}
 CTLRMGR_PORT=${CTLRMGR_PORT:-10252}
 PROXY_HOST=127.0.0.1 # kubectl only serves on localhost.

--- a/hack/make-rules/test-cmd.sh
+++ b/hack/make-rules/test-cmd.sh
@@ -40,15 +40,13 @@ function run_kube_apiserver() {
  AUTHORIZATION_MODE="RBAC,AlwaysAllow"
  "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
-    --address="127.0.0.1" \
+    --insecure-bind-address="127.0.0.1" \
-    --public-address-override="127.0.0.1" \
+    --bind-address="127.0.0.1" \
-    --port="${API_PORT}" \
+    --insecure-port="${API_PORT}" \
    --authorization-mode="${AUTHORIZATION_MODE}" \
    --secure-port="${SECURE_API_PORT}" \
    --admission-control="${ADMISSION_CONTROL}" \
    --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
-    --public-address-override="127.0.0.1" \
-    --kubelet-port=${KUBELET_PORT} \
    --runtime-config=api/v1 \
    --storage-media-type="${KUBE_TEST_API_STORAGE_TYPE-}" \
    --cert-dir="${TMPDIR:-/tmp/}" \