diff options
author | Eddie Arrage <eddie.arrage@huawei.com> | 2018-06-28 17:42:28 +0000 |
---|---|---|
committer | Eddie Arrage <eddie.arrage@huawei.com> | 2018-07-31 03:39:28 +0000 |
commit | f38f41124db707b390e8f21c1a91e1022b3633ab (patch) | |
tree | 434392d7104140ebf65ef7542bf325471e1d7e73 /clover/controller/yaml | |
parent | 1f543c55dd426a34ab3cafa514fa446c22b6fa03 (diff) |
Implement initial clover-controller service
- First pass of clover-controller which resides within the k8s
cluster and provides interfaces to all Clover services
- Only service that should need to be exposed outside of
cluster
- Docker build of container that uses stack of nginx, gunicorn
and flask to provide REST interface
- REST interface is intended to serve cloverctl CLI and
dashboard browser UI
- Implements GRPC messaging to clover-collector and snort
- GRPC interfaces files for snort/nginx are added to
container from repo. Collector GRPC files will be removed
from controller/control/api once patch below is merged
https://gerrit.opnfv.org/gerrit/#/c/57245/ and added
similarly
- Provides first pass callback for file upload from
clover-server.
- Some REST messages implement JSON for passing params
to internal services
- Redis interface added to obtain data from services.
Currently, a simple interface to retrieve snort event
information
- YAML manifest renderer to add to k8s. Uses NodePort
service currently, defaulting to port 32044.
- Removed collector gRPC interface files with merge of collector
- Expose tracing and monitoring host/port parameters, as these vary
depending on Istio version and Jaeger version
- Add logging to flask blueprints
- Added jmeter blueprint interface with REST for
testplan generation, start test and result retrieval
- Added flask Response to REST reply messages
- Retrieve some basic stats from collector in json
response
Change-Id: I59eaeb860445ade4b45bba22747a61fb0cf0bbd4
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
Diffstat (limited to 'clover/controller/yaml')
-rw-r--r-- | clover/controller/yaml/manifest.template | 38 | ||||
-rw-r--r-- | clover/controller/yaml/render_yaml.py | 73 |
2 files changed, 111 insertions, 0 deletions
diff --git a/clover/controller/yaml/manifest.template b/clover/controller/yaml/manifest.template new file mode 100644 index 0000000..d8cb8b0 --- /dev/null +++ b/clover/controller/yaml/manifest.template @@ -0,0 +1,38 @@ +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ deploy_name }} + labels: + app: {{ deploy_name }} +spec: + template: + metadata: + labels: + app: {{ deploy_name }} + spec: + containers: + - name: {{ deploy_name }} + image: {{ image_path }}/{{ image_name }}:{{ image_tag }} + ports: + - containerPort: {{ snort_grpc_port }} + - containerPort: {{ nginx_grpc_port }} + - containerPort: {{ redis_port }} + - containerPort: {{ cass_port }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ deploy_name }} + labels: + app: {{ deploy_name }} +spec: + type: NodePort + ports: + - name: http + port: 80 + targetPort: 80 + nodePort: {{ node_port }} + protocol: TCP + selector: + app: {{ deploy_name }} diff --git a/clover/controller/yaml/render_yaml.py b/clover/controller/yaml/render_yaml.py new file mode 100644 index 0000000..4795a9c --- /dev/null +++ b/clover/controller/yaml/render_yaml.py @@ -0,0 +1,73 @@ +# Copyright (c) Authors of Clover +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 + +import argparse + +from jinja2 import Template + + +def render_yaml(args): + template_file = 'manifest.template' + out_file = args['deploy_name'] + '.yaml' + + try: + with open(template_file) as f: + tmpl = Template(f.read()) + output = tmpl.render( + image_path=args['image_path'], + image_name=args['image_name'], + image_tag=args['image_tag'], + deploy_name=args['deploy_name'], + snort_grpc_port=args['snort_grpc_port'], + nginx_grpc_port=args['nginx_grpc_port'], + redis_port=args['redis_port'], + cass_port=args['cass_port'], + node_port=args['node_port'] + ) + with open(out_file, "wb") as fh: + fh.write(output) + return "Generated manifest for {}".format(args['deploy_name']) + except Exception as e: + print(e) + return "Unable to generate manifest for {}".format( + args['deploy_name']) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument( + '--image_name', default='clover-controller', + help='The image name to use') + parser.add_argument( + #'--image_path', default='opnfv', + '--image_path', default='localhost:5000', + help='The path to the image to use') + parser.add_argument( + #'--image_tag', default='opnfv-6.0.0', + '--image_tag', default='latest', + help='The image tag to use') + parser.add_argument( + '--deploy_name', default='clover-controller', + help='The k8s deploy name to use') + parser.add_argument( + '--redis_port', default='6379', + help='The redis port to connect for management') + parser.add_argument( + '--snort_grpc_port', default='50052', + help='The GRPC port for snort service') + parser.add_argument( + '--nginx_grpc_port', default='50054', + help='The GRPC port for nginx services') + parser.add_argument( + '--node_port', default='32044', + help='Default nodePort port number') + parser.add_argument( + '--cass_port', default='9042', + help='The Cassandra port') + + args = parser.parse_args() + print(render_yaml(vars(args))) |