From f441fcf018837a7063ce48dd1c332ea5c0a5dbef Mon Sep 17 00:00:00 2001
From: eiximenis <etomas@gmail.com>
Date: Tue, 10 Sep 2019 16:14:04 +0200
Subject: [PATCH] update to helm charts for grpc config

---
 k8s/helm/basket-api/templates/deployment.yaml |   3 +
 k8s/helm/basket-api/templates/service.yaml    |   4 ++
 k8s/helm/basket-api/values.yaml               |   5 ++
 .../envoycfg/_catalog.proto-descriptor.pb     | Bin 9348 -> 0 bytes
 k8s/helm/catalog-api/envoycfg/_envoy.yaml     |  56 ------------------
 .../catalog-api/templates/deployment.yaml     |   4 +-
 k8s/helm/catalog-api/templates/envoy-cm.yaml  |  16 -----
 k8s/helm/catalog-api/templates/service.yaml   |   4 --
 k8s/helm/catalog-api/values.yaml              |  14 ++---
 .../ordering-api/templates/deployment.yaml    |   3 +
 k8s/helm/ordering-api/templates/service.yaml  |   4 ++
 k8s/helm/ordering-api/values.yaml             |   5 ++
 12 files changed, 32 insertions(+), 86 deletions(-)
 delete mode 100644 k8s/helm/catalog-api/envoycfg/_catalog.proto-descriptor.pb
 delete mode 100644 k8s/helm/catalog-api/envoycfg/_envoy.yaml
 delete mode 100644 k8s/helm/catalog-api/templates/envoy-cm.yaml

