merge

Author: GioemaNocco

Makefile

@@ -1,7 +1,7 @@
 build:
 	dotnet build
 start:
-	dotnet run --project ./src/Genocs.TelegramIntegration.WebApi
+	dotnet run --project ./src/apps/Genocs.TelegramIntegration.WebApi
 nuget:
 	nuget pack -NoDefaultExcludes -OutputDirectory nupkgs
 publish:
@@ -23,4 +23,12 @@ fds: # force rededeploy aws ecs service
 gw: # git docker workflow to push docker image to the repository based on the main branch
 	@echo triggering github workflow to push docker image to container
 	@echo ensure that you have the gh-cli installed and authenticated.
-	gh workflow run dockerhub-publish -f push_to_docker=true
+	gh workflow run dockerhub-publish -f push_to_docker=true
+
+d-build: # docker build images
+	@echo building docker images
+	@echo you should have docker installed and running
+	bash ./src/apps/scripts/build-images.sh
+d-push: # docker tag and push images
+	@echo tag images as latest and publish
+	bash ./src/apps/scripts/push-images.sh

README.md

@@ -289,8 +289,8 @@ Use [**api-workbench**](./api-workbench.rest) inside Visual Studio code with [RE
       "password": "test",
       "rawData": ""
     },
-    "issuer": "genocs-identity-service",
-    "validIssuer": "genocs-identity-service",
+    "issuer": "genocs-identities-service",
+    "validIssuer": "genocs-identities-service",
     "validateAudience": false,
     "validateIssuer": true,
     "validateLifetime": true,
@@ -521,35 +521,60 @@ docker builder prune
 Following commands are useful to build and push the images one by one
 
 ``` bash
-cd src/apps
+# Build images
+./src/apps/scripts/build-images.sh
 
-# Build the api gateway
-docker build -t genocs/apigateway:1.0.0 -t genocs/apigateway:latest -f ./apigateway.dockerfile .
+# Push images
+./src/apps/scripts/push-images.sh
+```
+
+### How to deploy the application on Kubernetes
 
-# Build the identity service
-docker build -t genocs/identities:1.0.0 -t genocs/identities:latest -f ./identity.dockerfile .
+You can deploy the application on Kubernetes cluster.
 
-# Build the order service
-docker build -t genocs/orders:1.0.0 -t genocs/orders:latest -f ./containers/order.dockerfile .
+``` bash
+# Build images
+./src/apps/scripts/deploy-k8s.sh
+```
 
-# Build the product service
-docker build -t genocs/products:1.0.0 -t genocs/products:latest -f ./product.dockerfile .
+### How to use makefile
 
-# Build the signalr service
-docker build -t genocs/signalr:1.0.0 -t genocs/signalr:latest -f ./signalr.dockerfile .
+Prerequisites:
+- make
 
+To install make on MacOS you can use brew
 
-# Push on Dockerhub
-docker push genocs/apigateway:1.0.0
-docker push genocs/apigateway:latest
-docker push genocs/identities:1.0.0
-docker push genocs/identities:latest
-docker push genocs/orders:1.0.0
-docker push genocs/orders:latest
-docker push genocs/products:1.0.0
-docker push genocs/products:latest
-docker push genocs/signalr:1.0.0
-docker push genocs/signalr:latest
+``` bash
+brew install make
+```
+
+To install make on Ubuntu you can use apt
+
+``` bash
+sudo apt install make
+```
+
+To install make on Windows you can use [choco](https://chocolatey.org/)
+
+``` bash
+choco install make
+```
+
+Upon installation you can use the makefile to build, run, deploy the application.
+
+``` bash
+# Build the solution
+make build
+```
+
+
+### How to use Helm chart
+
+Inside the folder **./src/apps/k8s/helm** you can find the Helm chart to deploy the application on Kubernetes.
+
+``` bash
+cd ./src/apps/k8s/helm
+microk8s helm install genocs ./gnxchart
 ```
 
 

containers/prometheus/prometheus.yml

@@ -7,13 +7,13 @@ scrape_configs:
     static_configs:
       - targets: ["prometheus:9090"]
 
-  - job_name: "api-gateway"
+  - job_name: "apigateway"
     static_configs:
-      - targets: ["api-gateway"]
+      - targets: ["apigateway"]
 
-  - job_name: "identity-service"
+  - job_name: "identities-service"
     static_configs:
-      - targets: ["identity-service"]
+      - targets: ["identities-service"]
 
   - job_name: "products-service"
     static_configs:
@@ -23,6 +23,6 @@ scrape_configs:
     static_configs:
       - targets: ["orders-service"]
 
-  - job_name: "signalr-service"
+  - job_name: "notifications-service"
     static_configs:
-      - targets: ["signalr-service"]
+      - targets: ["notifications-service"]

genocs.sln

@@ -120,7 +120,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application"
 		src\apps\apigateway.dockerfile = src\apps\apigateway.dockerfile
 		src\apps\docker-compose.override.yml = src\apps\docker-compose.override.yml
 		src\apps\docker-compose.yml = src\apps\docker-compose.yml
-		src\apps\identity.dockerfile = src\apps\identity.dockerfile
+		src\apps\identities.dockerfile = src\apps\identities.dockerfile
 		src\apps\local.env = src\apps\local.env
 		src\apps\notifications.dockerfile = src\apps\notifications.dockerfile
 		src\apps\orders.dockerfile = src\apps\orders.dockerfile

src/Genocs.Auth/README_NUGET.md

@@ -26,8 +26,8 @@ Following are the project settings needed to enable monitoring
       "password": "test",
       "rawData": ""
     },
