Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix local dind env #440

Merged
merged 2 commits into from
May 5, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docs/local-dind-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not change it in values.yaml directly?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a tutorial, it's easier for users to copy/paste.

$ # wait operator running
$ kubectl get pods --namespace tidb-admin -l app.kubernetes.io/instance=tidb-operator
NAME READY STATUS RESTARTS AGE
Expand Down
8 changes: 0 additions & 8 deletions hack/dind-run-operators.sh

This file was deleted.

2 changes: 1 addition & 1 deletion manifests/local-dind/dind-cluster-v1.10.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you want to add this parameter ? Just want to skip downloading the stable repo's index.yaml file ? refer this code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, just to skip the download of the index.yaml file on https://kubernetes-charts.storage.googleapis.com. It is blocked that you understand.

else
helm init
fi
Expand Down
2 changes: 1 addition & 1 deletion manifests/local-dind/dind-cluster-v1.12.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 0 additions & 19 deletions manifests/local-dind/pv-create.sh

This file was deleted.

8 changes: 0 additions & 8 deletions manifests/local-dind/pv-hosts.sh

This file was deleted.

5 changes: 0 additions & 5 deletions manifests/local-dind/setup.sh

This file was deleted.