wip

Author: Carlos Lapao

helm-charts/restapi-testapp/templates/configmap.yaml

@@ -0,0 +1,10 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ include "restapi-testapp.fullname" . }}
+  namespace: {{ .Values.namespace.name }}
+data:
+  API_PORT: {{ .Values.ports.http | quote }}
+  TLS_API_PORT: {{ .Values.ports.tls | quote }}
+  TLS: {{ .Values.ports.tlsEnabled | quote }}
+  API_PREFIX: {{ .Values.ingress.routePrefix |quote }}

helm-charts/restapi-testapp/templates/deployment.yaml

@@ -26,6 +26,6 @@ spec:
             limits: {cpu: "250m", memory: "50Mi"}
           env:
             - name: RESTAPI_API_PORT
-              value: {{ .Values.apiPort | quote }}
+              value: {{ .Values.ports.http | quote }}              
       dnsPolicy: ClusterFirstWithHostNet
       restartPolicy: Always

helm-charts/restapi-testapp/templates/virtualservice.yaml

@@ -1,5 +1,6 @@
 {{ $namespace := .Values.namespace.name }}
 {{ $fullname := include "restapi-testapp.fullname" .}}
+{{ $routePrefix := .Values.ingress.routePrefix }}
 {{ if and (eq .Values.ingress.ingressClass "istio") (.Values.ingress.enabled) }}
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
@@ -17,7 +18,7 @@ spec:
   - name: {{ .name }}
     match:
     - uri:
-        prefix: {{ .route }}
+        prefix: {{if not (hasPrefix "/" $routePrefix) }}/{{end}}{{ $routePrefix }}/{{ .route }}
     route:
     - destination:
         host: {{$fullname}}.{{$namespace}}.svc.cluster.local

helm-charts/restapi-testapp/values.yaml

@@ -1,10 +1,10 @@
-apiPort: 10000
 replicaCount: 1
 service:
-  port: 80
+  http: 80
+  tls: 443
 namespace:
-  name: demo
   create: true
+  name: demo
 serviceAccount:
   create: true
 autoscaling:
@@ -13,13 +13,20 @@ autoscaling:
   maxReplicas: 5
   targetCPUUtilizationPercentage: 30
   targetMemoryUtilizationPercentage: 75
+tlsEnabled: true
 ingress:
   enabled: true
-  ingressClass: istio
-  gateway: proxy
-  tls: true
+  ingressClass: 'istio'
+  gateway: 'proxy'
+  routePrefix: '/api'
   hosts: 
     - host: 'test.local-cluster.internal'
       paths:
-        - name: "hello"
-          route: "/hello"
+        - name: "hello-world"
+          route: "hello"
+        - name: "auth"
+          route: "auth"
+        - name: "login-route"
+          route: "login"
+        - name: "validate-route"
+          route: "validate"