-    "issuer": "genocs-identity-service",
-    "validIssuer": "genocs-identity-service",
+    "issuer": "genocs-identities-service",
+    "validIssuer": "genocs-identities-service",
     "validateAudience": false,
     "validateIssuer": true,
     "validateLifetime": true,

src/Genocs.Core.Demo.HelloWorld/appsettings.json

@@ -75,10 +75,10 @@
   "simmetric_jwt": {
     "enabled": true,
     "requireHttpsMetadata": false,
-    "issuer": "genocs-identity-service",
+    "issuer": "genocs-identities-service",
     "issuerSigningKey": "THIS IS USED TO SIGN AND VERIFY JWT TOKENS, REPLACE IT WITH YOUR OWN SECRET, IT CAN BE ANY STRING",
     "validateIssuer": true,
-    "validIssuer": "genocs-identity-service",
+    "validIssuer": "genocs-identities-service",
     "validateAudience": false,
     "validateLifetime": false,
     "requireExpirationTime": false,

src/Genocs.Core.Demo.Worker/appsettings.json

@@ -128,8 +128,8 @@
       "password": "test",
       "rawData": ""
     },
-    "issuer": "genocs-identity-service",
-    "validIssuer": "genocs-identity-service",
+    "issuer": "genocs-identities-service",
+    "validIssuer": "genocs-identities-service",
     "validateAudience": false,
     "validateIssuer": true,
     "validateLifetime": true,

src/apps/apigateway/APIGateway.WebApi/APIGateway.WebApi.csproj

@@ -6,6 +6,7 @@
         <RootNamespace>Genocs.APIGateway.WebApi</RootNamespace>
         <AssemblyName>Genocs.APIGateway.WebApi</AssemblyName>
         <IsPackable>false</IsPackable>
+        <UserSecretsId>Genocs</UserSecretsId>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">

src/apps/apigateway/APIGateway.WebApi/appsettings.Containers.json

@@ -2,15 +2,15 @@
   "consul": {
     "enabled": false,
     "url": "consul",
-    "service": "api-gateway",
+    "service": "apigateway",
     "address": "apigateway",
     "port": "80",
     "pingEnabled": true
   },
   "fabio": {
     "enabled": true,
     "url": "http://fabio:9999",
-    "service": "api-gateway",
+    "service": "apigateway",
     "requestRetries": 3
   },
   "httpClient": {
@@ -50,7 +50,7 @@
   },
   "jaeger": {
     "enabled": true,
-    "serviceName": "api-gateway",
+    "serviceName": "apigateway",
     "udpHost": "http://localhost:4317",
     "udpPort": 6831,
     "maxPacketSize": 65000,
@@ -97,9 +97,9 @@
       "rawData": ""
     },
     "expiryMinutes": 60,
-    "issuer": "genocs-identity-service",
+    "issuer": "genocs-identities-service",
     "issuerSigningKey": "THIS IS USED TO SIGN AND VERIFY JWT TOKENS, REPLACE IT WITH YOUR OWN SECRET, IT CAN BE ANY STRING",
-    "validIssuer": "genocs-identity-service",
+    "validIssuer": "genocs-identities-service",
     "validateAudience": false,
     "validateIssuer": false,
     "validateLifetime": false,
@@ -120,22 +120,22 @@
   },
   "mongodb": {
     "connectionString": "mongodb://localhost:27017",
-    "database": "api-gateway",
+    "database": "apigateway",
     "seed": false,
     "enableTracing": true
   },
   "rabbitMq": {
   "redis": {
     "connectionString": "redis",
-    "instance": "api-gateway:",
+    "instance": "apigateway:",
     "database": 0
   },
   "reverseProxy": {
     "clusters": {
-      "identity-cluster": {
+      "identities-cluster": {
         "destinations": {
           "destination1": {
-            "address": "https://identity-service"
+            "address": "https://identities-service"
           }
         }
       },
@@ -173,17 +173,17 @@
       "enabled": false,
       "engineVersion": 2,
       "mountPoint": "kv",
-      "path": "api-gateway/settings"
+      "path": "apigateway/settings"
     },
     "pki": {
       "enabled": false,
-      "roleName": "api-gateway",
-      "commonName": "api-gateway.demo.io"
+      "roleName": "apigateway",
+      "commonName": "apigateway.demo.io"
     },
     "lease": {
       "mongo": {
         "type": "database",
-        "roleName": "api-gateway",
+        "roleName": "apigateway",
         "enabled": false,
         "autoRenewal": true,
         "templates": {