Merge pull request #1567 from borjasanes/fix/missing-helm-config

Missing helm config

deploy/k8s/helm/inf.yaml

@@ -21,6 +21,8 @@ inf:
       db: IdentityDb        # Ordering API SQL db name
     webhooks:
       db: WebhooksDb        # Webhooks DB
+  mongo:
+    host: #my-nosql-data    # Uncomment to use specify custom mongo host. By default nosql-data is used
   redis:                    # inf.redis defines the redis' connection strings
     basket:     
       svc: basket-data      # Name of k8s svc for basket redis     

deploy/k8s/helm/mobileshoppingagg/templates/_names.tpl

@@ -49,4 +49,12 @@
 {{- else -}}
 {{- .Values.image.repository -}}
 {{- end -}}
+{{- end -}}
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
 {{- end -}}

deploy/k8s/helm/mobileshoppingagg/templates/configmap.yaml

@@ -1,4 +1,6 @@
 {{- $name := include "mobileshoppingagg.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $protocol := include "protocol" . -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -24,3 +26,4 @@ data:
   internalurls__grpcBasket: "http://{{ .Values.app.svc.basket }}:{{ .Values.service.grpcPort }}"
   internalurls__grpcCatalog: "http://{{ .Values.app.svc.catalog }}:{{ .Values.service.grpcPort }}"
   internalurls__grpcOrdering: "http://{{ .Values.app.svc.ordering }}:{{ .Values.service.grpcPort }}"
+  urls__IdentityUrlExternal: {{ $protocol }}://{{ $identity }}

deploy/k8s/helm/mobileshoppingagg/values.yaml

@@ -57,6 +57,8 @@ env:
       key: internalurls__grpcCatalog
     - name: urls__grpcOrdering
       key: internalurls__grpcOrdering      
+    - name: IdentityUrlExternal
+      key: urls__IdentityUrlExternal
       # 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

deploy/k8s/helm/webshoppingagg/templates/_names.tpl

@@ -49,4 +49,12 @@
 {{- else -}}
 {{- .Values.image.repository -}}
 {{- end -}}
+{{- end -}}
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
 {{- end -}}

deploy/k8s/helm/webshoppingagg/templates/configmap.yaml

@@ -1,4 +1,6 @@
 {{- $name := include "webshoppingagg.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $protocol := include "protocol" . -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -24,3 +26,4 @@ data:
   internalurls__grpcBasket: "http://{{ .Values.app.svc.basket }}:{{ .Values.service.grpcPort }}"
   internalurls__grpcCatalog: "http://{{ .Values.app.svc.catalog }}:{{ .Values.service.grpcPort }}"
   internalurls__grpcOrdering: "http://{{ .Values.app.svc.ordering }}:{{ .Values.service.grpcPort }}"
+  urls__IdentityUrlExternal: {{ $protocol }}://{{ $identity }}

deploy/k8s/helm/webshoppingagg/values.yaml

@@ -57,6 +57,8 @@ env:
       key: internalurls__grpcCatalog
     - name: urls__grpcOrdering
       key: internalurls__grpcOrdering
+    - name: IdentityUrlExternal
+      key: urls__IdentityUrlExternal
 
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values: