Merge pull request #1567 from borjasanes/fix/missing-helm-config
Missing helm config
This commit is contained in:
commit
8633d2bde9
@ -21,6 +21,8 @@ inf:
|
|||||||
db: IdentityDb # Ordering API SQL db name
|
db: IdentityDb # Ordering API SQL db name
|
||||||
webhooks:
|
webhooks:
|
||||||
db: WebhooksDb # Webhooks DB
|
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
|
redis: # inf.redis defines the redis' connection strings
|
||||||
basket:
|
basket:
|
||||||
svc: basket-data # Name of k8s svc for basket redis
|
svc: basket-data # Name of k8s svc for basket redis
|
||||||
|
@ -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 -}}
|
@ -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 }}
|
||||||
|
@ -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
|
||||||
|
@ -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 -}}
|
@ -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 }}
|
||||||
|
@ -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:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user