Added toplevel manifests for SDC sample scenario

- Added missing k8s manifest yaml files for overall service delivery
controller scenario - cannot be deployed coherently without this manifest
- One file for private docker registry and one for opnfv
public registry
- Outlined in JIRA ticket CLOVER-16 and validated per
description
- Includes ingress rule, community redis pod/service and deployments
for http-lb (v1/v2), snort-ids, proxy-access-controller,
and clover-server1-5
- All above pod/deployment naming matches default container
configuration
- Tested with istio manual injection

Change-Id: Ia03782b38020d744ab00c99adbf4832d15bbd9f3
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>

diff --git a/samples/scenarios/service_delivery_controller.yaml b/samples/scenarios/service_delivery_controller.yaml
index c3a9411..b9c3506 100644 (file)
--- a/samples/scenarios/service_delivery_controller.yaml
+++ b/samples/scenarios/service_delivery_controller.yaml
@@ -1 +1,361 @@
-<Toplevel yaml for entire sample scenario (applciation) goes here>
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    name: redis
+    redis-sentinel: "true"
+    role: master
+  name: redis
+spec:
+  containers:
+    - name: redis
+      image: k8s.gcr.io/redis:v1
+      env:
+        - name: MASTER
+          value: "true"
+      ports:
+        - containerPort: 6379
+      resources:
+        limits:
+          cpu: "0.1"
+      volumeMounts:
+        - mountPath: /redis-master-data
+          name: data
+    - name: sentinel
+      image: kubernetes/redis:v1
+      env:
+        - name: SENTINEL
+          value: "true"
+      ports:
+        - containerPort: 26379
+  volumes:
+    - name: data
+      emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+spec:
+  ports:
+  - port: 6379
+  selector:
+    name: redis
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server1
+  labels:
+    app: clover-server1
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server1
+    spec:
+      containers:
+        - name: clover-server1
+          image: localhost:5000/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server1
+  labels:
+    app: clover-server1
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server1
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server2
+  labels:
+    app: clover-server2
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server2
+    spec:
+      containers:
+        - name: clover-server2
+          image: localhost:5000/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server2
+  labels:
+    app: clover-server2
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server2
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server3
+  labels:
+    app: clover-server3
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server3
+    spec:
+      containers:
+        - name: clover-server3
+          image: localhost:5000/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server3
+  labels:
+    app: clover-server3
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server3
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server4
+  labels:
+    app: clover-server4
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server4
+    spec:
+      containers:
+        - name: clover-server4
+          image: localhost:5000/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server4
+  labels:
+    app: clover-server4
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server4
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server5
+  labels:
+    app: clover-server5
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server5
+    spec:
+      containers:
+        - name: clover-server5
+          image: localhost:5000/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server5
+  labels:
+    app: clover-server5
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server5
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: http-lb-v1
+  labels:
+    app: http-lb
+    version: v1
+spec:
+  template:
+    metadata:
+      labels:
+        app: http-lb
+        version: v1
+    spec:
+      containers:
+        - name: http-lb
+          image: localhost:5000/clover-ns-nginx-lb:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: http-lb-v2
+  labels:
+    app: http-lb
+    version: v2
+spec:
+  template:
+    metadata:
+      labels:
+        app: http-lb
+        version: v2
+    spec:
+      containers:
+        - name: http-lb
+          image: localhost:5000/clover-ns-nginx-lb:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: http-lb
+  labels:
+    app: http-lb
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: http-lb
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: snort-ids
+  labels:
+    app: snort-ids
+spec:
+  template:
+    metadata:
+      labels:
+        app: snort-ids
+    spec:
+      containers:
+        - name: snort-ids
+          image: localhost:5000/clover-ns-snort-ids:latest
+          ports:
+           - containerPort: 50052
+           - containerPort: 50054
+           - containerPort: 6379
+           - containerPort: 80
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: snort-ids
+  labels:
+    app: snort-ids
+spec:
+  ports:
+  - port: 50052
+    name: grpc
+  - port: 50054
+    name: proxy-access-control
+  - port: 6379
+    name: redis
+  - port: 80
+    name: http
+  selector:
+    app: snort-ids
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: proxy-access-control
+  labels:
+    app: proxy-access-control
+spec:
+  template:
+    metadata:
+      labels:
+        app: proxy-access-control
+    spec:
+      containers:
+        - name: proxy-access-control
+          image: localhost:5000/clover-ns-nginx-proxy:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: proxy-access-control
+  labels:
+    app: proxy-access-control
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: proxy-access-control
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: proxy-gateway
+  annotations:
+    kubernetes.io/ingress.class: "istio"
+spec:
+  rules:
+  - http:
+      paths:
+      - path:
+        backend:
+          serviceName: proxy-access-control
+          servicePort: 9180
+---

