Merge pull request #17814 from themez/master

Auto commit by PR queue bot

Merge pull request #17814 from themez/master
7bcd7759 · k8s-merge-robot · 004c2472 · 3342e4e1 · 7bcd7759
Commit 7bcd7759 authored Dec 01, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

util.sh cluster/aws/util.sh +2 -0

No files found.
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -541,6 +541,8 @@ function upload-server-tars() {
    # "US Classic" does not follow the pattern
    s3_url_base=https://s3.amazonaws.com
    s3_bucket_location=us-east-1
+  elif [[ "${s3_bucket_location}" == "cn-north-1" ]]; then
+    s3_url_base=https://s3.cn-north-1.amazonaws.com.cn
  fi

  local -r staging_path="devel"