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

added seq logging

Browse Source 
updated library manager package version
updated local kubernetes dns
This commit is contained in:
Chris Asis 2023-03-27 23:36:39 -04:00
parent 981507dccb
commit 1f212a905a
11 changed files with 94 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/k8s/helm/app.yaml
View File

@ -5,6 +5,7 @@ app: # app global settings
name: "my-eshop" # Override for custom app name
ingress: # ingress related settings
entries:
seq: seq # ingress entry for seq
basket: basket-api # ingress entry for basket api
catalog: catalog-api # ingress entry for catalog api
ordering: ordering-api # ingress entry for ordering api
@ -20,6 +21,7 @@ app: # app global settings
webhooks: webhooks-api # ingress entry for webhooks api
webhooksweb: webhooks-web # ingress entry for webhooks web demo client
svc:
seq: seq # service name for seq
basket: basket-api # service name for basket api
catalog: catalog-api # service name for catalog api
ordering: ordering-api # service name for ordering api

2
deploy/k8s/helm/deploy-all.ps1
View File

@ -119,7 +119,7 @@ if (-not [string]::IsNullOrEmpty($registry)) {
Write-Host "Begin eShopOnContainers installation using Helm" -ForegroundColor Green
$infras = ("sql-data", "nosql-data", "rabbitmq", "keystore-data", "basket-data")
$charts = ("eshop-common", "basket-api","catalog-api", "identity-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus", "webhooks-api", "webhooks-web")
$charts = ("seq", "eshop-common", "basket-api","catalog-api", "identity-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus", "webhooks-api", "webhooks-web")
$gateways = ("apigwms", "apigwws")
if ($deployInfrastructure) {

21
deploy/k8s/helm/seq/Chart.yaml Normal file
View File

@ -0,0 +1,21 @@
apiVersion: v1
name: seq
description: A Helm chart for Kubernetes
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 1.0.0

28
deploy/k8s/helm/seq/templates/deployment.yaml Normal file
View File

@ -0,0 +1,28 @@
kind: Deployment
apiVersion: apps/v1
metadata:
name: seq
labels:
app: eshop
service: seq
spec:
replicas: 1
selector:
matchLabels:
service: seq
template:
metadata:
labels:
app: eshop
service: seq
spec:
containers:
- name: seq
image: datalust/seq:latest
ports:
- name: http
containerPort: 80
protocol: TCP
env:
- name: ACCEPT_EULA
value: "Y"

22
deploy/k8s/helm/seq/templates/ingress.yaml Normal file
View File

@ -0,0 +1,22 @@
kind: Ingress
apiVersion: networking.k8s.io/v1
metadata:
name: seq
labels:
app: eshop
service: seq
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$2
spec:
rules:
- http:
paths:
- path: /seq(/|$)(.*)
pathType: Prefix
backend:
service:
name: seq
port:
number: 80

14
deploy/k8s/helm/seq/templates/service.yaml Normal file
View File

@ -0,0 +1,14 @@
kind: Service
apiVersion: v1
metadata:
name: seq
labels:
app: eshop
service: seq
spec:
ports:
- port: 80
protocol: TCP
name: http
selector:
service: seq

2
deploy/k8s/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml
View File

@ -1,3 +1,3 @@
data:
mvc_e: http://10.0.75.1/webmvc
mvc_e: http://192.168.1.199/webmvc

4
deploy/k8s/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml
View File

@ -1,3 +1,3 @@
data:
urls__IdentityUrl: http://10.0.75.1/identity
urls__mvc: http://10.0.75.1/webmvc
urls__IdentityUrl: http://192.168.49.2/identity
urls__mvc: http://192.168.49.2/webmvc

2
src/Services/Identity/Identity.API/Identity.API.csproj
View File

@ -40,7 +40,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.18" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageReference Include="Polly" Version="7.2.2" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.1-dev-00229" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.1-dev-00787" />

2
src/Web/WebMVC/WebMVC.csproj
View File

@ -34,7 +34,7 @@
<PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.1-dev-00216" />

2
src/Web/WebStatus/WebStatus.csproj
View File

@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="2.0.2-beta2" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.1-dev-00216" />