Final charts tunning and allowing Linkerd Mesh to be used

Author: eiximenis

k8s/helm/apigwmm/configuration-mobile-marketing.json

@@ -0,0 +1,49 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - match:
+                  prefix: "/api/v1/m/"
+                route:
+                  prefix_rewrite: "/api/v1/"
+                  cluster: marketing
+          http_filters:
+          - name: envoy.router            
+  clusters:
+  - name: marketing
+    connect_timeout: 0.25s
+    type: logical_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: marketing-api
+        port_value: 80
+  - name: locations
+    connect_timeout: 0.25s
+    type: logical_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: locations-api
+        port_value: 80

k8s/helm/apigwmm/envoy.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "apigwmm.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-{{- $ocelotcfgname := printf "%s-%s" "ocelot" $name -}}
+{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
 apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
@@ -30,10 +30,10 @@ spec:
       volumes:
       - name: config
         configMap:
-          name: {{ $ocelotcfgname }}
+          name: {{ $envoycfgname }}
           items:
-          - key: configuration-mobile-marketing.json
-            path: configuration.json      
+          - key: envoy.yaml
+            path: envoy.yaml    
       containers:
         - name: {{ .Chart.Name }}
           {{ if .Values.probes -}}
@@ -58,10 +58,10 @@ spec:
           {{- end -}}
           {{- end }}          
           image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: IfNotPresent
           volumeMounts:
           - name: config
-            mountPath: {{ .Values.ocelot.configPath }}          
+            mountPath: {{ .Values.envoy.configPath }}          
           env:
             - name: PATH_BASE
               value: {{ include "pathBase" . }}

k8s/helm/apigwmm/templates/configmap.yaml

@@ -3,12 +3,12 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "ocelot-{{ $name }}"
+  name: "envoy-{{ $name }}"
   labels:
     app: {{ template "apigwmm.name" . }}
     chart: {{ template "apigwmm.chart" .}}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  {{ (.Files.Glob "configuration-mobile-marketing.json").AsConfig  | indent 2 }}
+  {{ (.Files.Glob "envoy.yaml").AsConfig  | indent 2 }}
 

k8s/helm/apigwmm/templates/deployment.yaml

@@ -3,9 +3,8 @@ clusterName: eshop-aks
 pathBase: /mobilemarketingapigw
 
 image:
-  repository: eshop/ocelotapigw
-  tag: latest
-  pullPolicy: IfNotPresent
+  repository: envoyproxy/envoy
+  tag: v1.11.1
 
 service:
   type: ClusterIP
@@ -25,42 +24,7 @@ tolerations: []
 
 affinity: {}
 
-# env defines the environment variables that will be declared in the pod
-env:
-  urls:
-  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
-  configmap:
-    - name: IdentityUrl
-      key: internalurls__identity
-    - name: CatalogUrlHC
-      key: internalurls__catalog__hc
-    - name: BasketUrlHC
-      key: internalurls__basket__hc
-    - name: IdentityUrlHC
-      key: internalurls__identity__hc
-    - name: OrderingUrlHC
-      key: internalurls__ordering__hc
-    - name: MarketingUrlHC
-      key: internalurls__marketing__hc
-    - name: PaymentUrlHC
-      key: internalurls__payment__hc
-    - name: LocationUrlHC
-      key: internalurls__location__hc
-      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
-  values:
-    - name: ASPNETCORE_ENVIRONMENT
-      value: Development
-probes:
-  liveness:
-    path: /liveness
-    initialDelaySeconds: 10
-    periodSeconds: 15
-    port: 80
-  readiness:
-    path: /hc
-    timeoutSeconds: 5
-    initialDelaySeconds: 90
-    periodSeconds: 60
-    port: 80
-ocelot:
-  configPath: /app/configuration
+env: {}
+
+envoy:
+  configPath: /etc/envoy