From 4b75389975898495e072d09099b2306a4a9d8142 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 11 Aug 2022 12:54:25 +0300 Subject: [PATCH 01/21] fix repository ghcr --- .../scripts}/values.azure.yaml | 0 etc/k8s/eshoponabp/values.yaml | 22 +++++++++---------- 2 files changed, 11 insertions(+), 11 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 diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index efc8e57b..9d0ae40b 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -18,7 +18,7 @@ authserver: host: eshop-st-authserver tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-authserver" + repository: "ghcr.io/volosoft/eshoponabp/app-authserver" tag: 1.0.0 # web sub-chart override @@ -36,7 +36,7 @@ web: host: eshop-st-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-web" + repository: "ghcr.io/volosoft/eshoponabp/app-web" tag: 1.0.0 # public-web sub-chart override @@ -57,7 +57,7 @@ public-web: host: eshop-st-public-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-publicweb" + repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" tag: 1.0.0 # identity-service sub-chart override @@ -93,7 +93,7 @@ identity: host: eshop-st-identity tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-identity" + repository: "ghcr.io/volosoft/eshoponabp/service-identity" tag: 1.0.0 # administration sub-chart override @@ -121,7 +121,7 @@ administration: host: eshop-st-administration tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-administration" + repository: "ghcr.io/volosoft/eshoponabp/service-administration" tag: 1.0.0 # gateway-web sub-chart override @@ -143,7 +143,7 @@ gateway-web: host: eshop-st-gateway-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/gateway-web" + repository: "ghcr.io/volosoft/eshoponabp/gateway-web" tag: 1.0.0 reRoutes: accountService: @@ -174,7 +174,7 @@ gateway-web-public: host: eshop-st-gateway-web-public tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/gateway-web-public" + repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" tag: 1.0.0 reRoutes: accountService: @@ -215,7 +215,7 @@ basket: host: eshop-st-basket tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-basket" + repository: "ghcr.io/volosoft/eshoponabp/service-basket" tag: 1.0.0 # catalog-service sub-chart override @@ -244,7 +244,7 @@ catalog: host: eshop-st-catalog tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-catalog" + repository: "ghcr.io/volosoft/eshoponabp/service-catalog" tag: 1.0.0 # ordering-service sub-chart override @@ -268,7 +268,7 @@ ordering: host: eshop-st-ordering tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-ordering" + repository: "ghcr.io/volosoft/eshoponabp/service-ordering" tag: 1.0.0 # payment-service sub-chart override @@ -292,7 +292,7 @@ payment: host: eshop-st-payment tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-payment" + repository: "ghcr.io/volosoft/eshoponabp/service-payment" tag: 1.0.0 # Default values for eshoponabp. From 716aa0460f467cbc5c8abaf05eb8e16282c146e8 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 11 Aug 2022 13:00:13 +0300 Subject: [PATCH 02/21] create push ghcr sh --- build/build-images-locally.sh | 2 +- etc/k8s/azure/scripts/push-images-ghcr.sh | 36 +++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 etc/k8s/azure/scripts/push-images-ghcr.sh diff --git a/build/build-images-locally.sh b/build/build-images-locally.sh index b24e775b..85237331 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="1.0.0" 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 100644 index 00000000..b97b8f78 --- /dev/null +++ b/etc/k8s/azure/scripts/push-images-ghcr.sh @@ -0,0 +1,36 @@ +export version="1.0.0" + +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 a65a48946a2e3f8438497bd83e81cc94d99c6ed0 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 11 Aug 2022 13:25:04 +0300 Subject: [PATCH 03/21] Update push-images-ghcr.sh --- etc/k8s/azure/scripts/push-images-ghcr.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 etc/k8s/azure/scripts/push-images-ghcr.sh diff --git a/etc/k8s/azure/scripts/push-images-ghcr.sh b/etc/k8s/azure/scripts/push-images-ghcr.sh old mode 100644 new mode 100755 From d2f0153ae2aa8c7fd519b3a3bd44c5277ea8ff28 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 11:35:52 +0300 Subject: [PATCH 04/21] Create README.md --- etc/k8s/eshoponabp/README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 etc/k8s/eshoponabp/README.md diff --git a/etc/k8s/eshoponabp/README.md b/etc/k8s/eshoponabp/README.md new file mode 100644 index 00000000..d8232887 --- /dev/null +++ b/etc/k8s/eshoponabp/README.md @@ -0,0 +1,22 @@ +# abp-charts + +# eShopOnAbp +This project is a reference for who want to build microservice solutions with the ABP Framework. + +## Usage + +[Helm](https://helm.sh) must be installed to use the charts. +Please refer to Helm's [documentation](https://helm.sh/docs/) to get started. + +Once Helm is set up properly, add the repo as follows: + +```console +helm repo add eshoponabp https://abpframework.github.io/abp-charts/eshoponabp +``` + +You can then run `helm search repo eshoponabp` to see the charts. + + +```console + helm install eshop-st eshoponabp/eshoponabp +``` From e24f4528857cd9e9d03219f3d2b392630e349607 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 11:41:33 +0300 Subject: [PATCH 05/21] Update values.yaml --- etc/k8s/eshoponabp/charts/authserver/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index c498a1ea..14be88fd 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -1,12 +1,12 @@ config: - selfUrl: # https://eshop-st-authserver + selfUrl: https://demomicro-st-authserver.eshoponabp.com corsOrigins: # https://eshop-st-identity,https://eshop-st-administration allowedRedirectUrls: https://eshop-st-web connectionStrings: administrationService: # identityService: # authServer: - authority: http://eshop-st-authserver + authority: https://demomicro-st-authserver.eshoponabp.com requireHttpsMetadata: "false" swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" @@ -17,11 +17,11 @@ config: stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 ingress: - host: eshop-st-authserver + host: demomicro-st-authserver.eshoponabp.com tlsSecret: eshop-wildcard-tls image: - repository: eshoponabp/app-authserver + repository: volocr.azurecr.io/eshoponabp/app-authserver tag: latest pullPolicy: IfNotPresent From 27684f9340dc81bf75ed10e9eeaf31da428fabec Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 11:46:28 +0300 Subject: [PATCH 06/21] Update values.yaml --- etc/k8s/eshoponabp/charts/authserver/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index 14be88fd..b36380a3 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -1,6 +1,6 @@ config: selfUrl: https://demomicro-st-authserver.eshoponabp.com - corsOrigins: # https://eshop-st-identity,https://eshop-st-administration + corsOrigins: https://eshop-st-identity,https://eshop-st-administration allowedRedirectUrls: https://eshop-st-web connectionStrings: administrationService: # From 8e54a7744f04fb550c278bc9adb4f135f28e0258 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 11:59:09 +0300 Subject: [PATCH 07/21] Update appsettings.Docker.json --- .../src/EShopOnAbp.AuthServer/appsettings.Docker.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json b/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json index 5e2fe164..48feacb0 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/appsettings.Docker.json @@ -5,7 +5,7 @@ "RedirectAllowedUrls": "http://app-web" }, "AuthServer": { - "Authority": "http://app-authserver", + "Authority": "http://app-authserver", // Identity Server "RequireHttpsMetadata": "false", "SwaggerClientId": "WebGateway_Swagger", "SwaggerClientSecret": "1q2w3e*" From 1be802eda5bf220a34c1653e6df0d59e9f479005 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 12:37:50 +0300 Subject: [PATCH 08/21] Update values.yaml --- etc/k8s/eshoponabp/charts/authserver/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index b36380a3..a9e35dfa 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -21,8 +21,8 @@ ingress: tlsSecret: eshop-wildcard-tls image: - repository: volocr.azurecr.io/eshoponabp/app-authserver - tag: latest + repository: volocr.azurecr.io/demomicro/app-authserver + tag: 1.0.0 pullPolicy: IfNotPresent env: {} \ No newline at end of file From 60d0883bcabd45f219c56919916a30108c5bf95e Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 13:08:21 +0300 Subject: [PATCH 09/21] create values-st --- etc/k8s/azure/scripts/values.azure.st.yaml | 370 ++++++++++++++++++ .../eshoponabp/charts/authserver/values.yaml | 12 +- 2 files changed, 376 insertions(+), 6 deletions(-) create mode 100644 etc/k8s/azure/scripts/values.azure.st.yaml diff --git a/etc/k8s/azure/scripts/values.azure.st.yaml b/etc/k8s/azure/scripts/values.azure.st.yaml new file mode 100644 index 00000000..847c08c4 --- /dev/null +++ b/etc/k8s/azure/scripts/values.azure.st.yaml @@ -0,0 +1,370 @@ +# auth-server sub-chart override +authserver: + config: + selfUrl: https://demomicro-st-authserver.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 + allowedRedirectUrls: https://admin.eshoponabp.com + authServer: + authority: https://demomicro-st-authserver.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 + ingress: + host: demomicro-st-authserver.eshoponabp.com + tlsSecret: eshop-wildcard-tls + image: + repository: "volocr.azurecr.io/demomicro/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 + ingress: + host: admin.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/app-web" + tag: 1.0.5 + +# 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 + + ingress: + host: eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/app-publicweb" + tag: 1.0.6 + +# 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 + paymentServiceRootUrl: https://payment.eshoponabp.com + ingress: + host: identity.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/service-identity" + tag: 1.0.5 + +# 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 + ingress: + host: administration.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/service-administration" + tag: 1.0.5 + +# 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 + ingress: + host: gateway.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/gateway-web" + tag: 1.0.5 + 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 + +# 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 + ingress: + host: gateway-public.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/gateway-web-public" + tag: 1.0.5 + 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 + 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 + ingress: + host: basket.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/service-basket" + tag: 1.0.5 + +# 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: "volocr.azurecr.io/eshoponabp/service-catalog" + tag: 1.0.5 + +# 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 + ingress: + host: order.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/service-ordering" + tag: 1.0.5 + +# 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 + ingress: + host: payment.eshoponabp.com + image: + repository: "volocr.azurecr.io/eshoponabp/service-payment" + tag: 1.0.5 + +# 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: {} + +tolerations: [] + +affinity: {} \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index a9e35dfa..c498a1ea 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -1,12 +1,12 @@ config: - selfUrl: https://demomicro-st-authserver.eshoponabp.com - corsOrigins: https://eshop-st-identity,https://eshop-st-administration + selfUrl: # https://eshop-st-authserver + corsOrigins: # https://eshop-st-identity,https://eshop-st-administration allowedRedirectUrls: https://eshop-st-web connectionStrings: administrationService: # identityService: # authServer: - authority: https://demomicro-st-authserver.eshoponabp.com + authority: http://eshop-st-authserver requireHttpsMetadata: "false" swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" @@ -17,12 +17,12 @@ config: stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 ingress: - host: demomicro-st-authserver.eshoponabp.com + host: eshop-st-authserver tlsSecret: eshop-wildcard-tls image: - repository: volocr.azurecr.io/demomicro/app-authserver - tag: 1.0.0 + repository: eshoponabp/app-authserver + tag: latest pullPolicy: IfNotPresent env: {} \ No newline at end of file From 13cdbec1afa0026100bdb8a556ba5d0d4d860bb7 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 14:46:28 +0300 Subject: [PATCH 10/21] Update values.yaml --- .../eshoponabp/charts/authserver/values.yaml | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index c498a1ea..80304529 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -1,28 +1,20 @@ config: - selfUrl: # https://eshop-st-authserver - corsOrigins: # https://eshop-st-identity,https://eshop-st-administration - allowedRedirectUrls: https://eshop-st-web - connectionStrings: - administrationService: # - identityService: # + 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 + allowedRedirectUrls: https://admin.eshoponabp.com authServer: - authority: http://eshop-st-authserver + authority: https://auth.eshoponabp.com requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: # - redisHost: # - rabbitmqHost: # - elasticsearchHost: # - stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 - + 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 ingress: - host: eshop-st-authserver + host: auth.eshoponabp.com tlsSecret: eshop-wildcard-tls - image: - repository: eshoponabp/app-authserver - tag: latest - pullPolicy: IfNotPresent - -env: {} \ No newline at end of file + repository: "volocr.azurecr.io/eshoponabp/app-authserver" + tag: 1.0.5 \ No newline at end of file From d858c243097a210d41a86100cd48d945b2aa7006 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 14:54:50 +0300 Subject: [PATCH 11/21] Update values.yaml --- etc/k8s/eshoponabp/charts/authserver/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index 80304529..19fe07a4 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -1,9 +1,9 @@ config: - selfUrl: https://auth.eshoponabp.com + selfUrl: https://demomicro-st-authserver.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 allowedRedirectUrls: https://admin.eshoponabp.com authServer: - authority: https://auth.eshoponabp.com + authority: https://demomicro-st-authserver.eshoponabp.com requireHttpsMetadata: "false" connectionStrings: administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" @@ -13,8 +13,8 @@ config: rabbitmqHost: eshop-az-rabbitmq elasticsearchHost: eshop-az-elasticsearch ingress: - host: auth.eshoponabp.com + host: demomicro-st-authserver.eshoponabp.com tlsSecret: eshop-wildcard-tls image: - repository: "volocr.azurecr.io/eshoponabp/app-authserver" - tag: 1.0.5 \ No newline at end of file + repository: "volocr.azurecr.io/demomicro/app-authserver" + tag: 1.0.0 \ No newline at end of file From 69cba5b9eee8764f35faad04bdbc49f4659173cf Mon Sep 17 00:00:00 2001 From: selmankoc Date: Fri, 12 Aug 2022 15:36:04 +0300 Subject: [PATCH 12/21] Update values.yaml --- .../eshoponabp/charts/authserver/values.yaml | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index 19fe07a4..c498a1ea 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -1,20 +1,28 @@ config: - selfUrl: https://demomicro-st-authserver.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 - allowedRedirectUrls: https://admin.eshoponabp.com + selfUrl: # https://eshop-st-authserver + corsOrigins: # https://eshop-st-identity,https://eshop-st-administration + allowedRedirectUrls: https://eshop-st-web + connectionStrings: + administrationService: # + identityService: # authServer: - authority: https://demomicro-st-authserver.eshoponabp.com + authority: http://eshop-st-authserver 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 + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: # + redisHost: # + rabbitmqHost: # + elasticsearchHost: # + stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 + ingress: - host: demomicro-st-authserver.eshoponabp.com + host: eshop-st-authserver tlsSecret: eshop-wildcard-tls + image: - repository: "volocr.azurecr.io/demomicro/app-authserver" - tag: 1.0.0 \ No newline at end of file + repository: eshoponabp/app-authserver + tag: latest + pullPolicy: IfNotPresent + +env: {} \ No newline at end of file From f0d2944a973a9f950327995f102e754f53c503a1 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 16 Aug 2022 14:31:30 +0300 Subject: [PATCH 13/21] Create values-st.yaml --- .../charts/authserver/values-st.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 etc/k8s/eshoponabp/charts/authserver/values-st.yaml diff --git a/etc/k8s/eshoponabp/charts/authserver/values-st.yaml b/etc/k8s/eshoponabp/charts/authserver/values-st.yaml new file mode 100644 index 00000000..dd1b9215 --- /dev/null +++ b/etc/k8s/eshoponabp/charts/authserver/values-st.yaml @@ -0,0 +1,20 @@ +config: + selfUrl: https://demomicro-st-authserver.eshoponabp.com + corsOrigins: https://demomicro-st-gateway.eshoponabp.com,https://demomicro-st-gateway-public.eshoponabp.com,https://demomicro-st-identity.eshoponabp.com,https://demomicro-st-administration.eshoponabp.com,https://demomicro-st-basket.eshoponabp.com,https://demomicro-st-catalog.eshoponabp.com,https://demomicro-st-order.eshoponabp.com,https://demomicro-st-payment.eshoponabp.com,https://demomicro-st-admin.eshoponabp.com,https://demomicro-st-eshoponabp.com + allowedRedirectUrls: https://demomicro-st-admin.eshoponabp.com + authServer: + authority: https://demomicro-st-authserver.eshoponabp.com + requireHttpsMetadata: "false" + connectionStrings: + administrationService: "Host=postgresdb-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + identityService: "Host=postgresdb-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" + dotnetEnv: Production + redisHost: redis-redis + rabbitmqHost: rabbitmq-rabbitmq + elasticsearchHost: elasticsearch-elasticsearch +ingress: + host: demomicro-st-authserver.eshoponabp.com + tlsSecret: eshop-wildcard-tls +image: + repository: "volocr.azurecr.io/demomicro/app-authserver" + tag: 1.0.0 \ No newline at end of file From fd3e56bc88947fb8f9ae718fdb56e254777b8c1a Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 16 Aug 2022 16:50:54 +0300 Subject: [PATCH 14/21] Update values-st.yaml --- etc/k8s/eshoponabp/charts/authserver/values-st.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/k8s/eshoponabp/charts/authserver/values-st.yaml b/etc/k8s/eshoponabp/charts/authserver/values-st.yaml index dd1b9215..758862d9 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values-st.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values-st.yaml @@ -17,4 +17,4 @@ ingress: tlsSecret: eshop-wildcard-tls image: repository: "volocr.azurecr.io/demomicro/app-authserver" - tag: 1.0.0 \ No newline at end of file + tag: 1.0.1 \ No newline at end of file From 2f535d7d57c4e5ead6de4b0087427d54f157fa21 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 25 Aug 2022 16:35:53 +0300 Subject: [PATCH 15/21] updated version --- etc/k8s/eshoponabp/Chart.yaml | 4 ++-- etc/k8s/eshoponabp/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/k8s/eshoponabp/Chart.yaml b/etc/k8s/eshoponabp/Chart.yaml index a1801db0..72fc48c7 100644 --- a/etc/k8s/eshoponabp/Chart.yaml +++ b/etc/k8s/eshoponabp/Chart.yaml @@ -15,10 +15,10 @@ 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. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 1.0.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. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "1.0.0" diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index 9d0ae40b..dafd7bd6 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -269,7 +269,7 @@ ordering: tlsSecret: eshop-wildcard-tls image: repository: "ghcr.io/volosoft/eshoponabp/service-ordering" - tag: 1.0.0 + tag: 1.0.1 # payment-service sub-chart override payment: From 6213c80aa785da458c262343e70c45c88937a3e0 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 25 Aug 2022 17:24:57 +0300 Subject: [PATCH 16/21] Update README.md --- etc/k8s/eshoponabp/README.md | 72 +++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 6 deletions(-) diff --git a/etc/k8s/eshoponabp/README.md b/etc/k8s/eshoponabp/README.md index d8232887..be3a3d1a 100644 --- a/etc/k8s/eshoponabp/README.md +++ b/etc/k8s/eshoponabp/README.md @@ -3,20 +3,80 @@ # eShopOnAbp This project is a reference for who want to build microservice solutions with the ABP Framework. -## Usage +## Pre-requirement -[Helm](https://helm.sh) must be installed to use the charts. +* [Helm](https://helm.sh) must be installed to use the charts. Please refer to Helm's [documentation](https://helm.sh/docs/) to get started. +* Install [NGINX ingress](https://kubernetes.github.io/ingress-nginx/deploy/) for k8s or Install NGINX ingress using helm + ```powershell + helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx + helm repo update + + helm upgrade --install --version=4.0.19 ingress-nginx ingress-nginx/ingress-nginx + ``` Once Helm is set up properly, add the repo as follows: ```console -helm repo add eshoponabp https://abpframework.github.io/abp-charts/eshoponabp +helm repo add abp-charts https://abpframework.github.io/abp-charts/eshoponabp ``` -You can then run `helm search repo eshoponabp` to see the charts. +Initial authentication data (redirectURIs etc) are seeded based on **eshop-st** name and **eshop** namespace for the deployment. +## Configuring HTTPS -```console - helm install eshop-st eshoponabp/eshoponabp +You can also run the staging solution on your local Kubernetes Cluster with HTTPS. There are various ways to create self-signed certificate. + +### Installing mkcert +This guide will use mkcert to create self-signed certificates. + +Follow the [installation guide](https://github.com/FiloSottile/mkcert#installation) to install mkcert. + +### Creating mkcert Root CA +Use the command to create root (local) certificate authority for your certificates: +```powershell +mkcert -install +``` + +**Note:** all the certificates created by mkcert certificate creation will be trusted by local machine + +### Run mkcert + +Create certificate for the eshopOnAbp domains using the mkcert command below: +```powershell +mkcert "eshop-st-web" "eshop-st-public-web" "eshop-st-authserver" "eshop-st-identity" "eshop-st-administration" "eshop-st-basket" "eshop-st-catalog" "eshop-st-ordering" "eshop-st-payment" "eshop-st-gateway-web" "eshop-st-gateway-web-public" ``` + +At the end of the output you will see something like + +The certificate is at "./eshop-st-web+10.pem" and the key at "./eshop-st-web+10-key.pem" + +Copy the cert name and key name below to create tls secret + +```powershell +kubectl create namespace eshop +kubectl create secret tls -n eshop eshop-wildcard-tls --cert=./eshop-st-web+10.pem --key=./eshop-st-web+10-key.pem +``` + +## How to run? + +* Add entries to the hosts file (in Windows: `C:\Windows\System32\drivers\etc\hosts`, in linux and macos: `/etc/hosts` ): + + ````powershell + 127.0.0.1 eshop-st-web + 127.0.0.1 eshop-st-public-web + 127.0.0.1 eshop-st-authserver + 127.0.0.1 eshop-st-identity + 127.0.0.1 eshop-st-administration + 127.0.0.1 eshop-st-basket + 127.0.0.1 eshop-st-catalog + 127.0.0.1 eshop-st-ordering + 127.0.0.1 eshop-st-payment + 127.0.0.1 eshop-st-gateway-web + 127.0.0.1 eshop-st-gateway-web-public + ```` + +* Run `helm upgrade --install eshop-st abp-charts/eshoponabp --namespace eshop --create-namespace` +* *You may wait ~30 seconds on first run for preparing the database*. +* Browse https://eshop-st-public-web for public and https://eshop-st-web for web application +* Username: `admin`, password: `1q2w3E*`. From 01c3d7720b6d812dc5cc6f8e5428fc63a2ed4fb3 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 29 Aug 2022 13:54:19 +0300 Subject: [PATCH 17/21] Update push-images-ghcr.sh --- etc/k8s/azure/scripts/push-images-ghcr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/k8s/azure/scripts/push-images-ghcr.sh b/etc/k8s/azure/scripts/push-images-ghcr.sh index b97b8f78..c28e8629 100755 --- a/etc/k8s/azure/scripts/push-images-ghcr.sh +++ b/etc/k8s/azure/scripts/push-images-ghcr.sh @@ -30,7 +30,7 @@ docker tag eshoponabp/service-catalog:"${version}" ghcr.io/volosoft/eshoponabp/s 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 push ghcr.io/volosoft/eshoponabp/service-ordering:"1.0.1" 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 b4aff30d9bdcbbffbef70ec6ed3d7c166cf431a2 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 29 Aug 2022 14:52:34 +0300 Subject: [PATCH 18/21] create artifacthub values yaml --- etc/k8s/eshoponabp/values.artifacthub.yaml | 379 +++++++++++++++++++++ 1 file changed, 379 insertions(+) create mode 100644 etc/k8s/eshoponabp/values.artifacthub.yaml diff --git a/etc/k8s/eshoponabp/values.artifacthub.yaml b/etc/k8s/eshoponabp/values.artifacthub.yaml new file mode 100644 index 00000000..329b9abd --- /dev/null +++ b/etc/k8s/eshoponabp/values.artifacthub.yaml @@ -0,0 +1,379 @@ +# auth-server sub-chart override +authserver: + config: + selfUrl: https://eshop-st-authserver + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-basket,https://eshop-st-catalog,https://eshop-st-ordering,https://eshop-st-payment,https://eshop-st-web,https://eshop-st-public-web + allowedRedirectUrls: https://eshop-st-web + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + connectionStrings: + administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + ingress: + host: eshop-st-authserver + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/app-authserver" + tag: 1.0.0 + +# web sub-chart override +web: + config: + selfUrl: https://eshop-st-web + gatewayUrl: https://eshop-st-gateway-web + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: false + responseType: "code" + strictDiscoveryDocumentValidation: false + skipIssuerCheck: true + ingress: + host: eshop-st-web + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/app-web" + tag: 1.0.0 + +# public-web sub-chart override +public-web: + config: + selfUrl: https://eshop-st-public-web + gatewayUrl: http://eshop-st-gateway-web-public/ + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + isOnProd: "false" + metaAddress: http://eshop-st-authserver + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + ingress: + host: eshop-st-public-web + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" + tag: 1.0.0 + +# identity-service sub-chart override +identity: + config: + selfUrl: https://eshop-st-identity + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + connectionStrings: + identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" + administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + identityServerClients: # Seeded Clients + webRootUrl: https://eshop-st-web/ + publicWebRootUrl: https://eshop-st-public-web/ + webGatewayRootUrl: https://eshop-st-gateway-web/ + publicWebGatewayRootUrl: https://eshop-st-gateway-web-public/ + identityServiceRootUrl: https://eshop-st-identity/ + administrationServiceRootUrl: https://eshop-st-administration/ + accountServiceRootUrl: https://eshop-st-authserver/ + basketServiceRootUrl: https://eshop-st-basket/ + catalogServiceRootUrl: https://eshop-st-catalog/ + orderingServiceRootUrl: https://eshop-st-ordering/ + paymentServiceRootUrl: https://eshop-st-payment/ + ingress: + host: eshop-st-identity + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/service-identity" + tag: 1.0.0 + +# administration sub-chart override +administration: + config: + selfUrl: https://eshop-st-administration + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal + connectionStrings: + administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + remoteServices: + abpIdentityBaseUrl: https://eshop-st-identity + useCurrentToken: "false" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions + authority: https://eshop-st-authserver + ingress: + host: eshop-st-administration + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/service-administration" + tag: 1.0.0 + +# gateway-web sub-chart override +gateway-web: + config: + selfUrl: https://eshop-st-gateway-web + corsOrigins: https://eshop-st-web + globalConfigurationBaseUrl: http://eshop-st-gateway-public + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + ingress: + host: eshop-st-gateway-web + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/gateway-web" + tag: 1.0.0 + reRoutes: + accountService: + url: http://eshop-st-authserver + identityService: + url: http://eshop-st-identity + administrationService: + url: http://eshop-st-administration + catalogService: + url: http://eshop-st-catalog + orderingService: + url: http://eshop-st-ordering + +# gateway-web-public sub-chart override +gateway-web-public: + config: + selfUrl: https://eshop-st-gateway-web-public + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + ingress: + host: eshop-st-gateway-web-public + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" + tag: 1.0.0 + reRoutes: + accountService: + url: http://eshop-st-authserver + identityService: + url: http://eshop-st-identity + administrationService: + url: http://eshop-st-administration + catalogService: + url: http://eshop-st-catalog + basketService: + url: http://eshop-st-basket + orderingService: + url: http://eshop-st-ordering + paymentService: + url: http://eshop-st-payment + +# basket-service sub-chart override +basket: + config: + selfUrl: https://eshop-st-basket + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-public-web + connectionStrings: + administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + remoteServices: + catalogBaseUrl: http://eshop-st-catalog:80 + catalogGrpcUrl: http://eshop-st-catalog:81 + ingress: + host: eshop-st-basket + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/service-basket" + tag: 1.0.0 + +# catalog-service sub-chart override +catalog: + config: + selfUrl: https://eshop-st-catalog + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-public-web,https://eshop-st-web + connectionStrings: + catalogService: "mongodb://eshop-st-mongodb/EShopOnAbp_Catalog" + administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + kestrel: + httpUrl: http://eshop-st-catalog:80 + httpProtocols: Http1AndHttp2 + grpcUrl: http://eshop-st-catalog:81 + grpcProtocols: Http2 + ingress: + host: eshop-st-catalog + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/service-catalog" + tag: 1.0.0 + +# ordering-service sub-chart override +ordering: + config: + selfUrl: https://eshop-st-ordering + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + connectionStrings: + orderingService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;User ID=postgres;password=myPassw0rd;Pooling=false" + administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + ingress: + host: eshop-st-ordering + tlsSecret: eshop-wildcard-tls + image: + repository: "ghcr.io/volosoft/eshoponabp/service-ordering" + tag: 1.0.1 + +# payment-service sub-chart override +payment: + config: + selfUrl: https://eshop-st-payment + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + connectionStrings: + paymentService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Payment;User ID=postgres;password=myPassw0rd;Pooling=false" + administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" + dotnetEnv: Staging + redisHost: eshop-st-redis + rabbitmqHost: eshop-st-rabbitmq + elasticsearchHost: eshop-st-elasticsearch + ingress: + host: eshop-st-payment + tlsSecret: eshop-wildcard-tls + 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: {} + +tolerations: [] + +affinity: {} \ No newline at end of file From 7f6676a02e17f61f08aeb10ce1c7b0f4d01ca0dd Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 29 Aug 2022 14:53:31 +0300 Subject: [PATCH 19/21] updated values yaml files --- etc/k8s/azure/scripts/values.azure.st.yaml | 370 ------------------ etc/k8s/eshoponabp/README.md | 2 +- .../scripts => eshoponabp}/values.azure.yaml | 0 etc/k8s/eshoponabp/values.yaml | 30 +- 4 files changed, 17 insertions(+), 385 deletions(-) delete mode 100644 etc/k8s/azure/scripts/values.azure.st.yaml rename etc/k8s/{azure/scripts => eshoponabp}/values.azure.yaml (100%) diff --git a/etc/k8s/azure/scripts/values.azure.st.yaml b/etc/k8s/azure/scripts/values.azure.st.yaml deleted file mode 100644 index 847c08c4..00000000 --- a/etc/k8s/azure/scripts/values.azure.st.yaml +++ /dev/null @@ -1,370 +0,0 @@ -# auth-server sub-chart override -authserver: - config: - selfUrl: https://demomicro-st-authserver.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 - allowedRedirectUrls: https://admin.eshoponabp.com - authServer: - authority: https://demomicro-st-authserver.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 - ingress: - host: demomicro-st-authserver.eshoponabp.com - tlsSecret: eshop-wildcard-tls - image: - repository: "volocr.azurecr.io/demomicro/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 - ingress: - host: admin.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/app-web" - tag: 1.0.5 - -# 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 - - ingress: - host: eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/app-publicweb" - tag: 1.0.6 - -# 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 - paymentServiceRootUrl: https://payment.eshoponabp.com - ingress: - host: identity.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-identity" - tag: 1.0.5 - -# 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 - ingress: - host: administration.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-administration" - tag: 1.0.5 - -# 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 - ingress: - host: gateway.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/gateway-web" - tag: 1.0.5 - 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 - -# 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 - ingress: - host: gateway-public.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/gateway-web-public" - tag: 1.0.5 - 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 - 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 - ingress: - host: basket.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-basket" - tag: 1.0.5 - -# 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: "volocr.azurecr.io/eshoponabp/service-catalog" - tag: 1.0.5 - -# 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 - ingress: - host: order.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-ordering" - tag: 1.0.5 - -# 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 - ingress: - host: payment.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-payment" - tag: 1.0.5 - -# 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: {} - -tolerations: [] - -affinity: {} \ No newline at end of file diff --git a/etc/k8s/eshoponabp/README.md b/etc/k8s/eshoponabp/README.md index be3a3d1a..64ebf43e 100644 --- a/etc/k8s/eshoponabp/README.md +++ b/etc/k8s/eshoponabp/README.md @@ -76,7 +76,7 @@ kubectl create secret tls -n eshop eshop-wildcard-tls --cert=./eshop-st-web+10.p 127.0.0.1 eshop-st-gateway-web-public ```` -* Run `helm upgrade --install eshop-st abp-charts/eshoponabp --namespace eshop --create-namespace` +* Run `helm upgrade --install eshop-st abp-charts/eshoponabp -f ./eshoponabp/values.artifacthub.yaml --namespace eshop --create-namespace` * *You may wait ~30 seconds on first run for preparing the database*. * Browse https://eshop-st-public-web for public and https://eshop-st-web for web application * Username: `admin`, password: `1q2w3E*`. diff --git a/etc/k8s/azure/scripts/values.azure.yaml b/etc/k8s/eshoponabp/values.azure.yaml similarity index 100% rename from etc/k8s/azure/scripts/values.azure.yaml rename to etc/k8s/eshoponabp/values.azure.yaml diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index dafd7bd6..cc837965 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -7,6 +7,8 @@ authserver: authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" @@ -18,7 +20,7 @@ authserver: host: eshop-st-authserver tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-authserver" + repository: "eshoponabp/app-authserver" tag: 1.0.0 # web sub-chart override @@ -36,13 +38,13 @@ web: host: eshop-st-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-web" + repository: "eshoponabp/app-web" tag: 1.0.0 # public-web sub-chart override public-web: config: - selfUrl: c + selfUrl: https://eshop-st-public-web gatewayUrl: http://eshop-st-gateway-web-public/ authServer: authority: http://eshop-st-authserver @@ -57,7 +59,7 @@ public-web: host: eshop-st-public-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" + repository: "eshoponabp/app-publicweb" tag: 1.0.0 # identity-service sub-chart override @@ -93,14 +95,14 @@ identity: host: eshop-st-identity tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-identity" + repository: "eshoponabp/service-identity" tag: 1.0.0 # administration sub-chart override administration: config: selfUrl: https://eshop-st-administration - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" authServer: @@ -121,7 +123,7 @@ administration: host: eshop-st-administration tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-administration" + repository: "eshoponabp/service-administration" tag: 1.0.0 # gateway-web sub-chart override @@ -143,7 +145,7 @@ gateway-web: host: eshop-st-gateway-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web" + repository: "eshoponabp/gateway-web" tag: 1.0.0 reRoutes: accountService: @@ -174,7 +176,7 @@ gateway-web-public: host: eshop-st-gateway-web-public tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" + repository: "eshoponabp/gateway-web-public" tag: 1.0.0 reRoutes: accountService: @@ -215,7 +217,7 @@ basket: host: eshop-st-basket tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-basket" + repository: "eshoponabp/service-basket" tag: 1.0.0 # catalog-service sub-chart override @@ -244,7 +246,7 @@ catalog: host: eshop-st-catalog tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-catalog" + repository: "eshoponabp/service-catalog" tag: 1.0.0 # ordering-service sub-chart override @@ -268,8 +270,8 @@ ordering: host: eshop-st-ordering tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-ordering" - tag: 1.0.1 + repository: "eshoponabp/service-ordering" + tag: 1.0.0 # payment-service sub-chart override payment: @@ -292,7 +294,7 @@ payment: host: eshop-st-payment tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-payment" + repository: "eshoponabp/service-payment" tag: 1.0.0 # Default values for eshoponabp. From bfbe5bc5a2acdeeaf86b615b084955be71d2cb7f Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 5 Sep 2022 17:16:47 +0300 Subject: [PATCH 20/21] changed names of values file --- ...values.artifacthub.yaml => values.st.yaml} | 28 ++++++++++--------- etc/k8s/eshoponabp/values.yaml | 28 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) rename etc/k8s/eshoponabp/{values.artifacthub.yaml => values.st.yaml} (94%) diff --git a/etc/k8s/eshoponabp/values.artifacthub.yaml b/etc/k8s/eshoponabp/values.st.yaml similarity index 94% rename from etc/k8s/eshoponabp/values.artifacthub.yaml rename to etc/k8s/eshoponabp/values.st.yaml index 329b9abd..cc837965 100644 --- a/etc/k8s/eshoponabp/values.artifacthub.yaml +++ b/etc/k8s/eshoponabp/values.st.yaml @@ -7,6 +7,8 @@ authserver: authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" @@ -18,7 +20,7 @@ authserver: host: eshop-st-authserver tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-authserver" + repository: "eshoponabp/app-authserver" tag: 1.0.0 # web sub-chart override @@ -36,7 +38,7 @@ web: host: eshop-st-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-web" + repository: "eshoponabp/app-web" tag: 1.0.0 # public-web sub-chart override @@ -57,7 +59,7 @@ public-web: host: eshop-st-public-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" + repository: "eshoponabp/app-publicweb" tag: 1.0.0 # identity-service sub-chart override @@ -93,14 +95,14 @@ identity: host: eshop-st-identity tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-identity" + repository: "eshoponabp/service-identity" tag: 1.0.0 # administration sub-chart override administration: config: selfUrl: https://eshop-st-administration - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" authServer: @@ -121,7 +123,7 @@ administration: host: eshop-st-administration tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-administration" + repository: "eshoponabp/service-administration" tag: 1.0.0 # gateway-web sub-chart override @@ -143,7 +145,7 @@ gateway-web: host: eshop-st-gateway-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web" + repository: "eshoponabp/gateway-web" tag: 1.0.0 reRoutes: accountService: @@ -174,7 +176,7 @@ gateway-web-public: host: eshop-st-gateway-web-public tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" + repository: "eshoponabp/gateway-web-public" tag: 1.0.0 reRoutes: accountService: @@ -215,7 +217,7 @@ basket: host: eshop-st-basket tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-basket" + repository: "eshoponabp/service-basket" tag: 1.0.0 # catalog-service sub-chart override @@ -244,7 +246,7 @@ catalog: host: eshop-st-catalog tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-catalog" + repository: "eshoponabp/service-catalog" tag: 1.0.0 # ordering-service sub-chart override @@ -268,8 +270,8 @@ ordering: host: eshop-st-ordering tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-ordering" - tag: 1.0.1 + repository: "eshoponabp/service-ordering" + tag: 1.0.0 # payment-service sub-chart override payment: @@ -292,7 +294,7 @@ payment: host: eshop-st-payment tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-payment" + repository: "eshoponabp/service-payment" tag: 1.0.0 # Default values for eshoponabp. diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index cc837965..329b9abd 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -7,8 +7,6 @@ authserver: authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" @@ -20,7 +18,7 @@ authserver: host: eshop-st-authserver tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-authserver" + repository: "ghcr.io/volosoft/eshoponabp/app-authserver" tag: 1.0.0 # web sub-chart override @@ -38,7 +36,7 @@ web: host: eshop-st-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-web" + repository: "ghcr.io/volosoft/eshoponabp/app-web" tag: 1.0.0 # public-web sub-chart override @@ -59,7 +57,7 @@ public-web: host: eshop-st-public-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/app-publicweb" + repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" tag: 1.0.0 # identity-service sub-chart override @@ -95,14 +93,14 @@ identity: host: eshop-st-identity tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-identity" + repository: "ghcr.io/volosoft/eshoponabp/service-identity" tag: 1.0.0 # administration sub-chart override administration: config: selfUrl: https://eshop-st-administration - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" authServer: @@ -123,7 +121,7 @@ administration: host: eshop-st-administration tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-administration" + repository: "ghcr.io/volosoft/eshoponabp/service-administration" tag: 1.0.0 # gateway-web sub-chart override @@ -145,7 +143,7 @@ gateway-web: host: eshop-st-gateway-web tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/gateway-web" + repository: "ghcr.io/volosoft/eshoponabp/gateway-web" tag: 1.0.0 reRoutes: accountService: @@ -176,7 +174,7 @@ gateway-web-public: host: eshop-st-gateway-web-public tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/gateway-web-public" + repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" tag: 1.0.0 reRoutes: accountService: @@ -217,7 +215,7 @@ basket: host: eshop-st-basket tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-basket" + repository: "ghcr.io/volosoft/eshoponabp/service-basket" tag: 1.0.0 # catalog-service sub-chart override @@ -246,7 +244,7 @@ catalog: host: eshop-st-catalog tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-catalog" + repository: "ghcr.io/volosoft/eshoponabp/service-catalog" tag: 1.0.0 # ordering-service sub-chart override @@ -270,8 +268,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: 1.0.1 # payment-service sub-chart override payment: @@ -294,7 +292,7 @@ payment: host: eshop-st-payment tlsSecret: eshop-wildcard-tls image: - repository: "eshoponabp/service-payment" + repository: "ghcr.io/volosoft/eshoponabp/service-payment" tag: 1.0.0 # Default values for eshoponabp. From 65b925866ed938199fad8ec73cde1e5f3c3e43b4 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 5 Sep 2022 17:21:04 +0300 Subject: [PATCH 21/21] Update README.md --- etc/k8s/eshoponabp/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/k8s/eshoponabp/README.md b/etc/k8s/eshoponabp/README.md index 64ebf43e..be3a3d1a 100644 --- a/etc/k8s/eshoponabp/README.md +++ b/etc/k8s/eshoponabp/README.md @@ -76,7 +76,7 @@ kubectl create secret tls -n eshop eshop-wildcard-tls --cert=./eshop-st-web+10.p 127.0.0.1 eshop-st-gateway-web-public ```` -* Run `helm upgrade --install eshop-st abp-charts/eshoponabp -f ./eshoponabp/values.artifacthub.yaml --namespace eshop --create-namespace` +* Run `helm upgrade --install eshop-st abp-charts/eshoponabp --namespace eshop --create-namespace` * *You may wait ~30 seconds on first run for preparing the database*. * Browse https://eshop-st-public-web for public and https://eshop-st-web for web application * Username: `admin`, password: `1q2w3E*`.