diff --git a/samples/scenarios/service_delivery_controller_opnfv.yaml b/samples/scenarios/service_delivery_controller_opnfv.yaml
new file mode 100644 (file)
index 0000000..ee0adcc
--- /dev/null
+++ b/samples/scenarios/service_delivery_controller_opnfv.yaml
@@ -0,0 +1,361 @@
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    name: redis
+    redis-sentinel: "true"
+    role: master
+  name: redis
+spec:
+  containers:
+    - name: redis
+      image: k8s.gcr.io/redis:v1
+      env:
+        - name: MASTER
+          value: "true"
+      ports:
+        - containerPort: 6379
+      resources:
+        limits:
+          cpu: "0.1"
+      volumeMounts:
+        - mountPath: /redis-master-data
+          name: data
+    - name: sentinel
+      image: kubernetes/redis:v1
+      env:
+        - name: SENTINEL
+          value: "true"
+      ports:
+        - containerPort: 26379
+  volumes:
+    - name: data
+      emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+spec:
+  ports:
+  - port: 6379
+  selector:
+    name: redis
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server1
+  labels:
+    app: clover-server1
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server1
+    spec:
+      containers:
+        - name: clover-server1
+          image: opnfv/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server1
+  labels:
+    app: clover-server1
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server1
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server2
+  labels:
+    app: clover-server2
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server2
+    spec:
+      containers:
+        - name: clover-server2
+          image: opnfv/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server2
+  labels:
+    app: clover-server2
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server2
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server3
+  labels:
+    app: clover-server3
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server3
+    spec:
+      containers:
+        - name: clover-server3
+          image: opnfv/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server3
+  labels:
+    app: clover-server3
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server3
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server4
+  labels:
+    app: clover-server4
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server4
+    spec:
+      containers:
+        - name: clover-server4
+          image: opnfv/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server4
+  labels:
+    app: clover-server4
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server4
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: clover-server5
+  labels:
+    app: clover-server5
+spec:
+  template:
+    metadata:
+      labels:
+        app: clover-server5
+    spec:
+      containers:
+        - name: clover-server5
+          image: opnfv/clover-ns-nginx-server:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: clover-server5
+  labels:
+    app: clover-server5
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: clover-server5
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: http-lb-v1
+  labels:
+    app: http-lb
+    version: v1
+spec:
+  template:
+    metadata:
+      labels:
+        app: http-lb
+        version: v1
+    spec:
+      containers:
+        - name: http-lb
+          image: opnfv/clover-ns-nginx-lb:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: http-lb-v2
+  labels:
+    app: http-lb
+    version: v2
+spec:
+  template:
+    metadata:
+      labels:
+        app: http-lb
+        version: v2
+    spec:
+      containers:
+        - name: http-lb
+          image: opnfv/clover-ns-nginx-lb:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: http-lb
+  labels:
+    app: http-lb
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: http-lb
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: snort-ids
+  labels:
+    app: snort-ids
+spec:
+  template:
+    metadata:
+      labels:
+        app: snort-ids
+    spec:
+      containers:
+        - name: snort-ids
+          image: opnfv/clover-ns-snort-ids:latest
+          ports:
+           - containerPort: 50052
+           - containerPort: 50054
+           - containerPort: 6379
+           - containerPort: 80
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: snort-ids
+  labels:
+    app: snort-ids
+spec:
+  ports:
+  - port: 50052
+    name: grpc
+  - port: 50054
+    name: proxy-access-control
+  - port: 6379
+    name: redis
+  - port: 80
+    name: http
+  selector:
+    app: snort-ids
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: proxy-access-control
+  labels:
+    app: proxy-access-control
+spec:
+  template:
+    metadata:
+      labels:
+        app: proxy-access-control
+    spec:
+      containers:
+        - name: proxy-access-control
+          image: opnfv/clover-ns-nginx-proxy:latest
+          ports:
+           - containerPort: 50054
+           - containerPort: 9180
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: proxy-access-control
+  labels:
+    app: proxy-access-control
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  - port: 9180
+    name: http
+  selector:
+    app: proxy-access-control
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: proxy-gateway
+  annotations:
+    kubernetes.io/ingress.class: "istio"
+spec:
+  rules:
+  - http:
+      paths:
+      - path:
+        backend:
+          serviceName: proxy-access-control
+          servicePort: 9180
+---