Merge branch 'master' into staging

This commit is contained in:
Denise
2018-11-08 17:04:17 -08:00
committed by GitHub
@@ -25,7 +25,6 @@ kubectl create clusterrolebinding tiller \
helm init --service-account tiller
# Users in China: You will need to specify a specific tiller-image in order to initialize tiller.
# The list of tiller image tags are available here: https://dev.aliyun.com/detail.html?spm=5176.1972343.2.18.ErFNgC&repoId=62085.
# When initializing tiller, you'll need to pass in --tiller-image