ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missing identityurlexternal in helm config

Browse Source
This commit is contained in:
Borja García Rodríguez 2020-12-29 19:46:34 +01:00
parent c64bf79992
commit 466ec86abe
6 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deploy/k8s/helm/mobileshoppingagg/templates/_names.tpl
View File

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

3
deploy/k8s/helm/mobileshoppingagg/templates/configmap.yaml
View File

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

2
deploy/k8s/helm/mobileshoppingagg/values.yaml
View File

@ -57,6 +57,8 @@ env:
key: internalurls__grpcCatalog key: internalurls__grpcCatalog
- name: urls__grpcOrdering - name: urls__grpcOrdering
key: internalurls__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 define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
values: values:
- name: ASPNETCORE_ENVIRONMENT - name: ASPNETCORE_ENVIRONMENT

8
deploy/k8s/helm/webshoppingagg/templates/_names.tpl
View File

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

3
deploy/k8s/helm/webshoppingagg/templates/configmap.yaml
View File

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

2
deploy/k8s/helm/webshoppingagg/values.yaml
View File

@ -57,6 +57,8 @@ env:
key: internalurls__grpcCatalog key: internalurls__grpcCatalog
- name: urls__grpcOrdering - name: urls__grpcOrdering
key: internalurls__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 define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
values: values: