Skip to content

Commit 68d753d

Browse files
eiximeniseiximenis
committed
Updated service names generation
1 parent 9c95402 commit 68d753d

12 files changed

Lines changed: 71 additions & 21 deletions

File tree

‎k8s/helm/app.yaml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,21 @@ app: # app global settings
2323
locations: locations-api # ingress entry for locations api
2424
marketing: marketing-api # ingress entry for marketing api
2525
svc:
26-
basket: basket # service name for basket api
27-
catalog: catalog # service name for catalog api
28-
ordering: ordering # service name for ordering api
29-
identity: identity # service name for identity api
30-
mvc: webmvc # service name for web mvc
31-
spa: webspa # service name for web spa
32-
status: webstatus # service name for web status
33-
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
34-
webmarketingapigw: webmarketingapigw # service name for web mkg Agw
35-
mobilemarketingapigw: mobilemarketingapigw # service name for mobile mkg Agw
36-
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
37-
webshoppingagg: webshoppingagg # service name for web shopping aggregator
38-
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
39-
payment: payment # service name for payment api
40-
locations: locations # service name for locations api
41-
marketing: marketing # service name for marketing api
26+
basket: basket # service name for basket api
27+
catalog: catalog # service name for catalog api
28+
ordering: ordering # service name for ordering api
29+
orderingbackgroundtasks: orderingbackgroundtasks # service name for orderingbackgroundtasks
30+
orderingsignalrhub: orderingsignalrhub # service name for orderingsignalrhub
31+
identity: identity # service name for identity api
32+
mvc: webmvc # service name for web mvc
33+
spa: webspa # service name for web spa
34+
status: webstatus # service name for web status
35+
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
36+
webmarketingapigw: webmarketingapigw # service name for web mkg Agw
37+
mobilemarketingapigw: mobilemarketingapigw # service name for mobile mkg Agw
38+
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
39+
webshoppingagg: webshoppingagg # service name for web shopping aggregator
40+
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
41+
payment: payment # service name for payment api
42+
locations: locations # service name for locations api
43+
marketing: marketing # service name for marketing api

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
{{- end -}}
1515
{{- end -}}
1616

17+
{{- define "mongo-name" -}}
18+
{{- if .Values.inf.mongo.host -}}
19+
{{- .Values.inf.mongo.host -}}
20+
{{- else -}}
21+
{{- printf "%s" "nosql-data" -}}
22+
{{- end -}}
23+
{{- end -}}
24+
1725
{{- define "url-of" -}}
1826
{{- $name := first .}}
1927
{{- $ctx := last .}}

‎k8s/helm/basket-api/templates/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: {{ template "basket-api.fullname" . }}
4+
name: {{ .Values.app.svc.basket }}
55
labels:
66
app: {{ template "basket-api.name" . }}
77
chart: {{ template "basket-api.chart" . }}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
{{- end -}}
1515
{{- end -}}
1616

17+
{{- define "mongo-name" -}}
18+
{{- if .Values.inf.mongo.host -}}
19+
{{- .Values.inf.mongo.host -}}
20+
{{- else -}}
21+
{{- printf "%s" "nosql-data" -}}
22+
{{- end -}}
23+
{{- end -}}
24+
1725
{{- define "url-of" -}}
1826
{{- $name := first .}}
1927
{{- $ctx := last .}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: {{ template "catalog-api.fullname" . }}
4+
name: {{ .Values.app.svc.catalog }}
55
labels:
66
app: {{ template "catalog-api.name" . }}
77
chart: {{ template "catalog-api.chart" . }}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
{{- end -}}
1515
{{- end -}}
1616

17+
{{- define "mongo-name" -}}
18+
{{- if .Values.inf.mongo.host -}}
19+
{{- .Values.inf.mongo.host -}}
20+
{{- else -}}
21+
{{- printf "%s" "nosql-data" -}}
22+
{{- end -}}
23+
{{- end -}}
24+
1725
{{- define "url-of" -}}
1826
{{- $name := first .}}
1927
{{- $ctx := last .}}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
{{- end -}}
1515
{{- end -}}
1616

17+
{{- define "mongo-name" -}}
18+
{{- if .Values.inf.mongo.host -}}
19+
{{- .Values.inf.mongo.host -}}
20+
{{- else -}}
21+
{{- printf "%s" "nosql-data" -}}
22+
{{- end -}}
23+
{{- end -}}
24+
1725
{{- define "url-of" -}}
1826
{{- $name := first .}}
1927
{{- $ctx := last .}}

‎k8s/helm/ordering-api/templates/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: {{ template "ordering-api.fullname" . }}
4+
name: {{ .Values.app.svc.ordering }}
55
labels:
66
app: {{ template "ordering-api.name" . }}
77
chart: {{ template "ordering-api.chart" . }}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
{{- end -}}
1515
{{- end -}}
1616

17+
{{- define "mongo-name" -}}
18+
{{- if .Values.inf.mongo.host -}}
19+
{{- .Values.inf.mongo.host -}}
20+
{{- else -}}
21+
{{- printf "%s" "nosql-data" -}}
22+
{{- end -}}
23+
{{- end -}}
24+
1725
{{- define "url-of" -}}
1826
{{- $name := first .}}
1927
{{- $ctx := last .}}

‎k8s/helm/ordering-backgroundtasks/templates/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: {{ template "ordering-backgroundtasks.fullname" . }}
4+
name: {{ .Values.app.svc.orderingbackgroundtasks }}
55
labels:
66
app: {{ template "ordering-backgroundtasks.name" . }}
77
chart: {{ template "ordering-backgroundtasks.chart" . }}

0 commit comments

Comments
 (0)