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

some corrections on how some external urls are calculated

Browse Source
This commit is contained in:
eiximenis 2018-06-21 13:11:54 +02:00
parent e6628f1a44
commit cbe1a9f105
11 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
k8s/helm/basket-api/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

6
k8s/helm/catalog-api/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

3
k8s/helm/catalog-api/templates/configmap.yaml
View File

@ -1,5 +1,6 @@
{{- $name := include "catalog-api.fullname" . -}} {{- $name := include "catalog-api.fullname" . -}}
{{- $sqlsrv := include "sql-name" . -}} {{- $sqlsrv := include "sql-name" . -}}
{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
@ -12,7 +13,7 @@ metadata:
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
data: data:
catalog__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.catalog.db }};User Id={{ .Values.inf.sql.catalog.user }};Password={{ .Values.inf.sql.catalog.pwd }}; catalog__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.catalog.db }};User Id={{ .Values.inf.sql.catalog.user }};Password={{ .Values.inf.sql.catalog.pwd }};
catalog__PicBaseUrl: http://{{ .Values.inf.k8s.dns }}/webshoppingapigw/api/v1/c/catalog/items/[0]/pic/ catalog__PicBaseUrl: http://{{ $webshoppingapigw }}/api/v1/c/catalog/items/[0]/pic/
catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}" catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}"
all__EventBusConnection: {{ .Values.inf.eventbus.constr }} all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
all__InstrumentationKey: {{ .Values.inf.appinsights.key }} all__InstrumentationKey: {{ .Values.inf.appinsights.key }}

6
k8s/helm/identity-api/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

6
k8s/helm/locations-api/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

6
k8s/helm/marketing-api/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

4
k8s/helm/marketing-api/templates/configmap.yaml
View File

@ -1,5 +1,6 @@
{{- $name := include "marketing-api.fullname" . -}} {{- $name := include "marketing-api.fullname" . -}}
{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}} {{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
{{- $mongo := include "mongo-name" . -}} {{- $mongo := include "mongo-name" . -}}
apiVersion: v1 apiVersion: v1
@ -19,4 +20,5 @@ data:
internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }} internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }}
urls__IdentityUrl: {{ $identity }} urls__IdentityUrl: {{ $identity }}
marketing__ConnectionString: mongodb://{{ $mongo }} marketing__ConnectionString: mongodb://{{ $mongo }}
marketing__Database: {{ .Values.inf.mongo.marketing.database }} marketing__Database: {{ .Values.inf.mongo.marketing.database }}
marketing__PicBaseUrl: http://{{ $webshoppingapigw }}/api/v1/c/catalog/items/[0]/pic/

2
k8s/helm/marketing-api/values.yaml
View File

@ -46,6 +46,8 @@ env:
key: marketing__ConnectionString key: marketing__ConnectionString
- name: Database - name: Database
key: marketing__Database key: marketing__Database
- name: PicBaseUrl
key: marketing__PicBaseUrl
# 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

6
k8s/helm/ordering-api/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

6
k8s/helm/ordering-backgroundtasks/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

6
k8s/helm/ordering-signalrhub/templates/_names.tpl
View File

@ -27,12 +27,12 @@
{{- $ctx := last .}} {{- $ctx := last .}}
{{- $suffix := include "suffix-name" $ctx -}} {{- $suffix := include "suffix-name" $ctx -}}
{{- if $ctx.Values.inf.k8s.dnsprefix -}} {{- if $ctx.Values.inf.k8s.dnsprefix -}}
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name> {{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
{{- else -}} {{- else -}}
{{- if $ctx.Values.inf.k8s.suffix -}} {{- if $ctx.Values.inf.k8s.suffix -}}
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix> {{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
{{- else -}} {{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name> {{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}