update to helm charts for grpc config

Author: eiximenis

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 }}

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 }}

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

k8s/helm/catalog-api/envoycfg/_catalog.proto-descriptor.pb

@@ -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 }}

k8s/helm/catalog-api/envoycfg/_envoy.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 }}

k8s/helm/catalog-api/templates/deployment.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
 

k8s/helm/catalog-api/templates/envoy-cm.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 }}