Locations api

updates on service names generation

k8s/helm/app.yaml

@@ -22,3 +22,20 @@ app:                                                  # app global settings
       payment: payment-api                            # ingress entry for payment api
       locations: locations-api                        # ingress entry for locations api
       marketing: marketing-api                        # ingress entry for marketing api
+  svc:
+      basket: basket                                  # service name for basket api
+      catalog: catalog                                # service name for catalog api
+      ordering: ordering                              # service name for ordering api
+      identity: identity                              # service name for identity api
+      mvc: webmvc                                     # service name for web mvc
+      spa: webspa                                     # service name for web spa
+      status: webstatus                               # service name for web status
+      webshoppingapigw: webshoppingapigw              # service name for web shopping Agw
+      webmarketingapigw: webmarketingapigw            # service name for web mkg Agw
+      mobilemarketingapigw: mobilemarketingapigw      # service name for mobile mkg Agw
+      mobileshoppingapigw: mobileshoppingapigw        # service name for mobile shopping Agw
+      webshoppingagg: webshoppingagg                  # service name for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg            # service name for mobile shopping aggregator
+      payment: payment                                # service name for payment api
+      locations: locations                            # service name for locations api
+      marketing: marketing                            # service name for marketing api

k8s/helm/identity-api/templates/service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "identity-api.fullname" . }}
+  name: {{ .Values.app.svc.identity }}
   labels:
     app: {{ template "identity-api.name" . }}
     chart: {{ template "identity-api.chart" . }}

k8s/helm/inf.yaml

@@ -16,6 +16,12 @@ inf:
       user: sa              # Ordering API SQL user
       pwd: Pass@word        # Ordering API SQL pwd
       db: IdentityDb        # Ordering API SQL db name
+  mongo:
+#    host: my-nosql-data     # Uncomment to use specify custom mongo host. By default nosql-data is used
+    locations:
+      database: LocationsDb
+    marketing:
+      database: MarketingDb
   redis:                    # inf.redis defines the redis' connection strings
     basket:                 
       constr: basket-data   # Connection string to Redis used by Basket API

k8s/helm/locations-api/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

k8s/helm/locations-api/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: locations-api
+version: 0.1.0

k8s/helm/locations-api/templates/NOTES.txt

@@ -0,0 +1,19 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "locations-api.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get svc -w {{ template "locations-api.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "locations-api.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "locations-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl port-forward $POD_NAME 8080:80
+{{- end }}

k8s/helm/locations-api/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "locations-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "locations-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "locations-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

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

@@ -0,0 +1,49 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- $suffix := include "suffix-name" $ctx -}}
+{{- if $ctx.Values.inf.k8s.dnsprefix -}}
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- else -}}
+{{- if $ctx.Values.inf.k8s.suffix -}}
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{ define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}

k8s/helm/locations-api/templates/configmap.yaml

@@ -0,0 +1,22 @@
+{{- $name := include "locations-api.fullname" . -}}
+{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $mongo := include "mongo-name" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "locations-api.name" . }}
+    chart: {{ template "locations-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: {{ .Values.inf.appinsights.key }}
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}"
+  internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }}
+  urls__IdentityUrl: {{ $identity }}
+  locations__ConnectionString: mongodb://{{ $mongo }}
+  locations__Database: {{ .Values.inf.mongo.locations.database }}

k8s/helm/locations-api/templates/deployment.yaml

@@ -0,0 +1,73 @@
+{{- $name := include "locations-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "locations-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "locations-api.name" . }}
+    chart: {{ template "locations-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "locations-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "locations-api.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      {{ if .Values.imagePullSecrets -}}
+      imagePullSecrets:
+      {{ range .Values.imagePullSecrets -}}
+        - name: {{ .name }}
+      {{- end -}}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+

k8s/helm/locations-api/templates/ingress.yaml

@@ -0,0 +1,34 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "locations-api.fullname" . -}}
+{{- $ingressPath := include "pathBase" . -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    app: {{ template "locations-api.name" . }}
+    chart: {{ template "locations-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+        - {{ .Values.inf.k8s.dns }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    - host: {{ .Values.inf.k8s.dns }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: http
+{{- end }}

k8s/helm/locations-api/templates/service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.locations }}
+  labels:
+    app: {{ template "locations-api.name" . }}
+    chart: {{ template "locations-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "locations-api.name" . }}
+    release: {{ .Release.Name }}

k8s/helm/locations-api/values.yaml

@@ -0,0 +1,55 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /locations-api
+
+image:
+  repository: eshop/locations.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: UseLoadTest
+      key: all_EnableLoadTest
+    - name: IdentityUrl
+      key: internalurls__IdentityUrl
+    - name: IdentityUrlExternal
+      key: urls__IdentityUrl
+    - name: ConnectionString
+      key: locations__ConnectionString
+    - name: Database
+      key: locations__Database
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+