Skip to content

Commit cbe1a9f

Browse files
eiximeniseiximenis
committed
some corrections on how some external urls are calculated
1 parent e6628f1 commit cbe1a9f

11 files changed

Lines changed: 31 additions & 26 deletions

File tree

‎k8s/helm/basket-api/templates/_names.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
{{- $ctx := last .}}
2828
{{- $suffix := include "suffix-name" $ctx -}}
2929
{{- if $ctx.Values.inf.k8s.dnsprefix -}}
30-
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name>
30+
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
3131
{{- else -}}
3232
{{- if $ctx.Values.inf.k8s.suffix -}}
33-
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix>
33+
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
3434
{{- else -}}
35-
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name>
35+
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end -}}

‎k8s/helm/catalog-api/templates/_names.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
{{- $ctx := last .}}
2828
{{- $suffix := include "suffix-name" $ctx -}}
2929
{{- if $ctx.Values.inf.k8s.dnsprefix -}}
30-
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name>
30+
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
3131
{{- else -}}
3232
{{- if $ctx.Values.inf.k8s.suffix -}}
33-
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix>
33+
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
3434
{{- else -}}
35-
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name>
35+
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end -}}

‎k8s/helm/catalog-api/templates/configmap.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{- $name := include "catalog-api.fullname" . -}}
22
{{- $sqlsrv := include "sql-name" . -}}
3+
{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
34

45
apiVersion: v1
56
kind: ConfigMap
@@ -12,7 +13,7 @@ metadata:
1213
heritage: {{ .Release.Service }}
1314
data:
1415
catalog__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.catalog.db }};User Id={{ .Values.inf.sql.catalog.user }};Password={{ .Values.inf.sql.catalog.pwd }};
15-
catalog__PicBaseUrl: http://{{ .Values.inf.k8s.dns }}/webshoppingapigw/api/v1/c/catalog/items/[0]/pic/
16+
catalog__PicBaseUrl: http://{{ $webshoppingapigw }}/api/v1/c/catalog/items/[0]/pic/
1617
catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}"
1718
all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
1819
all__InstrumentationKey: {{ .Values.inf.appinsights.key }}

‎k8s/helm/identity-api/templates/_names.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
{{- $ctx := last .}}
2828
{{- $suffix := include "suffix-name" $ctx -}}
2929
{{- if $ctx.Values.inf.k8s.dnsprefix -}}
30-
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name>
30+
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
3131
{{- else -}}
3232
{{- if $ctx.Values.inf.k8s.suffix -}}
33-
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix>
33+
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
3434
{{- else -}}
35-
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name>
35+
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end -}}

‎k8s/helm/locations-api/templates/_names.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
{{- $ctx := last .}}
2828
{{- $suffix := include "suffix-name" $ctx -}}
2929
{{- if $ctx.Values.inf.k8s.dnsprefix -}}
30-
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name>
30+
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
3131
{{- else -}}
3232
{{- if $ctx.Values.inf.k8s.suffix -}}
33-
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix>
33+
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
3434
{{- else -}}
35-
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name>
35+
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end -}}

‎k8s/helm/marketing-api/templates/_names.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
{{- $ctx := last .}}
2828
{{- $suffix := include "suffix-name" $ctx -}}
2929
{{- if $ctx.Values.inf.k8s.dnsprefix -}}
30-
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name>
30+
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
3131
{{- else -}}
3232
{{- if $ctx.Values.inf.k8s.suffix -}}
33-
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix>
33+
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
3434
{{- else -}}
35-
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name>
35+
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end -}}

‎k8s/helm/marketing-api/templates/configmap.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{- $name := include "marketing-api.fullname" . -}}
22
{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
3+
{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
34
{{- $mongo := include "mongo-name" . -}}
45

56
apiVersion: v1
@@ -19,4 +20,5 @@ data:
1920
internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }}
2021
urls__IdentityUrl: {{ $identity }}
2122
marketing__ConnectionString: mongodb://{{ $mongo }}
22-
marketing__Database: {{ .Values.inf.mongo.marketing.database }}
23+
marketing__Database: {{ .Values.inf.mongo.marketing.database }}
24+
marketing__PicBaseUrl: http://{{ $webshoppingapigw }}/api/v1/c/catalog/items/[0]/pic/

‎k8s/helm/marketing-api/values.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ env:
4646
key: marketing__ConnectionString
4747
- name: Database
4848
key: marketing__Database
49+
- name: PicBaseUrl
50+
key: marketing__PicBaseUrl
4951
# values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
5052
values:
5153
- name: ASPNETCORE_ENVIRONMENT

‎k8s/helm/ordering-api/templates/_names.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
{{- $ctx := last .}}
2828
{{- $suffix := include "suffix-name" $ctx -}}
2929
{{- if $ctx.Values.inf.k8s.dnsprefix -}}
30-
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name>
30+
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
3131
{{- else -}}
3232
{{- if $ctx.Values.inf.k8s.suffix -}}
33-
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix>
33+
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
3434
{{- else -}}
35-
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name>
35+
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end -}}

‎k8s/helm/ordering-backgroundtasks/templates/_names.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
{{- $ctx := last .}}
2828
{{- $suffix := include "suffix-name" $ctx -}}
2929
{{- if $ctx.Values.inf.k8s.dnsprefix -}}
30-
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} # Value is <prefix>.<dns>/<name>
30+
{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}} {{/* Value is <prefix>.<dns>/<name> */}}
3131
{{- else -}}
3232
{{- if $ctx.Values.inf.k8s.suffix -}}
33-
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} # Value is <dns>/<name>-<sufix>
33+
{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}} {{/*Value is <dns>/<name>-<sufix> */}}
3434
{{- else -}}
35-
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} # Value is just <dns>/<name>
35+
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
3636
{{- end -}}
3737
{{- end -}}
3838
{{- end -}}

0 commit comments

Comments
 (0)