diff --git a/k8s/helm/basket-api/templates/deployment.yaml b/k8s/helm/basket-api/templates/deployment.yaml
index d96c0cacf..554787ab1 100644
--- a/k8s/helm/basket-api/templates/deployment.yaml
+++ b/k8s/helm/basket-api/templates/deployment.yaml
@@ -75,6 +75,9 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+            - name: grpc
+              containerPort: 81
+              protocol: TCP                
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
diff --git a/k8s/helm/basket-api/templates/service.yaml b/k8s/helm/basket-api/templates/service.yaml
index 20224c3b5..1783c59aa 100644
--- a/k8s/helm/basket-api/templates/service.yaml
+++ b/k8s/helm/basket-api/templates/service.yaml
@@ -14,6 +14,10 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+    - port: {{ .Values.service.grpcPort }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
   selector:
     app: {{ template "basket-api.name" . }}
     release: {{ .Release.Name }}
diff --git a/k8s/helm/basket-api/values.yaml b/k8s/helm/basket-api/values.yaml
index a773700fe..121de02de 100644
--- a/k8s/helm/basket-api/values.yaml
+++ b/k8s/helm/basket-api/values.yaml
@@ -10,6 +10,7 @@ image:
 service:
   type: ClusterIP
   port: 80
+  grpcPort: 81  
 
 resources: {}
 
@@ -41,6 +42,10 @@ env:
   values:
     - name: OrchestratorType
       value: 'K8S'
+    - name: PORT
+      value: "80"
+    - name: GRPC_PORT
+      value: "81"      
 probes:
   liveness:
     path: /liveness
diff --git a/k8s/helm/catalog-api/envoycfg/_catalog.proto-descriptor.pb b/k8s/helm/catalog-api/envoycfg/_catalog.proto-descriptor.pb
deleted file mode 100644
index 7c94ce9f05ec461731aea1a9659446fde3810e23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9348
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
G`SBmHwv<Ky

diff --git a/k8s/helm/catalog-api/envoycfg/_envoy.yaml b/k8s/helm/catalog-api/envoycfg/_envoy.yaml
deleted file mode 100644
index 461d9c4a9..000000000
--- a/k8s/helm/catalog-api/envoycfg/_envoy.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-admin:
-  access_log_path: /tmp/admin_access.log
-  address:
-    socket_address: { address: 0.0.0.0, port_value: 9901 }
-
-static_resources:
-  listeners:
-  - name: listener1
-    address:
-      socket_address: { address: 0.0.0.0, port_value: 51051 }
-    filter_chains:
-    - filters:
-      - name: envoy.http_connection_manager
-        typed_config:
-          "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
-          stat_prefix: grpc_json
-          codec_type: AUTO
-          route_config:
-            name: local_route
-            virtual_hosts:
-            - name: local_service
-              domains: ["*"]
-              routes:
-              - match: { prefix: "/" }
-                route: { cluster: grpc, timeout: { seconds: 60 } }
-          http_filters:
-          - name: envoy.grpc_json_transcoder
-            config:
-              proto_descriptor: "/etc/envoy/catalog.proto-descriptor.pb"
-              services: ["CatalogApi.Catalog"]
-              print_options:
-                add_whitespace: true
-                always_print_primitive_fields: true
-                always_print_enums_as_ints: false
-                preserve_proto_field_names: false
-          - name: envoy.router
-
-  clusters:
-  - name: grpc
-    connect_timeout: 1.25s
-    type: logical_dns
-    lb_policy: round_robin
-    dns_lookup_family: V4_ONLY
-    http2_protocol_options: {}
-    load_assignment:
-      cluster_name: grpc
-      endpoints:
-      - lb_endpoints:
-        - endpoint:
-            address:
-              socket_address:
-                # WARNING: "docker.for.mac.localhost" has been deprecated from Docker v18.03.0.
-                # If you're running an older version of Docker, please use "docker.for.mac.localhost" instead.
-                # Reference: https://docs.docker.com/docker-for-mac/release-notes/#docker-community-edition-18030-ce-mac59-2018-03-26
-                address: localhost
-                port_value: 5001
\ No newline at end of file
diff --git a/k8s/helm/catalog-api/templates/deployment.yaml b/k8s/helm/catalog-api/templates/deployment.yaml
index 089c62a99..f9a696a90 100644
--- a/k8s/helm/catalog-api/templates/deployment.yaml
+++ b/k8s/helm/catalog-api/templates/deployment.yaml
@@ -73,10 +73,10 @@ spec:
           {{- end }}
           ports:
             - name: http
-              containerPort: 5000
+              containerPort: 80
               protocol: TCP
             - name: grpc
-              containerPort: 5001
+              containerPort: 81
               protocol: TCP              
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/k8s/helm/catalog-api/templates/envoy-cm.yaml b/k8s/helm/catalog-api/templates/envoy-cm.yaml
deleted file mode 100644
index 1fa6c3a57..000000000
--- a/k8s/helm/catalog-api/templates/envoy-cm.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $name := include "catalog-api.fullname" . -}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: "envoy-{{ $name }}"
-  labels:
-    app: {{ template "catalog-api.name" . }}
-    chart: {{ template "catalog-api.chart" .}}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ (.Files.Glob "envoycfg/*.yaml").AsConfig | indent 2 }}  
-binaryData:
-  _catalog.proto-descriptor.pb: |-
-    {{ .Files.Get "envoycfg/_catalog.proto-descriptor.pb" | b64enc -}} 
diff --git a/k8s/helm/catalog-api/templates/service.yaml b/k8s/helm/catalog-api/templates/service.yaml
index e73c0762e..371520ae6 100644
--- a/k8s/helm/catalog-api/templates/service.yaml
+++ b/k8s/helm/catalog-api/templates/service.yaml
@@ -18,10 +18,6 @@ spec:
       targetPort: grpc
       protocol: TCP
       name: grpc     
-    - port: {{ .Values.service.envoy }}
-      targetPort: envoy
-      protocol: TCP
-      name: envoy      
   selector:
     app: {{ template "catalog-api.name" . }}
     release: {{ .Release.Name }}
diff --git a/k8s/helm/catalog-api/values.yaml b/k8s/helm/catalog-api/values.yaml
index 01597697e..3c977c156 100644
--- a/k8s/helm/catalog-api/values.yaml
+++ b/k8s/helm/catalog-api/values.yaml
@@ -9,10 +9,8 @@ image:
 
 service:
   type: ClusterIP
-  port: 5000
-  grpc: 5001
-  envoy: 80
-
+  port: 80
+  grpcPort: 81
 
 resources: {}
 
@@ -47,19 +45,19 @@ env:
     - name: OrchestratorType
       value: 'K8S'
     - name: PORT
-      value: "5000"
+      value: "80"
     - name: GRPC_PORT
-      value: "5001"
+      value: "81"
 probes:
   liveness:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
-    port: 5000
+    port: 80
   readiness:
     path: /hc
     timeoutSeconds: 5
     initialDelaySeconds: 90
     periodSeconds: 60
-    port: 5000
+    port: 800
 
diff --git a/k8s/helm/ordering-api/templates/deployment.yaml b/k8s/helm/ordering-api/templates/deployment.yaml
index a99ccdc28..a5545ddd8 100644
--- a/k8s/helm/ordering-api/templates/deployment.yaml
+++ b/k8s/helm/ordering-api/templates/deployment.yaml
@@ -75,6 +75,9 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+            - name: grpc
+              containerPort: 81
+              protocol: TCP              
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
diff --git a/k8s/helm/ordering-api/templates/service.yaml b/k8s/helm/ordering-api/templates/service.yaml
index bedfd6f01..ce2bcd447 100644
--- a/k8s/helm/ordering-api/templates/service.yaml
+++ b/k8s/helm/ordering-api/templates/service.yaml
@@ -14,6 +14,10 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+    - port: {{ .Values.service.grpcPort }}}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
   selector:
     app: {{ template "ordering-api.name" . }}
     release: {{ .Release.Name }}
diff --git a/k8s/helm/ordering-api/values.yaml b/k8s/helm/ordering-api/values.yaml
index c717d2793..7eff1a48b 100644
--- a/k8s/helm/ordering-api/values.yaml
+++ b/k8s/helm/ordering-api/values.yaml
@@ -10,6 +10,7 @@ image:
 service:
   type: ClusterIP
   port: 80
+  grpcPort: 81
 
 ingress:
   enabled: false
@@ -50,6 +51,10 @@ env:
       value: Development
     - name: OrchestratorType
       value: 'K8S'
+    - name: PORT
+      value: "80"
+    - name: GRPC_PORT
+      value: "81"      
 probes:
   liveness:
     path: /liveness