fix local dind env (#440)

* add --skip-refresh to helm init * fix dind document * rm manifests/local-dind/pv-create.sh manifests/local-dind/pv-hosts.sh and hack/dind-run-operators.sh
pingcap · May 5, 2019 · 6598b4d · 6598b4d
1 parent 712002e
commit 6598b4d
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 38 deletions.
diff --git a/docs/local-dind-tutorial.md b/docs/local-dind-tutorial.md
@@ -48,8 +48,7 @@ NAME                             AGE
 tidbclusters.pingcap.com         1m
 
 $ # Install TiDB Operator into Kubernetes
-$ helm install charts/tidb-operator --name=tidb-operator --namespace=tidb-admin
-
+$ helm install charts/tidb-operator --name=tidb-operator --namespace=tidb-admin --set scheduler.kubeSchedulerImageName=mirantis/hypokube --set scheduler.kubeSchedulerImageTag=final
 $ # wait operator running
 $ kubectl get pods --namespace tidb-admin -l app.kubernetes.io/instance=tidb-operator
 NAME                                       READY     STATUS    RESTARTS   AGE

diff --git a/hack/dind-run-operators.sh b/hack/dind-run-operators.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
+
 set -euo pipefail
 
-helm init --upgrade
-./manifests/local-dind/setup.sh
+manifests/local-dind/dind-cluster-v1.12.sh up
 kubectl apply -f ./manifests/crd.yaml
 helm install charts/tidb-operator --name tidb-operator --namespace=tidb-admin --set "imagePullPolicy=Always"
 helm install charts/tidb-cluster --name tidb-cluster --namespace=tidb
diff --git a/manifests/local-dind/dind-cluster-v1.10.sh b/manifests/local-dind/dind-cluster-v1.10.sh
@@ -2401,7 +2401,7 @@ function dind::run_tiller {
     if [[ $? -eq 0 ]];then
         helm_version=$(helm version -c --template '{{.Client.SemVer}}')
         if [[ -n ${KUBE_REPO_PREFIX} ]];then
-            helm init --tiller-image ${KUBE_REPO_PREFIX}/tiller:${helm_version}
+            helm init --tiller-image ${KUBE_REPO_PREFIX}/tiller:${helm_version} --skip-refresh
         else
             helm init
         fi

diff --git a/manifests/local-dind/dind-cluster-v1.12.sh b/manifests/local-dind/dind-cluster-v1.12.sh
@@ -2416,7 +2416,7 @@ function dind::run_tiller {
     if [[ $? -eq 0 ]];then
         helm_version=$(helm version -c --template '{{.Client.SemVer}}')
         if [[ -n ${KUBE_REPO_PREFIX} ]];then
-            helm init --tiller-image ${KUBE_REPO_PREFIX}/tiller:${helm_version}
+            helm init --tiller-image ${KUBE_REPO_PREFIX}/tiller:${helm_version} --skip-refresh
         else
             helm init
         fi

diff --git a/manifests/local-dind/pv-create.sh b/manifests/local-dind/pv-create.sh
diff --git a/manifests/local-dind/pv-hosts.sh b/manifests/local-dind/pv-hosts.sh
diff --git a/manifests/local-dind/setup.sh b/manifests/local-dind/setup.sh