diff options
Diffstat (limited to 'samples/scenarios')
| -rw-r--r-- | samples/scenarios/clearwater_ims/clt-docker/clearwater-live-test.tgz | bin | 1627952 -> 0 bytes | |||
| -rw-r--r-- | samples/scenarios/modsecurity_all_in_one.yaml | 2 | ||||
| -rw-r--r-- | samples/scenarios/service_delivery_controller.yaml | 70 | ||||
| -rw-r--r-- | samples/scenarios/service_delivery_controller_opnfv.yaml | 26 | ||||
| -rwxr-xr-x | samples/scenarios/view.sh | 30 |
5 files changed, 81 insertions, 47 deletions
diff --git a/samples/scenarios/clearwater_ims/clt-docker/clearwater-live-test.tgz b/samples/scenarios/clearwater_ims/clt-docker/clearwater-live-test.tgz Binary files differdeleted file mode 100644 index 9bcb417..0000000 --- a/samples/scenarios/clearwater_ims/clt-docker/clearwater-live-test.tgz +++ /dev/null diff --git a/samples/scenarios/modsecurity_all_in_one.yaml b/samples/scenarios/modsecurity_all_in_one.yaml index aa92b13..84f3fe0 100644 --- a/samples/scenarios/modsecurity_all_in_one.yaml +++ b/samples/scenarios/modsecurity_all_in_one.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: modsecurity-crs - image: clover/clover-ns-modsecurity-crs + image: opnfv/clover-ns-modsecurity-crs ports: - containerPort: 80 env: diff --git a/samples/scenarios/service_delivery_controller.yaml b/samples/scenarios/service_delivery_controller.yaml index b9c3506..9f37f1b 100644 --- a/samples/scenarios/service_delivery_controller.yaml +++ b/samples/scenarios/service_delivery_controller.yaml @@ -226,6 +226,7 @@ spec: labels: app: http-lb version: v1 + name: http-lb-v1 spec: containers: - name: http-lb @@ -247,6 +248,7 @@ spec: labels: app: http-lb version: v2 + name: http-lb-v2 spec: containers: - name: http-lb @@ -263,13 +265,33 @@ metadata: app: http-lb spec: ports: - - port: 50054 - name: grpc - port: 9180 name: http selector: app: http-lb --- +apiVersion: v1 +kind: Service +metadata: + name: http-lb-v1 +spec: + ports: + - port: 50054 + name: grpc + selector: + name: http-lb-v1 +--- +apiVersion: v1 +kind: Service +metadata: + name: http-lb-v2 +spec: + ports: + - port: 50054 + name: grpc + selector: + name: http-lb-v2 +--- apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -344,18 +366,38 @@ spec: selector: app: proxy-access-control --- -apiVersion: extensions/v1beta1 -kind: Ingress +apiVersion: networking.istio.io/v1alpha3 +kind: Gateway metadata: - name: proxy-gateway - annotations: - kubernetes.io/ingress.class: "istio" + name: sdc-gateway spec: - rules: - - http: - paths: - - path: - backend: - serviceName: proxy-access-control - servicePort: 9180 + selector: + istio: ingressgateway # use istio default controller + servers: + - port: + number: 80 + name: http + protocol: HTTP + hosts: + - "*" --- +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: sdcsample +spec: + hosts: + - "*" + gateways: + - sdc-gateway + http: + - match: + - uri: + prefix: / + route: + - destination: + host: proxy-access-control + port: + number: 9180 + mirror: + host: snort-ids diff --git a/samples/scenarios/service_delivery_controller_opnfv.yaml b/samples/scenarios/service_delivery_controller_opnfv.yaml index ceba36f..cb4743f 100644 --- a/samples/scenarios/service_delivery_controller_opnfv.yaml +++ b/samples/scenarios/service_delivery_controller_opnfv.yaml @@ -226,6 +226,7 @@ spec: labels: app: http-lb version: v1 + name: http-lb-v1 spec: containers: - name: http-lb @@ -247,6 +248,7 @@ spec: labels: app: http-lb version: v2 + name: http-lb-v2 spec: containers: - name: http-lb @@ -263,13 +265,33 @@ metadata: app: http-lb spec: ports: - - port: 50054 - name: grpc - port: 9180 name: http selector: app: http-lb --- +apiVersion: v1 +kind: Service +metadata: + name: http-lb-v1 +spec: + ports: + - port: 50054 + name: grpc + selector: + name: http-lb-v1 +--- +apiVersion: v1 +kind: Service +metadata: + name: http-lb-v2 +spec: + ports: + - port: 50054 + name: grpc + selector: + name: http-lb-v2 +--- apiVersion: extensions/v1beta1 kind: Deployment metadata: diff --git a/samples/scenarios/view.sh b/samples/scenarios/view.sh deleted file mode 100755 index 8b155ce..0000000 --- a/samples/scenarios/view.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# 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 -# - -CLOVER_BASE_DIR=${CLOVER_BASE_DIR:-"/home/opnfv/repos/clover"} -ISTIO_BASE_DIR=${ISTIO_BASE_DIR:-"/istio-source"} - -cd $CLOVER_BASE_DIR - -echo "Deploying Prometheus monitoring" - -kubectl apply -f $ISTIO_BASE_DIR/install/kubernetes/addons/prometheus.yaml - -echo "Deploying Jaeger tracing" - -kubectl apply -n istio-system -f https://raw.githubusercontent.com/jaegertracing/jaeger-kubernetes/master/all-in-one/jaeger-all-in-one-template.yml - -echo "Exposing tracing and monitoring outside of Kubernetes cluster" - -kubectl delete -n istio-system svc prometheus - -kubectl expose -n istio-system deployment jaeger-deployment --port=16686 --type=NodePort - -kubectl expose -n istio-system deployment prometheus --port=9090 --type=NodePort |