From fdad18eecc79b0fceea03c40f1d16fd96fbc2a4d Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Wed, 10 Jan 2024 21:27:53 -0500 Subject: [PATCH] Update values.yaml --- etc/k8s/eshoponabp/values.yaml | 116 ++++++++++++++++----------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index 71b4bc9a..ed057651 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -10,7 +10,7 @@ keycloak: keycloakAdminPassword: 1q2w3E* kcHealthEnabled: true ingress: - host: eshop-st-keycloak + host: account.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: quay.io/keycloak/keycloak @@ -20,16 +20,16 @@ keycloak: # web sub-chart override web: config: - selfUrl: https://eshop-st-web - gatewayUrl: https://eshop-st-gateway-web + selfUrl: https://admin.eshoponabp.dev + gatewayUrl: https://gateway-web.eshoponabp.dev authServer: - authority: http://eshop-st-keycloak + authority: https://account.eshoponabp.dev requireHttpsMetadata: false responseType: "code" strictDiscoveryDocumentValidation: false skipIssuerCheck: true ingress: - host: eshop-st-web + host: admin.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/app-web" @@ -38,10 +38,10 @@ web: # public-web sub-chart override public-web: config: - selfUrl: https://eshop-st-public-web - gatewayUrl: http://eshop-st-gateway-web-public/ + selfUrl: https://eshoponabp.dev + gatewayUrl: https://gateway-public.eshoponabp.dev/ authServer: - authority: http://eshop-st-keycloak + authority: https://account.eshoponabp.dev requireHttpsMetadata: "false" isOnProd: "false" metaAddress: http://eshop-st-keycloak @@ -50,7 +50,7 @@ public-web: rabbitmqHost: eshop-st-rabbitmq elasticsearchHost: eshop-st-elasticsearch ingress: - host: eshop-st-public-web + host: eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/app-publicweb" @@ -59,8 +59,8 @@ public-web: # identity-service sub-chart override identity: config: - selfUrl: https://eshop-st-identity - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + selfUrl: https://identity.eshoponabp.dev + corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev 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" @@ -74,20 +74,20 @@ identity: 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/ - cmskitServiceRootUrl: https://eshop-st-cmskit/ - paymentServiceRootUrl: https://eshop-st-payment/ + webRootUrl: https://admin.eshoponabp.dev/ + publicWebRootUrl: https://eshoponabp.dev/ + webGatewayRootUrl: https://gateway-web.eshoponabp.dev/ + publicWebGatewayRootUrl: https://gateway-public.eshoponabp.dev/ + identityServiceRootUrl: https://identity.eshoponabp.dev/ + administrationServiceRootUrl: https://administration.eshoponabp.dev/ + accountServiceRootUrl: https://account.eshoponabp.dev/ + basketServiceRootUrl: https://basket.eshoponabp.dev/ + catalogServiceRootUrl: https://catalog.eshoponabp.dev/ + orderingServiceRootUrl: https://ordering.eshoponabp.dev/ + cmskitServiceRootUrl: https://cmskit.eshoponabp.dev/ + paymentServiceRootUrl: https://payment.eshoponabp.dev/ ingress: - host: eshop-st-identity + host: identity.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-identity" @@ -96,8 +96,8 @@ identity: # administration sub-chart override administration: config: - selfUrl: https://eshop-st-administration - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + selfUrl: https://administration.eshoponabp.dev + corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" authServer: @@ -106,16 +106,16 @@ administration: swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" remoteServices: - abpIdentityBaseUrl: https://eshop-st-identity + abpIdentityBaseUrl: https://identity.eshoponabp.dev 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 + authority: https://account.eshoponabp.dev ingress: - host: eshop-st-administration + host: administration.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-administration" @@ -124,9 +124,9 @@ administration: # 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 + selfUrl: https://gateway-web.eshoponabp.dev + corsOrigins: https://admin.eshoponabp.dev + globalConfigurationBaseUrl: http://eshop-st-gateway-web-public authServer: authority: http://eshop-st-keycloak requireHttpsMetadata: "false" @@ -137,7 +137,7 @@ gateway-web: rabbitmqHost: eshop-st-rabbitmq elasticsearchHost: eshop-st-elasticsearch ingress: - host: eshop-st-gateway-web + host: gateway-web.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/gateway-web" @@ -159,7 +159,7 @@ gateway-web: # gateway-web-public sub-chart override gateway-web-public: config: - selfUrl: https://eshop-st-gateway-web-public + selfUrl: https://gateway-public.eshoponabp.dev authServer: authority: http://eshop-st-keycloak requireHttpsMetadata: "false" @@ -170,14 +170,12 @@ gateway-web-public: rabbitmqHost: eshop-st-rabbitmq elasticsearchHost: eshop-st-elasticsearch ingress: - host: eshop-st-gateway-web-public + host: gateway-public.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/gateway-web-public" tag: 1.0.0 reRoutes: - accountService: - url: http://eshop-st-keycloak identityService: url: http://eshop-st-identity administrationService: @@ -191,13 +189,13 @@ gateway-web-public: cmskitService: url: http://eshop-st-cmskit paymentService: - url: http://eshop-st-payment + 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 + selfUrl: https://basket.eshoponabp.dev + corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev,https://eshoponabp.dev connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" authServer: @@ -213,7 +211,7 @@ basket: catalogBaseUrl: http://eshop-st-catalog:80 catalogGrpcUrl: http://eshop-st-catalog:81 ingress: - host: eshop-st-basket + host: basket.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-basket" @@ -222,8 +220,8 @@ basket: # 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 + selfUrl: https://catalog.eshoponabp.dev + corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev,https://eshoponabp.dev,https://admin.eshoponabp.dev 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" @@ -242,7 +240,7 @@ catalog: grpcUrl: http://eshop-st-catalog:81 grpcProtocols: Http2 ingress: - host: eshop-st-catalog + host: catalog.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-catalog" @@ -251,8 +249,8 @@ catalog: # ordering-service sub-chart override ordering: config: - selfUrl: https://eshop-st-ordering - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + selfUrl: https://ordering.eshoponabp.dev + corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev 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" @@ -266,7 +264,7 @@ ordering: rabbitmqHost: eshop-st-rabbitmq elasticsearchHost: eshop-st-elasticsearch ingress: - host: eshop-st-ordering + host: ordering.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-ordering" @@ -275,10 +273,10 @@ ordering: # cmskit-service sub-chart override cmskit: config: - selfUrl: https://eshop-st-cmskit - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + selfUrl: https://cmskit.eshoponabp.dev + corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev connectionStrings: - cmskitService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false" + cmskitervice: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;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-keycloak @@ -286,25 +284,25 @@ cmskit: swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" remoteServices: - abpIdentityBaseUrl: https://eshop-st-identity + abpIdentityBaseUrl: https://identity.eshoponabp.dev 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 + authority: https://admin.eshoponabp.dev ingress: - host: eshop-st-cmskit + host: cmskit.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-cmskit" - tag: 1.0.1 + repository: "eshoponabp/service-cmskit" + tag: 1.0.0 # payment-service sub-chart override payment: config: - selfUrl: https://eshop-st-payment - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public + selfUrl: https://payment.eshoponabp.dev + corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev 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" @@ -313,12 +311,14 @@ payment: requireHttpsMetadata: "false" swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" + remoteServices: + abpIdentityBaseUrl: https://identity.eshoponabp.dev dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq elasticsearchHost: eshop-st-elasticsearch ingress: - host: eshop-st-payment + host: payment.eshoponabp.dev tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-payment"