Merge pull request #76 from sitewhere/jev/IstioVirtualService

Add Istio Gateway and Virtual Services. #75
sitewhere · Jul 3, 2019 · c3fbbbf · c3fbbbf
2 parents fc901c3 + 69b6925
commit c3fbbbf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -26,8 +26,6 @@ This chart will do the following:
   | Inbound Processing       | ✓              | ✓               |
   | Instance Management      | ✓              | ✓               |
   | Outbound Connectors      | ✓              | ✓               |
-  | Tenant Management        | ✓              | ✓               |
-  | User Management          | ✓              | ✓               |
   | Web Rest                 | ✓              | ✓               |
   | Batch Operations         | ✓              | ✗               |
   | Command Delivery         | ✓              | ✗               |
@@ -86,8 +84,6 @@ the port that each microservice will expose, so that you can connect a remote de
 | Microservice             | JDWP Port        | JMX Port          |
 | :----------------------- | :--------------- | :---------------- |
 | Instance Managemwnt      | `8001`           | `1101`            |
-| User Management          | `8002`           | `1102`            |
-| Tenant Management        | `8003`           | `1103`            |
 | Device Management        | `8004`           | `1104`            |
 | Event Management         | `8005`           | `1105`            |
 | Asset Management         | `8006`           | `1106`            |

diff --git a/charts/sitewhere/templates/Web-Rest.yaml b/charts/sitewhere/templates/Web-Rest.yaml
@@ -106,4 +106,38 @@ spec:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-web-rest
     app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: Gateway
+metadata:
+  name: {{ include "sitewhere.fullname" . }}-gateway
+spec:
+  selector:
+    istio: ingressgateway # use Istio default gateway implementation
+  servers:
+  - port:
+      number: 80
+      name: http-web-rest
+      protocol: HTTP
+    hosts:
+    - "*"
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  name: {{ include "sitewhere.name" . }}-web-rest
+spec:
+  hosts:
+  - "*"
+  gateways:
+  - {{ include "sitewhere.fullname" . }}-gateway
+  http:
+  - match:
+    - uri:
+        prefix: /
+    route:
+    - destination:
+        port:
+          number: {{ .Values.services.web_rest.service.http.port }}
+        host: {{ include "sitewhere.fullname" . }}-web-rest-http
 {{- end }}
diff --git a/charts/sitewhere/values.yaml b/charts/sitewhere/values.yaml
@@ -219,7 +219,7 @@ services:
         management:
           port: 9001
       http:
-        type: LoadBalancer
+        type: ClusterIP
         port: 8080
     resources:
       limits: