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.

Sign up for GitHub

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

Update DinD image to make it possible to configure HTTP proxies #485

Merged
merged 1 commit into from
May 14, 2019
Merged

Update DinD image to make it possible to configure HTTP proxies #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions docs/local-dind-tutorial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ $ manifests/local-dind/dind-cluster-v1.12.sh up
$ KUBE_REPO_PREFIX=uhub.ucloud.cn/pingcap manifests/local-dind/dind-cluster-v1.12.sh up
```

> **Note:** An alternative solution is to configure HTTP proxies in DinD.

```
$ export DIND_HTTP_PROXY=http://<ip>:<port>
$ export DIND_HTTPS_PROXY=http://<ip>:<port>
$ export DIND_NO_PROXY=.svc,.local,127.0.0.1,0,1,2,3,4,5,6,7,8,9 # whitelist internal domains and IP addresses
$ manifests/local-dind/dind-cluster-v1.12.sh up
```

## Step 2: Install TiDB Operator in the DinD Kubernetes cluster

```sh
Expand Down
2 changes: 1 addition & 1 deletion manifests/local-dind/dind-cluster-v1.10.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if [[ $(uname) == Linux && -z ${DOCKER_HOST:-} ]]; then
using_local_linuxdocker=1
fi

EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:ba1b61973fb4761f209580c599c17eab7c2e1bead5dfe496aab47c5ff672b05f
EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:0a68bdc682af3e102bafb9efa304a1b50aec0b2c64c086c34004d4d289e5b173

KUBE_REPO_PREFIX="${KUBE_REPO_PREFIX:-}"
if [[ -n ${KUBE_REPO_PREFIX} ]];then
Expand Down
2 changes: 1 addition & 1 deletion manifests/local-dind/dind-cluster-v1.12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if [[ $(uname) == Linux && -z ${DOCKER_HOST:-} ]]; then
using_local_linuxdocker=1
fi

EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:8e679951101f3f2030e77a1146cc514631f21f424027fcc003fc78a0337eb730
EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:48782c23bedd3f9c3d42af0ab0417eeff7d7884eac20a67adcb0c8534a97fce1

KUBE_REPO_PREFIX="${KUBE_REPO_PREFIX:-}"
if [[ -n ${KUBE_REPO_PREFIX} ]];then
Expand Down