From 4ec6624738bb0cd9009a321e103a89fea58e33eb Mon Sep 17 00:00:00 2001 From: selmankoc Date: Wed, 10 Aug 2022 13:18:17 +0300 Subject: [PATCH 01/11] create push ghcr file --- build/build-images-locally.sh | 2 +- etc/k8s/azure/scripts/push-images-ghcr.sh | 36 +++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100755 etc/k8s/azure/scripts/push-images-ghcr.sh diff --git a/build/build-images-locally.sh b/build/build-images-locally.sh index b24e775b..35ad460f 100755 --- a/build/build-images-locally.sh +++ b/build/build-images-locally.sh @@ -1,6 +1,6 @@ #!/bin/bash -export IMAGE_TAG="1.0.5" +export IMAGE_TAG="latest" export total=11 cd ../ export currentFolder=`pwd` diff --git a/etc/k8s/azure/scripts/push-images-ghcr.sh b/etc/k8s/azure/scripts/push-images-ghcr.sh new file mode 100755 index 00000000..5881246f --- /dev/null +++ b/etc/k8s/azure/scripts/push-images-ghcr.sh @@ -0,0 +1,36 @@ +export version="latest" + +az acr login --name volocr + +docker tag eshoponabp/app-web:"${version}" ghcr.io/volosoft/eshoponabp/app-web:"${version}" +docker push ghcr.io/volosoft/eshoponabp/app-web:"${version}" + +docker tag eshoponabp/app-authserver:"${version}" ghcr.io/volosoft/eshoponabp/app-authserver:"${version}" +docker push ghcr.io/volosoft/eshoponabp/app-authserver:"${version}" + +docker tag eshoponabp/app-publicweb:"${version}" ghcr.io/volosoft/eshoponabp/app-publicweb:"${version}" +docker push ghcr.io/volosoft/eshoponabp/app-publicweb:"${version}" + +docker tag eshoponabp/gateway-web:"${version}" ghcr.io/volosoft/eshoponabp/gateway-web:"${version}" +docker push ghcr.io/volosoft/eshoponabp/gateway-web:"${version}" + +docker tag eshoponabp/gateway-web-public:"${version}" ghcr.io/volosoft/eshoponabp/gateway-web-public:"${version}" +docker push ghcr.io/volosoft/eshoponabp/gateway-web-public:"${version}" + +docker tag eshoponabp/service-identity:"${version}" ghcr.io/volosoft/eshoponabp/service-identity:"${version}" +docker push ghcr.io/volosoft/eshoponabp/service-identity:"${version}" + +docker tag eshoponabp/service-administration:"${version}" ghcr.io/volosoft/eshoponabp/service-administration:"${version}" +docker push ghcr.io/volosoft/eshoponabp/service-administration:"${version}" + +docker tag eshoponabp/service-basket:"${version}" ghcr.io/volosoft/eshoponabp/service-basket:"${version}" +docker push ghcr.io/volosoft/eshoponabp/service-basket:"${version}" + +docker tag eshoponabp/service-catalog:"${version}" ghcr.io/volosoft/eshoponabp/service-catalog:"${version}" +docker push ghcr.io/volosoft/eshoponabp/service-catalog:"${version}" + +docker tag eshoponabp/service-ordering:"${version}" ghcr.io/volosoft/eshoponabp/service-ordering:"${version}" +docker push ghcr.io/volosoft/eshoponabp/service-ordering:"${version}" + +docker tag eshoponabp/service-payment:"${version}" ghcr.io/volosoft/eshoponabp/service-payment:"${version}" +docker push ghcr.io/volosoft/eshoponabp/service-payment:"${version}" \ No newline at end of file From 4d848bb463701c0c34cf34f8fcab636799a764ef Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 11 Aug 2022 11:18:14 +0300 Subject: [PATCH 02/11] Update README.md --- etc/README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/etc/README.md b/etc/README.md index 7aef9b19..f1978493 100644 --- a/etc/README.md +++ b/etc/README.md @@ -32,6 +32,18 @@ helm upgrade --install --version=4.0.19 ingress-nginx ingress-nginx/ingress-ngin 127.0.0.1 eshop-st-gateway-web 127.0.0.1 eshop-st-gateway-web-public ```` +Once Helm is set up properly, add the repo as follows: + +```console +helm repo add eshoponabp https://abpframework.github.io/abp-charts/ +``` +You can then run `helm search repo eshoponabp` to see the charts. + +```console + helm install eshop-st eshoponabp/eshoponabp +``` + +OR * Run `build-images.ps1` or `build-images.sh` in the `build` directory. * Run `deploy-staging.ps1` or `deploy-staging.sh` in the `helm-chart` directory. It is deployed with the `eshop` namespace. From 63be2175bfd90bd58f7112faa6bd3ed0735d0a70 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 11 Aug 2022 11:18:46 +0300 Subject: [PATCH 03/11] change path azure.values --- etc/k8s/{eshoponabp => azure/scripts}/values.azure.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename etc/k8s/{eshoponabp => azure/scripts}/values.azure.yaml (100%) diff --git a/etc/k8s/eshoponabp/values.azure.yaml b/etc/k8s/azure/scripts/values.azure.yaml similarity index 100% rename from etc/k8s/eshoponabp/values.azure.yaml rename to etc/k8s/azure/scripts/values.azure.yaml From cdc5dedb5f41f41a21dd8c99db361602d74bee2e Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 11 Aug 2022 11:19:44 +0300 Subject: [PATCH 04/11] Update values.yaml --- etc/k8s/eshoponabp/values.yaml | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index 33d64c41..3a16d910 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -18,8 +18,8 @@ authserver: host: eshop-st-authserver tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-authserver" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/app-authserver" + tag: latest # web sub-chart override web: @@ -36,8 +36,8 @@ web: host: eshop-st-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-web" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/app-web" + tag: latest # public-web sub-chart override public-web: @@ -55,8 +55,8 @@ public-web: host: eshop-st-public-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-publicweb" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" + tag: latest # identity-service sub-chart override identity: @@ -91,8 +91,8 @@ identity: host: eshop-st-identity tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-identity" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/service-identity" + tag: latest # administration sub-chart override administration: @@ -119,8 +119,8 @@ administration: host: eshop-st-administration tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-administration" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/service-administration" + tag: latest # gateway-web sub-chart override gateway-web: @@ -141,8 +141,8 @@ gateway-web: host: eshop-st-gateway-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/gateway-web" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/gateway-web" + tag: latest reRoutes: accountService: url: http://eshop-st-authserver @@ -172,8 +172,8 @@ gateway-web-public: host: eshop-st-gateway-web-public tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/gateway-web-public" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" + tag: latest reRoutes: accountService: url: http://eshop-st-authserver @@ -213,8 +213,8 @@ basket: host: eshop-st-basket tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-basket" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/service-basket" + tag: latest # catalog-service sub-chart override catalog: @@ -242,8 +242,8 @@ catalog: host: eshop-st-catalog tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-catalog" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/service-catalog" + tag: latest # ordering-service sub-chart override ordering: @@ -266,8 +266,8 @@ ordering: host: eshop-st-ordering tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-ordering" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/service-ordering" + tag: latest # payment-service sub-chart override payment: @@ -290,8 +290,8 @@ payment: host: eshop-st-payment tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-payment" - tag: 1.0.0 + repository: "ghcr.io/volosoft/eshoponabp/service-payment" + tag: latest # Default values for eshoponabp. # This is a YAML-formatted file. From b21147ae114dbe43d3bc8637dad8f28266510cbe Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 4 May 2023 16:48:04 +0300 Subject: [PATCH 05/11] Update values.azure.yaml --- etc/k8s/azure/scripts/values.azure.yaml | 78 +++++++++++++++++-------- 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/etc/k8s/azure/scripts/values.azure.yaml b/etc/k8s/azure/scripts/values.azure.yaml index f57d5fb9..bdf0d7d8 100644 --- a/etc/k8s/azure/scripts/values.azure.yaml +++ b/etc/k8s/azure/scripts/values.azure.yaml @@ -2,7 +2,7 @@ authserver: config: selfUrl: https://auth.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://www.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://cmskit.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://www.eshoponabp.com allowedRedirectUrls: https://admin.eshoponabp.com authServer: authority: https://auth.eshoponabp.com @@ -18,8 +18,8 @@ authserver: host: auth.eshoponabp.com tlsSecret: eshop-wildcard-tls image: - repository: "volocr.azurecr.io/eshoponabp/app-authserver" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/app-authserver" + tag: 1.0.0 # web sub-chart override web: @@ -35,8 +35,8 @@ web: ingress: host: admin.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/app-web" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/app-web" + tag: 1.0.0 # public-web sub-chart override public-web: @@ -56,8 +56,8 @@ public-web: ingress: host: eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/app-publicweb" - tag: 1.0.6 + repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" + tag: 1.0.0 # identity-service sub-chart override identity: @@ -87,12 +87,13 @@ identity: basketServiceRootUrl: https://basket.eshoponabp.com/ catalogServiceRootUrl: https://catalog.eshoponabp.com orderingServiceRootUrl: https://order.eshoponabp.com + cmskitServiceRootUrl: https://cmskit.eshoponabp.com paymentServiceRootUrl: https://payment.eshoponabp.com ingress: host: identity.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/service-identity" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/service-identity" + tag: 1.0.0 # administration sub-chart override administration: @@ -118,8 +119,8 @@ administration: ingress: host: administration.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/service-administration" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/service-administration" + tag: 1.0.0 # gateway-web sub-chart override gateway-web: @@ -139,8 +140,8 @@ gateway-web: ingress: host: gateway.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/gateway-web" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/gateway-web" + tag: 1.0.0 reRoutes: accountService: url: http://eshop-az-authserver @@ -152,6 +153,8 @@ gateway-web: url: http://eshop-az-catalog orderingService: url: http://eshop-az-ordering + cmskitService: + url: http://eshop-az-cmskit # gateway-web-public sub-chart override gateway-web-public: @@ -169,8 +172,8 @@ gateway-web-public: ingress: host: gateway-public.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/gateway-web-public" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" + tag: 1.0.0 reRoutes: accountService: url: http://eshop-az-authserver @@ -184,6 +187,8 @@ gateway-web-public: url: http://eshop-az-basket orderingService: url: http://eshop-az-ordering + cmskitService: + url: http://eshop-az-cmskit paymentService: url: http://eshop-az-payment @@ -209,8 +214,8 @@ basket: ingress: host: basket.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/service-basket" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/service-basket" + tag: 1.0.0 # catalog-service sub-chart override catalog: @@ -237,8 +242,8 @@ catalog: ingress: host: catalog.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/service-catalog" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/service-catalog" + tag: 1.0.0 # ordering-service sub-chart override ordering: @@ -260,9 +265,36 @@ ordering: ingress: host: order.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/service-ordering" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/service-ordering" + tag: 1.0.1 +# cmskit-service sub-chart override +# cmskit: +# config: +# selfUrl: https://cmskit.eshoponabp.com +# corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com +# connectionStrings: +# cmskitService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false" +# administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" +# authServer: +# authority: http://eshop-az-authserver +# requireHttpsMetadata: "false" +# swaggerClientId: WebGateway_Swagger +# swaggerClientSecret: "1q2w3e*" +# remoteServices: +# abpIdentityBaseUrl: https://identity.eshoponabp.com +# dotnetEnv: Production +# redisHost: eshop-az-redis +# rabbitmqHost: eshop-az-rabbitmq +# elasticsearchHost: eshop-az-elasticsearch +# synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions +# authority: https://auth.eshoponabp.com +# ingress: +# host: cmskit.eshoponabp.com +# image: +# repository: "ghcr.io/volosoft/eshoponabp/service-cmskit" +# tag: 1.0.1 + # payment-service sub-chart override payment: config: @@ -283,8 +315,8 @@ payment: ingress: host: payment.eshoponabp.com image: - repository: "volocr.azurecr.io/eshoponabp/service-payment" - tag: 1.0.5 + repository: "ghcr.io/volosoft/eshoponabp/service-payment" + tag: 1.0.0 # Default values for eshoponabp. # This is a YAML-formatted file. From 0e71e81fd9a1b5d382a4fb00b646d1d1fc91686a Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 4 May 2023 16:48:10 +0300 Subject: [PATCH 06/11] Update mongodb-deployment.yaml --- .../charts/mongodb/templates/mongodb-deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/mongodb/templates/mongodb-deployment.yaml b/etc/k8s/eshoponabp/charts/mongodb/templates/mongodb-deployment.yaml index fc01540b..3be57fd2 100644 --- a/etc/k8s/eshoponabp/charts/mongodb/templates/mongodb-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/mongodb/templates/mongodb-deployment.yaml @@ -31,8 +31,8 @@ spec: name: {{ .Release.Name }}-{{ .Chart.Name }}-database-volume spec: accessModes: [ "ReadWriteOnce" ] - storageClassName: "managed-premium-retain" + storageClassName: "managed-csi" resources: requests: - storage: 32Gi + storage: 16Gi {{- end }} \ No newline at end of file From 3f93168fb6fa1b40e65d35b4ab14b52ae0e42a7d Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 4 May 2023 16:48:14 +0300 Subject: [PATCH 07/11] Update postgres-deployment.yaml --- .../charts/postgres/templates/postgres-deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml b/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml index 50c455a6..a86da72b 100644 --- a/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml @@ -34,8 +34,8 @@ spec: name: {{ .Release.Name }}-{{ .Chart.Name }}-database-volume spec: accessModes: [ "ReadWriteOnce" ] - storageClassName: "managed-premium-retain" + storageClassName: "managed-csi" resources: requests: - storage: 32Gi + storage: 16Gi {{- end }} \ No newline at end of file From 8a8df5addc22d8d538d8c0ae574ad52b6f49d4aa Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 9 May 2023 14:41:34 +0300 Subject: [PATCH 08/11] added nodeselector --- etc/k8s/azure/scripts/values.azure.yaml | 28 +++++++++++++++++-- etc/k8s/eshoponabp/charts/mongodb/values.yaml | 2 ++ .../eshoponabp/charts/postgres/values.yaml | 2 ++ .../eshoponabp/charts/rabbitmq/values.yaml | 2 ++ etc/k8s/eshoponabp/charts/redis/values.yaml | 2 ++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/etc/k8s/azure/scripts/values.azure.yaml b/etc/k8s/azure/scripts/values.azure.yaml index bdf0d7d8..e84afde4 100644 --- a/etc/k8s/azure/scripts/values.azure.yaml +++ b/etc/k8s/azure/scripts/values.azure.yaml @@ -14,6 +14,8 @@ authserver: redisHost: eshop-az-redis rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool ingress: host: auth.eshoponabp.com tlsSecret: eshop-wildcard-tls @@ -32,6 +34,8 @@ web: responseType: "code" strictDiscoveryDocumentValidation: false skipIssuerCheck: true + nodeSelector: + agentpool: demopool ingress: host: admin.eshoponabp.com image: @@ -52,7 +56,8 @@ public-web: redisHost: eshop-az-redis rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch - + nodeSelector: + agentpool: demopool ingress: host: eshoponabp.com image: @@ -89,6 +94,8 @@ identity: orderingServiceRootUrl: https://order.eshoponabp.com cmskitServiceRootUrl: https://cmskit.eshoponabp.com paymentServiceRootUrl: https://payment.eshoponabp.com + nodeSelector: + agentpool: demopool ingress: host: identity.eshoponabp.com image: @@ -115,7 +122,9 @@ administration: rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions - authority: https://auth.eshoponabp.com + authority: https://auth.eshoponabp.com + nodeSelector: + agentpool: demopool ingress: host: administration.eshoponabp.com image: @@ -137,6 +146,8 @@ gateway-web: redisHost: eshop-az-redis rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool ingress: host: gateway.eshoponabp.com image: @@ -169,6 +180,8 @@ gateway-web-public: redisHost: eshop-az-redis rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool ingress: host: gateway-public.eshoponabp.com image: @@ -211,6 +224,8 @@ basket: remoteServices: catalogBaseUrl: http://eshop-az-catalog:80 catalogGrpcUrl: http://eshop-az-catalog:81 + nodeSelector: + agentpool: demopool ingress: host: basket.eshoponabp.com image: @@ -262,6 +277,8 @@ ordering: redisHost: eshop-az-redis rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool ingress: host: order.eshoponabp.com image: @@ -289,6 +306,8 @@ ordering: # elasticsearchHost: eshop-az-elasticsearch # synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions # authority: https://auth.eshoponabp.com +# nodeSelector: +# agentpool: demopool # ingress: # host: cmskit.eshoponabp.com # image: @@ -312,6 +331,8 @@ payment: redisHost: eshop-az-redis rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool ingress: host: payment.eshoponabp.com image: @@ -395,7 +416,8 @@ autoscaling: targetCPUUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80 -nodeSelector: {} +nodeSelector: + agentpool: demopool tolerations: [] diff --git a/etc/k8s/eshoponabp/charts/mongodb/values.yaml b/etc/k8s/eshoponabp/charts/mongodb/values.yaml index e69de29b..5e6dfe48 100644 --- a/etc/k8s/eshoponabp/charts/mongodb/values.yaml +++ b/etc/k8s/eshoponabp/charts/mongodb/values.yaml @@ -0,0 +1,2 @@ +nodeSelector: + agentpool: demopool \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/postgres/values.yaml b/etc/k8s/eshoponabp/charts/postgres/values.yaml index e69de29b..5e6dfe48 100644 --- a/etc/k8s/eshoponabp/charts/postgres/values.yaml +++ b/etc/k8s/eshoponabp/charts/postgres/values.yaml @@ -0,0 +1,2 @@ +nodeSelector: + agentpool: demopool \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/rabbitmq/values.yaml b/etc/k8s/eshoponabp/charts/rabbitmq/values.yaml index e69de29b..5e6dfe48 100644 --- a/etc/k8s/eshoponabp/charts/rabbitmq/values.yaml +++ b/etc/k8s/eshoponabp/charts/rabbitmq/values.yaml @@ -0,0 +1,2 @@ +nodeSelector: + agentpool: demopool \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/redis/values.yaml b/etc/k8s/eshoponabp/charts/redis/values.yaml index e69de29b..5e6dfe48 100644 --- a/etc/k8s/eshoponabp/charts/redis/values.yaml +++ b/etc/k8s/eshoponabp/charts/redis/values.yaml @@ -0,0 +1,2 @@ +nodeSelector: + agentpool: demopool \ No newline at end of file From d50a0f9335a6f7272af0d38d9d511eacff2b687b Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 12 Sep 2023 14:21:19 +0300 Subject: [PATCH 09/11] Delete values.azure.yaml --- etc/k8s/azure/scripts/values.azure.yaml | 424 ------------------------ 1 file changed, 424 deletions(-) delete mode 100644 etc/k8s/azure/scripts/values.azure.yaml diff --git a/etc/k8s/azure/scripts/values.azure.yaml b/etc/k8s/azure/scripts/values.azure.yaml deleted file mode 100644 index e84afde4..00000000 --- a/etc/k8s/azure/scripts/values.azure.yaml +++ /dev/null @@ -1,424 +0,0 @@ -# auth-server sub-chart override -authserver: - config: - selfUrl: https://auth.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://cmskit.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://www.eshoponabp.com - allowedRedirectUrls: https://admin.eshoponabp.com - authServer: - authority: https://auth.eshoponabp.com - requireHttpsMetadata: "false" - connectionStrings: - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - identityService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - nodeSelector: - agentpool: demopool - ingress: - host: auth.eshoponabp.com - tlsSecret: eshop-wildcard-tls - image: - repository: "ghcr.io/volosoft/eshoponabp/app-authserver" - tag: 1.0.0 - -# web sub-chart override -web: - config: - selfUrl: https://admin.eshoponabp.com - gatewayUrl: https://gateway.eshoponabp.com - authServer: - authority: https://auth.eshoponabp.com - requireHttpsMetadata: false - responseType: "code" - strictDiscoveryDocumentValidation: false - skipIssuerCheck: true - nodeSelector: - agentpool: demopool - ingress: - host: admin.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/app-web" - tag: 1.0.0 - -# public-web sub-chart override -public-web: - config: - selfUrl: https://www.eshoponabp.com - gatewayUrl: https://gateway-public.eshoponabp.com/ - authServer: - authority: https://auth.eshoponabp.com - requireHttpsMetadata: "false" - isOnProd: "true" - metaAddress: http://eshop-az-authserver - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - nodeSelector: - agentpool: demopool - ingress: - host: eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" - tag: 1.0.0 - -# identity-service sub-chart override -identity: - config: - selfUrl: https://identity.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com - connectionStrings: - identityService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - identityServerClients: # Seeded Clients - webRootUrl: https://admin.eshoponabp.com/ - publicWebRootUrl: https://www.eshoponabp.com/ - webGatewayRootUrl: https://gateway.eshoponabp.com/ - publicWebGatewayRootUrl: https://gateway-public.eshoponabp.com/ - identityServiceRootUrl: https://identity.eshoponabp.com/ - administrationServiceRootUrl: https://administration.eshoponabp.com/ - accountServiceRootUrl: https://auth.eshoponabp.com - basketServiceRootUrl: https://basket.eshoponabp.com/ - catalogServiceRootUrl: https://catalog.eshoponabp.com - orderingServiceRootUrl: https://order.eshoponabp.com - cmskitServiceRootUrl: https://cmskit.eshoponabp.com - paymentServiceRootUrl: https://payment.eshoponabp.com - nodeSelector: - agentpool: demopool - ingress: - host: identity.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/service-identity" - tag: 1.0.0 - -# administration sub-chart override -administration: - config: - selfUrl: https://administration.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://eshop-az-gateway-internal - connectionStrings: - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - remoteServices: - abpIdentityBaseUrl: https://identity.eshoponabp.com - useCurrentToken: "false" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions - authority: https://auth.eshoponabp.com - nodeSelector: - agentpool: demopool - ingress: - host: administration.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/service-administration" - tag: 1.0.0 - -# gateway-web sub-chart override -gateway-web: - config: - selfUrl: https://gateway.eshoponabp.com - corsOrigins: https://admin.eshoponabp.com - globalConfigurationBaseUrl: http://eshop-az-gateway-public - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - nodeSelector: - agentpool: demopool - ingress: - host: gateway.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web" - tag: 1.0.0 - reRoutes: - accountService: - url: http://eshop-az-authserver - identityService: - url: http://eshop-az-identity - administrationService: - url: http://eshop-az-administration - catalogService: - url: http://eshop-az-catalog - orderingService: - url: http://eshop-az-ordering - cmskitService: - url: http://eshop-az-cmskit - -# gateway-web-public sub-chart override -gateway-web-public: - config: - selfUrl: https://gateway-public.eshoponabp.com - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - nodeSelector: - agentpool: demopool - ingress: - host: gateway-public.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" - tag: 1.0.0 - reRoutes: - accountService: - url: http://eshop-az-authserver - identityService: - url: http://eshop-az-identity - administrationService: - url: http://eshop-az-administration - catalogService: - url: http://eshop-az-catalog - basketService: - url: http://eshop-az-basket - orderingService: - url: http://eshop-az-ordering - cmskitService: - url: http://eshop-az-cmskit - paymentService: - url: http://eshop-az-payment - -# basket-service sub-chart override -basket: - config: - selfUrl: https://basket.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://www.eshoponabp.com - connectionStrings: - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - remoteServices: - catalogBaseUrl: http://eshop-az-catalog:80 - catalogGrpcUrl: http://eshop-az-catalog:81 - nodeSelector: - agentpool: demopool - ingress: - host: basket.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/service-basket" - tag: 1.0.0 - -# catalog-service sub-chart override -catalog: - config: - selfUrl: https://catalog.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://www.eshoponabp.com,https://admin.eshoponabp.com - connectionStrings: - catalogService: "mongodb://eshop-az-mongodb/EShopOnAbp_Catalog" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - kestrel: - httpUrl: http://eshop-az-catalog:80 - httpProtocols: Http1AndHttp2 - grpcUrl: http://eshop-az-catalog:81 - grpcProtocols: Http2 - ingress: - host: catalog.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/service-catalog" - tag: 1.0.0 - -# ordering-service sub-chart override -ordering: - config: - selfUrl: https://order.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com - connectionStrings: - orderingService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;User ID=postgres;password=myPassw0rd;Pooling=false" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - nodeSelector: - agentpool: demopool - ingress: - host: order.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/service-ordering" - tag: 1.0.1 - -# cmskit-service sub-chart override -# cmskit: -# config: -# selfUrl: https://cmskit.eshoponabp.com -# corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com -# connectionStrings: -# cmskitService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false" -# administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" -# authServer: -# authority: http://eshop-az-authserver -# requireHttpsMetadata: "false" -# swaggerClientId: WebGateway_Swagger -# swaggerClientSecret: "1q2w3e*" -# remoteServices: -# abpIdentityBaseUrl: https://identity.eshoponabp.com -# dotnetEnv: Production -# redisHost: eshop-az-redis -# rabbitmqHost: eshop-az-rabbitmq -# elasticsearchHost: eshop-az-elasticsearch -# synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions -# authority: https://auth.eshoponabp.com -# nodeSelector: -# agentpool: demopool -# ingress: -# host: cmskit.eshoponabp.com -# image: -# repository: "ghcr.io/volosoft/eshoponabp/service-cmskit" -# tag: 1.0.1 - -# payment-service sub-chart override -payment: - config: - selfUrl: https://payment.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com - connectionStrings: - paymentService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Payment;User ID=postgres;password=myPassw0rd;Pooling=false" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - nodeSelector: - agentpool: demopool - ingress: - host: payment.eshoponabp.com - image: - repository: "ghcr.io/volosoft/eshoponabp/service-payment" - tag: 1.0.0 - -# Default values for eshoponabp. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: - agentpool: demopool - -tolerations: [] - -affinity: {} \ No newline at end of file From 86ab9499af8429a603c9a5cf742f6453799f3550 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 12 Sep 2023 14:21:22 +0300 Subject: [PATCH 10/11] Create values.azure.yaml --- etc/k8s/azure/values.azure.yaml | 424 ++++++++++++++++++++++++++++++++ 1 file changed, 424 insertions(+) create mode 100644 etc/k8s/azure/values.azure.yaml diff --git a/etc/k8s/azure/values.azure.yaml b/etc/k8s/azure/values.azure.yaml new file mode 100644 index 00000000..e84afde4 --- /dev/null +++ b/etc/k8s/azure/values.azure.yaml @@ -0,0 +1,424 @@ +# auth-server sub-chart override +authserver: + config: + selfUrl: https://auth.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://cmskit.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://www.eshoponabp.com + allowedRedirectUrls: https://admin.eshoponabp.com + authServer: + authority: https://auth.eshoponabp.com + requireHttpsMetadata: "false" + connectionStrings: + administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + identityService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool + ingress: + host: auth.eshoponabp.com + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/app-authserver" + tag: 1.0.0 + +# web sub-chart override +web: + config: + selfUrl: https://admin.eshoponabp.com + gatewayUrl: https://gateway.eshoponabp.com + authServer: + authority: https://auth.eshoponabp.com + requireHttpsMetadata: false + responseType: "code" + strictDiscoveryDocumentValidation: false + skipIssuerCheck: true + nodeSelector: + agentpool: demopool + ingress: + host: admin.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/app-web" + tag: 1.0.0 + +# public-web sub-chart override +public-web: + config: + selfUrl: https://www.eshoponabp.com + gatewayUrl: https://gateway-public.eshoponabp.com/ + authServer: + authority: https://auth.eshoponabp.com + requireHttpsMetadata: "false" + isOnProd: "true" + metaAddress: http://eshop-az-authserver + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool + ingress: + host: eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" + tag: 1.0.0 + +# identity-service sub-chart override +identity: + config: + selfUrl: https://identity.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com + connectionStrings: + identityService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" + administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + identityServerClients: # Seeded Clients + webRootUrl: https://admin.eshoponabp.com/ + publicWebRootUrl: https://www.eshoponabp.com/ + webGatewayRootUrl: https://gateway.eshoponabp.com/ + publicWebGatewayRootUrl: https://gateway-public.eshoponabp.com/ + identityServiceRootUrl: https://identity.eshoponabp.com/ + administrationServiceRootUrl: https://administration.eshoponabp.com/ + accountServiceRootUrl: https://auth.eshoponabp.com + basketServiceRootUrl: https://basket.eshoponabp.com/ + catalogServiceRootUrl: https://catalog.eshoponabp.com + orderingServiceRootUrl: https://order.eshoponabp.com + cmskitServiceRootUrl: https://cmskit.eshoponabp.com + paymentServiceRootUrl: https://payment.eshoponabp.com + nodeSelector: + agentpool: demopool + ingress: + host: identity.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/service-identity" + tag: 1.0.0 + +# administration sub-chart override +administration: + config: + selfUrl: https://administration.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://eshop-az-gateway-internal + connectionStrings: + administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + remoteServices: + abpIdentityBaseUrl: https://identity.eshoponabp.com + useCurrentToken: "false" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions + authority: https://auth.eshoponabp.com + nodeSelector: + agentpool: demopool + ingress: + host: administration.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/service-administration" + tag: 1.0.0 + +# gateway-web sub-chart override +gateway-web: + config: + selfUrl: https://gateway.eshoponabp.com + corsOrigins: https://admin.eshoponabp.com + globalConfigurationBaseUrl: http://eshop-az-gateway-public + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool + ingress: + host: gateway.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/gateway-web" + tag: 1.0.0 + reRoutes: + accountService: + url: http://eshop-az-authserver + identityService: + url: http://eshop-az-identity + administrationService: + url: http://eshop-az-administration + catalogService: + url: http://eshop-az-catalog + orderingService: + url: http://eshop-az-ordering + cmskitService: + url: http://eshop-az-cmskit + +# gateway-web-public sub-chart override +gateway-web-public: + config: + selfUrl: https://gateway-public.eshoponabp.com + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool + ingress: + host: gateway-public.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" + tag: 1.0.0 + reRoutes: + accountService: + url: http://eshop-az-authserver + identityService: + url: http://eshop-az-identity + administrationService: + url: http://eshop-az-administration + catalogService: + url: http://eshop-az-catalog + basketService: + url: http://eshop-az-basket + orderingService: + url: http://eshop-az-ordering + cmskitService: + url: http://eshop-az-cmskit + paymentService: + url: http://eshop-az-payment + +# basket-service sub-chart override +basket: + config: + selfUrl: https://basket.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://www.eshoponabp.com + connectionStrings: + administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + remoteServices: + catalogBaseUrl: http://eshop-az-catalog:80 + catalogGrpcUrl: http://eshop-az-catalog:81 + nodeSelector: + agentpool: demopool + ingress: + host: basket.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/service-basket" + tag: 1.0.0 + +# catalog-service sub-chart override +catalog: + config: + selfUrl: https://catalog.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://www.eshoponabp.com,https://admin.eshoponabp.com + connectionStrings: + catalogService: "mongodb://eshop-az-mongodb/EShopOnAbp_Catalog" + administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + kestrel: + httpUrl: http://eshop-az-catalog:80 + httpProtocols: Http1AndHttp2 + grpcUrl: http://eshop-az-catalog:81 + grpcProtocols: Http2 + ingress: + host: catalog.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/service-catalog" + tag: 1.0.0 + +# ordering-service sub-chart override +ordering: + config: + selfUrl: https://order.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com + connectionStrings: + orderingService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;User ID=postgres;password=myPassw0rd;Pooling=false" + administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool + ingress: + host: order.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/service-ordering" + tag: 1.0.1 + +# cmskit-service sub-chart override +# cmskit: +# config: +# selfUrl: https://cmskit.eshoponabp.com +# corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com +# connectionStrings: +# cmskitService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false" +# administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" +# authServer: +# authority: http://eshop-az-authserver +# requireHttpsMetadata: "false" +# swaggerClientId: WebGateway_Swagger +# swaggerClientSecret: "1q2w3e*" +# remoteServices: +# abpIdentityBaseUrl: https://identity.eshoponabp.com +# dotnetEnv: Production +# redisHost: eshop-az-redis +# rabbitmqHost: eshop-az-rabbitmq +# elasticsearchHost: eshop-az-elasticsearch +# synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions +# authority: https://auth.eshoponabp.com +# nodeSelector: +# agentpool: demopool +# ingress: +# host: cmskit.eshoponabp.com +# image: +# repository: "ghcr.io/volosoft/eshoponabp/service-cmskit" +# tag: 1.0.1 + +# payment-service sub-chart override +payment: + config: + selfUrl: https://payment.eshoponabp.com + corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com + connectionStrings: + paymentService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Payment;User ID=postgres;password=myPassw0rd;Pooling=false" + administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-az-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Production + redisHost: eshop-az-redis + rabbitmqHost: eshop-az-rabbitmq + elasticsearchHost: eshop-az-elasticsearch + nodeSelector: + agentpool: demopool + ingress: + host: payment.eshoponabp.com + image: + repository: "ghcr.io/volosoft/eshoponabp/service-payment" + tag: 1.0.0 + +# Default values for eshoponabp. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: + agentpool: demopool + +tolerations: [] + +affinity: {} \ No newline at end of file From 6d43d850f2b6d8c896607664e84d6a711b62e17b Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 12 Sep 2023 14:22:04 +0300 Subject: [PATCH 11/11] Update deploy-staging.ps1 --- etc/k8s/deploy-staging.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/k8s/deploy-staging.ps1 b/etc/k8s/deploy-staging.ps1 index 342aab96..d129a082 100644 --- a/etc/k8s/deploy-staging.ps1 +++ b/etc/k8s/deploy-staging.ps1 @@ -1 +1,3 @@ -helm upgrade --install eshop-st eshoponabp --namespace eshop --create-namespace \ No newline at end of file +helm upgrade --install eshop-st eshoponabp --namespace eshop --create-namespace + +helm upgrade --install eshop-az eshoponabp -f ./azure/values.azure.yaml --namespace eshop \ No newline at end of file