diff --git a/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml b/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml index ec5107b2..3ac0b8fe 100644 --- a/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml @@ -28,9 +28,9 @@ spec: - name: App__RedirectAllowedUrls value: "{{ .Values.config.allowedRedirectUrls }}" - name: "ConnectionStrings__IdentityService" - value: "{{ .Values.config.identityService.connString }}" + value: "{{ .Values.config.connectionStrings.identityService }}" - name: "ConnectionStrings__AdministrationService" - value: "{{ .Values.config.administrationService.connString }}" + value: "{{ .Values.config.connectionStrings.administrationService }}" - name: "DOTNET_ENVIRONMENT" value: "{{ .Values.config.dotnetEnv }}" - name: "Redis__Configuration" diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml index fb08bbec..d80adc30 100644 --- a/etc/k8s/eshoponabp/charts/authserver/values.yaml +++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml @@ -2,10 +2,9 @@ config: selfUrl: # https://eshop-st-authserver corsOrigins: # https://eshop-st-identity,https://eshop-st-administration allowedRedirectUrls: https://eshop-st-web - identityService: - connString: # - administrationService: - connString: # + connectionStrings: + administrationService: # + identityService: # dotnetEnv: # redisHost: # rabbitmqHost: # diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index 35640471..1cbd9878 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -4,10 +4,9 @@ authserver: selfUrl: https://eshop-st-authserver corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal allowedRedirectUrls: https://eshop-st-web - identityService: - connString: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Identity;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" - administrationService: - connString: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" + 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" dotnetEnv: Staging redisHost: es-st-redis rabbitmqHost: es-st-rabbitmq @@ -53,8 +52,8 @@ identity: selfUrl: https://eshop-st-identity corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public connectionStrings: - identityService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Identity;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" - administrationService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" + 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" authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" @@ -82,7 +81,7 @@ administration: gatewayUrl: https://eshop-st-gateway-internal/ corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal connectionStrings: - administrationService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" + administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false"