From 1f212a905a96c2fd95fe064d957a1629cf179d02 Mon Sep 17 00:00:00 2001 From: Chris Asis Date: Mon, 27 Mar 2023 23:36:39 -0400 Subject: [PATCH] added seq logging updated library manager package version updated local kubernetes dns --- deploy/k8s/helm/app.yaml | 2 ++ deploy/k8s/helm/deploy-all.ps1 | 2 +- deploy/k8s/helm/seq/Chart.yaml | 21 ++++++++++++++ deploy/k8s/helm/seq/templates/deployment.yaml | 28 +++++++++++++++++++ deploy/k8s/helm/seq/templates/ingress.yaml | 22 +++++++++++++++ deploy/k8s/helm/seq/templates/service.yaml | 14 ++++++++++ .../local-dockerk8s/identityapi-cm-fix.yaml | 2 +- .../local-dockerk8s/mvc-cm-fix.yaml | 4 +-- .../Identity/Identity.API/Identity.API.csproj | 2 +- src/Web/WebMVC/WebMVC.csproj | 2 +- src/Web/WebStatus/WebStatus.csproj | 2 +- 11 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 deploy/k8s/helm/seq/Chart.yaml create mode 100644 deploy/k8s/helm/seq/templates/deployment.yaml create mode 100644 deploy/k8s/helm/seq/templates/ingress.yaml create mode 100644 deploy/k8s/helm/seq/templates/service.yaml diff --git a/deploy/k8s/helm/app.yaml b/deploy/k8s/helm/app.yaml index acea31ef1..8eee7ca02 100644 --- a/deploy/k8s/helm/app.yaml +++ b/deploy/k8s/helm/app.yaml @@ -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 diff --git a/deploy/k8s/helm/deploy-all.ps1 b/deploy/k8s/helm/deploy-all.ps1 index 213e60fb7..38f5510fe 100644 --- a/deploy/k8s/helm/deploy-all.ps1 +++ b/deploy/k8s/helm/deploy-all.ps1 @@ -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) { diff --git a/deploy/k8s/helm/seq/Chart.yaml b/deploy/k8s/helm/seq/Chart.yaml new file mode 100644 index 000000000..2842a92ef --- /dev/null +++ b/deploy/k8s/helm/seq/Chart.yaml @@ -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 diff --git a/deploy/k8s/helm/seq/templates/deployment.yaml b/deploy/k8s/helm/seq/templates/deployment.yaml new file mode 100644 index 000000000..0d5e55928 --- /dev/null +++ b/deploy/k8s/helm/seq/templates/deployment.yaml @@ -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" diff --git a/deploy/k8s/helm/seq/templates/ingress.yaml b/deploy/k8s/helm/seq/templates/ingress.yaml new file mode 100644 index 000000000..17bef385d --- /dev/null +++ b/deploy/k8s/helm/seq/templates/ingress.yaml @@ -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 diff --git a/deploy/k8s/helm/seq/templates/service.yaml b/deploy/k8s/helm/seq/templates/service.yaml new file mode 100644 index 000000000..abe0b3a0d --- /dev/null +++ b/deploy/k8s/helm/seq/templates/service.yaml @@ -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 diff --git a/deploy/k8s/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml b/deploy/k8s/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml index 3a3fcf5a5..69bd04c25 100644 --- a/deploy/k8s/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml +++ b/deploy/k8s/nginx-ingress/local-dockerk8s/identityapi-cm-fix.yaml @@ -1,3 +1,3 @@ data: - mvc_e: http://10.0.75.1/webmvc + mvc_e: http://192.168.1.199/webmvc \ No newline at end of file diff --git a/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml b/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml index 1475deec1..3359ec00b 100644 --- a/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml +++ b/deploy/k8s/nginx-ingress/local-dockerk8s/mvc-cm-fix.yaml @@ -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 diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 0398ccb4b..7abce7a0f 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 08b08a103..db6ad97db 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -34,7 +34,7 @@ - + diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index 38de7ff9e..bd365da55 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -18,7 +18,7 @@ - +