diff options
| author |   HuabingZhao <zhao.huabing@zte.com.cn> | 2017-08-31 16:04:55 +0800 |
|---|---|---|
| committer | HuabingZhao <zhao.huabing@zte.com.cn> | 2017-08-31 16:09:58 +0800 |
| commit | a7837a0ac51704003c6aacba2dacb8e64f681622 (patch) | |
| tree | e350eb24e30d8523a222de0c4cc2cec0675035f1 /kube2consul/src/main/docker | |
| parent | c0f3b093c704da85252044b3a177dbabab63c49a (diff) | |
remove kube2consul codes
Issue-Id: OOM-61
Change-Id: I4eb076835a051ed6bb3abbdcb90aafdf4d4a7149
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
Diffstat (limited to 'kube2consul/src/main/docker')
| -rw-r--r-- | kube2consul/src/main/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | kube2consul/src/main/docker/start.sh | 36 |
2 files changed, 0 insertions, 47 deletions
diff --git a/kube2consul/src/main/docker/Dockerfile b/kube2consul/src/main/docker/Dockerfile deleted file mode 100644 index 278cac5..0000000 --- a/kube2consul/src/main/docker/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM alpine:3.3
-ENV CONSUL_VERSION 0.7.1
-ENV BASE /
-ADD consul-linux_amd64.tar.gz /
-RUN cd /usr/lib \
- && ln -s /consul/libglib-2.0.so.0.4400.0 libglib-2.0.so.0 \
- && ln -s /consul/libintl.so.8.1.3 libintl.so.8
-COPY kube2consul /bin/
-COPY start.sh /
-
-ENTRYPOINT exec /start.sh
\ No newline at end of file diff --git a/kube2consul/src/main/docker/start.sh b/kube2consul/src/main/docker/start.sh deleted file mode 100644 index 033c50b..0000000 --- a/kube2consul/src/main/docker/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -if [ -z "${KUBE_MASTER_IP}" ]; then - echo "kube master node ip is required." - exit 1 -fi - -if [ -n "${JOIN_IP}" ]; then - echo "### Starting consul client" - if [ -z "${ALL_IN_ONE}" ]; then - /consul/consul agent -data-dir /consul-works/data-dir -node kube2consul_${KUBE_MASTER_IP} -bind ${KUBE_MASTER_IP} -client 0.0.0.0 -retry-join ${JOIN_IP} -retry-interval 5s & - else - /consul/consul agent -data-dir /consul-works/data-dir -node kube2consul_${KUBE_MASTER_IP} -bind 0.0.0.0 -client 0.0.0.0 -retry-join ${JOIN_IP} -retry-interval 5s & - fi -fi - -if [ -z "${RUN_MODE}" ]; then - echo "non-HA scenario." -else - echo "\n\n### Starting consul agent" - cd ./consul - ./entry.sh & -fi - -kube_url="http://${KUBE_MASTER_IP}:8080" - -if [ "${CLUSTER_TYPE}" == "openshift" ]; then - kube_url="https://${KUBE_MASTER_IP}:8443" -fi - -echo "\n\n### Starting kube2consul" -if [ -z "${PDM_CONTROLLER_IP}" ]; then - /bin/kube2consul --kube_master_url ${kube_url} -else - echo "in Paas mode." - /bin/kube2consul --kube_master_url ${kube_url} --pdm_controller_url http://${PDM_CONTROLLER_IP}:9527 -fi
\ No newline at end of file |