From b86d77992e97d45612a8637413de4a7cbbc5969d Mon Sep 17 00:00:00 2001
From: Beppe Vanrolleghem <beppe.vanrolleghem@gmail.com>
Date: Mon, 9 Mar 2020 11:35:31 +0100
Subject: [PATCH] oepsie, net opgemerkt waarom mirror raar doet op istio

---
 deploy.yaml    | 185 ++++++++++---------------------------------------
 serverD/app.py |   2 +-
 2 files changed, 36 insertions(+), 151 deletions(-)

diff --git a/deploy.yaml b/deploy.yaml
index c41f3be..401a980 100644
--- a/deploy.yaml
+++ b/deploy.yaml
@@ -2,21 +2,21 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: istio-project-1
-  labels:
-    istio-injection: enabled #zorgt voor auto sidecar injection
+  name: consul-project-1
+  annotations:
+    "consul.hashicorp.com/connect-inject": "true" #dit is hoe consul injection handled
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: server-a
-  namespace: istio-project-1
+  namespace: consul-project-1
 spec:
   replicas: 1
   selector:
     matchLabels:
       server: "http"
-      app: "project-1" #app label bepaald groepering pods in kiali dashboard dus makkelijker te gebruiken
+      app: "project-1"
       expose: "true"
   template:
     metadata:
@@ -36,8 +36,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: server-b
-  namespace: istio-project-1
-spec:
+  namespace: consul-project-1
+spec: 
   replicas: 1
   selector:
     matchLabels:
@@ -64,7 +64,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: server-b-test
-  namespace: istio-project-1
+  namespace: consul-project-1
 spec:
   replicas: 1
   selector:
@@ -72,7 +72,7 @@ spec:
       server: "http"
       app: "project-1"
       version: v2
-      backend: "true" 
+      backend: "true"
   template:
     metadata:
       labels:
@@ -92,45 +92,47 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: server-d
-  namespace: istio-project-1
+  namespace: consul-project-1
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: "project-1"
       mirror: "true"
-  template:
-    metadata:
-      labels:
-        app: "project-1"
-        mirror: "true"
-    spec:
-      containers:
-        - name: front-end
-          image: beppev/server-d:master
-          ports:
-            - containerPort: 6000
+      server: "http"
+    template:
+      metadata:
+        labels:
+          app: "project-1"
+          mirror: "true"
+          server: "http"
+      spec:
+        containers:
+          - name: front-end
+            image: beppev/server-d:master
+            ports:
+              - containerPort: 6000
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: mirror-service
-  namespace: istio-project-1
+  name: expose-service
+  namespace: consul-project-1
   labels:
     app: "project-1"
 spec:
   selector:
-    mirror: "true"
+    expose: "true"
   ports:
     - name: http
       protocol: TCP
-      port: 6000
+      port: 5000
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: server-check
-  namespace: istio-project-1
+  name: backend-service
+  namespace: consul-project-1
   labels:
     app: "project-1"
 spec:
@@ -141,134 +143,17 @@ spec:
       protocol: TCP
       port: 6000
 ---
-apiVersion: networking.istio.io/v1alpha3
-kind: DestinationRule
-metadata:
-  name: server-check-destination
-  namespace: istio-project-1
-  labels:
-    app: "project-1"
-spec:
-  host: server-check
-  subsets:
-  - name: v1
-    labels:
-      version: v1
-  - name: v2
-    labels:
-      version: v2
----
-apiVersion: networking.istio.io/v1alpha3
-kind: Gateway
-metadata:
-  name: expose-server-gateway
-  namespace: istio-project-1
-  labels:
-    app: "project-1"
-spec:
-  selector:
-    istio: ingressgateway
-  servers:
-    - port:
-        number: 80
-        name: http
-        protocol: HTTP
-      hosts:
-        - "*"    
----
 apiVersion: v1
 kind: Service
 metadata:
-  name: expose-server-service
-  namespace: istio-project-1
+  name: mirror-service
+  namespace: consul-project-1
   labels:
     app: "project-1"
 spec:
+  selector:
+    mirror: "true"
   ports:
     - name: http
-      port: 5000
-      protocol: TCP
-  selector:
-    expose: "true"
----
-apiVersion: networking.istio.io/v1alpha3
-kind: VirtualService
-metadata:
-  name: expose-server-vservice
-  namespace: istio-project-1
-  labels:
-    app: "project-1"
-spec:
-  hosts:
-    - "*"
-  gateways:
-    - expose-server-gateway
-  http:
-    - match: 
-      - uri:
-          prefix: /server-a
-      route:
-        - destination:
-            port: 
-              number: 5000
-            host: expose-server-service
-    - match:
-      - uri:
-          prefix: /server-d
-      route:
-        - destination:
-            port:
-              number: 7000
-            host: mirror-service
---- # TODO fix gateway zodat we ingress gateway kunnen gebruike ipv de fuken loadbalancer.
-apiVersion: networking.istio.io/v1alpha3
-kind: Gateway
-metadata:
-  name: server-check-gateway
-  namespace: istio-project-1
-  labels:
-    app: "project-1"
-spec:
-  selector:
-    expose: "true"
-  servers:
-    - port:
-        number: 6000
-        name: http
-        protocol: HTTP
-      hosts:
-        - "*"
----
-apiVersion: networking.istio.io/v1alpha3
-kind: VirtualService
-metadata:
-  name: server-check-service
-  namespace: istio-project-1
-  labels:
-    app: "project-1"
-spec:
-  hosts:
-    - "*"
-  gateways:
-    - expose-server-gateway
-  tcp:
-  - match:
-    - port: 6000
-    route:
-      - destination:
-          host: server-check
-          port:
-            number: 6000
-          subset: v1
-        weight: 50
-      - destination:
-          host: server-check
-          port:
-            number: 6000
-          subset: v2
-        weight: 50
-        mirror:
-          host: mirror-service
-          port:
-            number: 6000
-        mirror_percent: 100
\ No newline at end of file
+    protocol: TCP
+    port: 6000
\ No newline at end of file
diff --git a/serverD/app.py b/serverD/app.py
index 563198d..621588e 100644
--- a/serverD/app.py
+++ b/serverD/app.py
@@ -21,4 +21,4 @@ def get():
 
 
 if __name__ == '__main__':
-    app.run(debug=True, host="0.0.0.0", port=7000)
+    app.run(debug=True, host="0.0.0.0", port=6000)