diff options
author | QiLiang <liangqi1@huawei.com> | 2018-03-31 17:21:30 +0800 |
---|---|---|
committer | QiLiang <liangqi1@huawei.com> | 2018-04-04 09:49:43 +0800 |
commit | c68b7b8380ea8d2ac4da6b4739c6b8e157bb952b (patch) | |
tree | 73f89ef0371cb77cd4f679db7ce890c6202a9253 /clover | |
parent | 67b7fb49e6ea6ac9c2547af263355e5f1aeade42 (diff) |
Add clover initial docker image build script
- install dependent deb/pip packages
- install basic tools istioctl, kubectl
- install clover source code
- build/upload docker image script
- update requirements.txt
- update module import path
- To use this image use need setup kube-config file.
e.g. `docker run -v /root/config:/root/.kube/config -it clover bash`
Change-Id: I91044bb99ce8e2b785ef03212d961a97b3d42233
Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'clover')
-rw-r--r-- | clover/monitoring/validate.py | 3 | ||||
-rw-r--r-- | clover/tools/clover_validate_rr.py | 10 | ||||
-rw-r--r-- | clover/tools/validate_rr.py | 8 | ||||
-rw-r--r-- | clover/tracing/tracing_sample.py | 3 | ||||
-rw-r--r-- | clover/tracing/validate.py | 2 |
5 files changed, 12 insertions, 14 deletions
diff --git a/clover/monitoring/validate.py b/clover/monitoring/validate.py index fafe5df..347fe84 100644 --- a/clover/monitoring/validate.py +++ b/clover/monitoring/validate.py @@ -5,9 +5,10 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -from monitoring import Monitoring from kubernetes import client, config +from clover.monitoring.monitoring import Monitoring + PROMETHEUS_URL = "http://127.0.0.1:9090" PROMETHEUS_DEPLOYMENT = "prometheus" PROMETHEUS_LABELS = "app=prometheus" diff --git a/clover/tools/clover_validate_rr.py b/clover/tools/clover_validate_rr.py index ff1f8b4..896df6e 100644 --- a/clover/tools/clover_validate_rr.py +++ b/clover/tools/clover_validate_rr.py @@ -10,12 +10,10 @@ import getopt import sys -sys.path.insert(0, '..') - -from orchestration import kube_client -import servicemesh.route_rules as rr -from tracing.tracing import Tracing -from validate_rr import ValidateWRR +from clover.orchestration import kube_client +import clover.servicemesh.route_rules as rr +from clover.tracing.tracing import Tracing +from clover.tools.validate_rr import ValidateWRR def main(argv): service_name = None diff --git a/clover/tools/validate_rr.py b/clover/tools/validate_rr.py index 0e7b9ed..aa1b211 100644 --- a/clover/tools/validate_rr.py +++ b/clover/tools/validate_rr.py @@ -8,11 +8,9 @@ # http://www.apache.org/licenses/LICENSE-2.0 import sys -sys.path.insert(0, '..') - -from orchestration import kube_client -import servicemesh.route_rules as rr -from tracing.tracing import Tracing +from clover.orchestration import kube_client +import clover.servicemesh.route_rules as rr +from clover.tracing.tracing import Tracing class ValidateWRR(object): diff --git a/clover/tracing/tracing_sample.py b/clover/tracing/tracing_sample.py index f0234bf..1026008 100644 --- a/clover/tracing/tracing_sample.py +++ b/clover/tracing/tracing_sample.py @@ -7,7 +7,8 @@ import uuid import time -from tracing import Tracing + +from clover.tracing.tracing import Tracing t = Tracing('localhost', '30888') diff --git a/clover/tracing/validate.py b/clover/tracing/validate.py index eed6f9a..9cbfdd0 100644 --- a/clover/tracing/validate.py +++ b/clover/tracing/validate.py @@ -5,9 +5,9 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -from tracing import Tracing from kubernetes import client, config +from clover.tracing.tracing import Tracing JAEGER_IP = "localhost" # JAEGER_IP = "1.1.1.1" |