us1zcljz
/
eShopOnAbp
forked from tsai/eShopOnAbp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed helm deployment name

skoc10/publish-charts-artifacthub
Halil İbrahim Kalkan 4 years ago
parent
e1f11f99c3
commit
6413ef15c9
14 changed files with 74 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      apps/angular/yarn.lock
  2. 2
      etc/k8s/deploy-staging.ps1
  3. 4
      etc/k8s/eshoponabp/charts/administration/values.yaml
  4. 6
      etc/k8s/eshoponabp/charts/basket/values.yaml
  5. 6
      etc/k8s/eshoponabp/charts/catalog/values.yaml
  6. 6
      etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
  7. 6
      etc/k8s/eshoponabp/charts/identity/values.yaml
  8. 6
      etc/k8s/eshoponabp/charts/ordering/values.yaml
  9. 6
      etc/k8s/eshoponabp/charts/payment/values.yaml
  10. 6
      etc/k8s/eshoponabp/charts/public-web/values.yaml
  11. 84
      etc/k8s/eshoponabp/values.yaml
  12. 2
      gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
  13. 2
      gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs
  14. 2
      shared/EShopOnAbp.Shared.Hosting.Gateways/YarpSwaggerUIBuilderExtensions.cs

5
apps/angular/yarn.lock
View File

@ -7289,6 +7289,11 @@ postcss@^8.2.15, postcss@^8.2.4, postcss@^8.3.5, postcss@^8.3.7:
picocolors "^1.0.0"
source-map-js "^1.0.1"
prettier@^2.6.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
pretty-bytes@^5.3.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"

2
etc/k8s/deploy-staging.ps1
View File

@ -1 +1 @@
helm upgrade --install es-st eshoponabp --namespace eshop --create-namespace
helm upgrade --install eshop-st eshoponabp --namespace eshop --create-namespace

4
etc/k8s/eshoponabp/charts/administration/values.yaml
View File

@ -12,8 +12,8 @@ config:
abpIdentityBaseUrl: #
useCurrentToken: "false"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: #
stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8

6
etc/k8s/eshoponabp/charts/basket/values.yaml
View File

@ -9,9 +9,9 @@ config:
swaggerClientId: "WebGateway_Swagger"
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
remoteServices:
catalogBaseUrl: #

6
etc/k8s/eshoponabp/charts/catalog/values.yaml
View File

@ -10,9 +10,9 @@ config:
swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
grpcPort: 81
kestrel:

6
etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
View File

@ -6,9 +6,9 @@ config:
swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
reRoutes:
accountService:

6
etc/k8s/eshoponabp/charts/identity/values.yaml
View File

@ -10,9 +10,9 @@ config:
swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
# Seeded clients

6
etc/k8s/eshoponabp/charts/ordering/values.yaml
View File

@ -10,9 +10,9 @@ config:
swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
ingress:

6
etc/k8s/eshoponabp/charts/payment/values.yaml
View File

@ -10,9 +10,9 @@ config:
swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
ingress:

6
etc/k8s/eshoponabp/charts/public-web/values.yaml
View File

@ -5,9 +5,9 @@ config:
authority: http://eshop-st-authserver
requireHttpsMetadata: "false"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
ingress:

84
etc/k8s/eshoponabp/values.yaml
View File

@ -5,12 +5,12 @@ 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
allowedRedirectUrls: https://eshop-st-web
connectionStrings:
administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
identityService: "Host=es-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"
identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
ingress:
host: eshop-st-authserver
tlsSecret: eshop-wildcard-tls
@ -38,9 +38,9 @@ public-web:
authority: http://eshop-st-authserver
requireHttpsMetadata: "false"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
ingress:
host: eshop-st-public-web
image:
@ -53,17 +53,17 @@ identity:
selfUrl: https://eshop-st-identity
corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
connectionStrings:
identityService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
administrationService: "Host=es-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"
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: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
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/
@ -88,7 +88,7 @@ administration:
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=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;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"
@ -98,9 +98,9 @@ administration:
abpIdentityBaseUrl: https://eshop-st-identity
useCurrentToken: "false"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
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:
@ -121,9 +121,9 @@ gateway-web:
swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
ingress:
host: eshop-st-gateway-web
image:
@ -147,9 +147,9 @@ gateway-web-public:
swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging
redisHost: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
ingress:
host: eshop-st-gateway-web-public
image:
@ -177,16 +177,16 @@ basket:
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=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;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: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
remoteServices:
catalogBaseUrl: http://eshop-st-catalog
catalogGrpcUrl: http://eshop-st-catalog
@ -202,17 +202,17 @@ catalog:
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://es-st-mongodb/EShopOnAbp_Catalog"
administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
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: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
kestrel:
httpUrl: http://eshop-st-catalog:80
httpProtocols: Http1AndHttp2
@ -230,17 +230,17 @@ ordering:
selfUrl: https://eshop-st-ordering
corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
connectionStrings:
orderingService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;User ID=postgres;password=myPassw0rd;Pooling=false"
administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
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: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
ingress:
host: eshop-st-ordering
image:
@ -253,17 +253,17 @@ payment:
selfUrl: https://eshop-st-payment
corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
connectionStrings:
paymentService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Payment;User ID=postgres;password=myPassw0rd;Pooling=false"
administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
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: es-st-redis
rabbitmqHost: es-st-rabbitmq
elasticsearchHost: es-st-elasticsearch
redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch
ingress:
host: eshop-st-payment
image:

2
gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
View File

@ -53,7 +53,7 @@ public class EShopOnAbpWebPublicGatewayModule : AbpModule
app.UseCorrelationId();
app.UseAbpSerilogEnrichers();
app.ConfigureSwaggerUIWithYarp(context);
app.UseSwaggerUIWithYarp(context);
app.UseRewriter(new RewriteOptions()
// Regex for "", "/" and "" (whitespace)

2
gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs
View File

@ -73,7 +73,7 @@ public class EShopOnAbpWebGatewayModule : AbpModule
app.UseCorrelationId();
app.UseAbpSerilogEnrichers();
app.UseCors();
app.ConfigureSwaggerUIWithYarp(context);
app.UseSwaggerUIWithYarp(context);
app.UseRewriter(new RewriteOptions()
// Regex for "", "/" and "" (whitespace)

2
shared/EShopOnAbp.Shared.Hosting.Gateways/YarpSwaggerUIBuilderExtensions.cs
View File

@ -10,7 +10,7 @@ namespace EShopOnAbp.Shared.Hosting.Gateways;
public static class YarpSwaggerUIBuilderExtensions
{
public static IApplicationBuilder ConfigureSwaggerUIWithYarp(this IApplicationBuilder app,
public static IApplicationBuilder UseSwaggerUIWithYarp(this IApplicationBuilder app,
ApplicationInitializationContext context)
{
app.UseSwagger();

Write Preview
Loading…
Cancel
Save