diff --git a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml index 68e6679b..072eb431 100644 --- a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml @@ -23,49 +23,44 @@ spec: env: - name: App__SelfUrl value: "{{ .Values.config.selfUrl }}" - - name: RemoteServices__Default__BaseUrl - value: "{{ .Values.config.gatewayUrl }}" - name: App__CorsOrigins value: "{{ .Values.config.corsOrigins }}" - - name: IdentityClients__IdentityClients__Authority - value: "{{ .Values.config.identityClientAuthority }}" - name: "ConnectionStrings__IdentityService" - value: {{ .Values.config.connString }} + value: {{ .Values.config.connectionStrings.identityService }} - name: "ConnectionStrings__AdministrationService" - value: {{ .Values.config.administrationService.connString }} + value: {{ .Values.config.connectionStrings.administrationService }} - name: "ConnectionStrings__SaasService" - value: {{ .Values.config.saasService.connString }} + value: {{ .Values.config.connectionStrings.saasService }} - name: "DOTNET_ENVIRONMENT" value: "{{ .Values.config.dotnetEnv }}" - name: "Redis__Configuration" value: "{{ .Values.config.redisHost }}" - - name: "AuthServer__Authority" - value: "{{ .Values.config.authServerAuthority }}" - - name: "AuthServer__RequireHttpsMetadata" - value: "{{ .Values.config.authServerRequireHttpsMetadata }}" - - name: "StringEncryption__DefaultPassPhrase" - value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - name: "RabbitMQ__Connections__Default__HostName" value: "{{ .Values.config.rabbitmqHost }}" - name: "ElasticSearch__Url" - value: "{{ .Values.config.elasticsearchHost }}" + value: "{{ .Values.config.elasticsearchHost }}" + - name: "AuthServer__Authority" + value: "{{ .Values.config.authServer.authority }}" + - name: "AuthServer__RequireHttpsMetadata" + value: "{{ .Values.config.authServer.requireHttpsMetadata }}" + - name: "StringEncryption__DefaultPassPhrase" + value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - name: "IdentityServerClients__Web__RootUrl" - value: {{ .Values.config.identityServerClients.webRootUrl }} + value: {{ .Values.identityServerClients.webRootUrl }} - name: "IdentityServerClients__PublicWeb__RootUrl" - value: {{ .Values.config.identityServerClients.publicWebRootUrl }} + value: {{ .Values.identityServerClients.publicWebRootUrl }} - name: "IdentityServerClients__IdentityService__RootUrl" - value: {{ .Values.config.identityServerClients.identityServiceRootUrl }} + value: {{ .Values.identityServerClients.identityServiceRootUrl }} - name: "IdentityServerClients__SaasService__RootUrl" - value: {{ .Values.config.identityServerClients.saasServiceRootUrl }} + value: {{ .Values.identityServerClients.saasServiceRootUrl }} - name: "IdentityServerClients__AdministrationService__RootUrl" - value: {{ .Values.config.identityServerClients.administrationServiceRootUrl }} + value: {{ .Values.identityServerClients.administrationServiceRootUrl }} - name: "IdentityServerClients__InternalGateway__RootUrl" - value: {{ .Values.config.identityServerClients.webRootUrl }} + value: {{ .Values.identityServerClients.webRootUrl }} - name: "IdentityServerClients__PublicWebGateway__RootUrl" - value: {{ .Values.config.identityServerClients.publicWebRootUrl }} + value: {{ .Values.identityServerClients.publicWebRootUrl }} - name: "IdentityServerClients__WebGateway__RootUrl" - value: {{ .Values.config.identityServerClients.webGatewayRootUrl }} - + value: {{ .Values.identityServerClients.webGatewayRootUrl }} {{- if .Values.env }} {{ toYaml .Values.env | indent 8 }} {{- end }} diff --git a/etc/k8s/eshoponabp/charts/identity/values.yaml b/etc/k8s/eshoponabp/charts/identity/values.yaml index bf61dbe4..fb40c806 100644 --- a/etc/k8s/eshoponabp/charts/identity/values.yaml +++ b/etc/k8s/eshoponabp/charts/identity/values.yaml @@ -1,30 +1,31 @@ config: selfUrl: # https://eshop-st-identity corsOrigins: # https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal - identityClientAuthority: # https://eshop-st-authserver - connString: # - administrationService: - connString: # - saasService: - connString: # - dotnetEnv: # - redisHost: # - rabbitmqHost: # - elasticsearchHost: # - authServerAuthority: http://eshop-st-authserver - authServerRequireHttpsMetadata: "false" + connectionStrings: + identityService: # + administrationService: # + saasService: # + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + dotnetEnv: Staging + redisHost: es-st-redis + rabbitmqHost: es-st-rabbitmq + elasticsearchHost: es-st-elasticsearch stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 - identityServerClients: - webRootUrl: # - publicWebRootUrl: # - webGatewayRootUrl: # - publicWebGatewayRootUrl: # - identityServiceRootUrl: # - administrationServiceRootUrl: # - saasServiceRootUrl: # + +# Seeded clients +identityServerClients: + webRootUrl: # + publicWebRootUrl: # + webGatewayRootUrl: # + publicWebGatewayRootUrl: # + identityServiceRootUrl: # + administrationServiceRootUrl: # + saasServiceRootUrl: # ingress: - host: # eshop-st-identity + host: eshop-st-identity tlsSecret: eshop-demo-tls image: diff --git a/etc/k8s/eshoponabp/charts/saas/templates/saas-ingress.yaml b/etc/k8s/eshoponabp/charts/saas/templates/saas-ingress.yaml index d1c8904f..e843265f 100644 --- a/etc/k8s/eshoponabp/charts/saas/templates/saas-ingress.yaml +++ b/etc/k8s/eshoponabp/charts/saas/templates/saas-ingress.yaml @@ -6,16 +6,16 @@ metadata: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/rewrite-target: / nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-buffer-size: "{{ .Values.global.nginxProxyBufferSize }}" - nginx.ingress.kubernetes.io/proxy-buffers-number: "{{ .Values.global.nginxProxyBuffersNumber }}" + nginx.ingress.kubernetes.io/proxy-buffer-size: 32k + nginx.ingress.kubernetes.io/proxy-buffers-number: "8" cert-manager.io/cluster-issuer: letsencrypt spec: tls: - hosts: - - {{ .Values.global.saasService.domain }} - secretName: {{ .Values.global.tlsSecret }} + - {{ .Values.ingress.host }} + secretName: {{ .Values.ingress.tlsSecret }} rules: - - host: "{{ .Values.global.saasService.domain }}" + - host: "{{ .Values.ingress.host }}" http: paths: - path: / diff --git a/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml b/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml index 0ee5dd34..52b83826 100644 --- a/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml +++ b/etc/k8s/eshoponabp/charts/saas/templates/saas.yaml @@ -12,8 +12,8 @@ spec: app: {{ .Release.Name }}-{{ .Chart.Name }} spec: containers: - - image: {{ .Values.global.saasService.containerImage }}:{{ .Values.global.eshoponabpImageVersion }} - imagePullPolicy: {{ .Values.global.imagePullPolicy }} + - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.image.pullPolicy }} name: {{ .Release.Name }}-{{ .Chart.Name }} ports: - name: http @@ -21,11 +21,28 @@ spec: - name: https containerPort: 443 env: -{{ include "eshoponabp.global.env" . | indent 8 }} + - name: App__SelfUrl + value: "{{ .Values.config.selfUrl }}" + - name: App__CorsOrigins + value: "{{ .Values.config.corsOrigins }}" - name: "ConnectionStrings__AdministrationService" - value: {{ .Values.global.administrationService.connString }} + value: {{ .Values.config.connectionStrings.administrationService }} - name: "ConnectionStrings__SaasService" - value: {{ .Values.global.saasService.connString }} + value: {{ .Values.config.connectionStrings.saasService }} + - name: "DOTNET_ENVIRONMENT" + value: "{{ .Values.config.dotnetEnv }}" + - name: "Redis__Configuration" + value: "{{ .Values.config.redisHost }}" + - name: "RabbitMQ__Connections__Default__HostName" + value: "{{ .Values.config.rabbitmqHost }}" + - name: "ElasticSearch__Url" + value: "{{ .Values.config.elasticsearchHost }}" + - name: "AuthServer__Authority" + value: "{{ .Values.config.authServer.authority }}" + - name: "AuthServer__RequireHttpsMetadata" + value: "{{ .Values.config.authServer.requireHttpsMetadata }}" + - name: "StringEncryption__DefaultPassPhrase" + value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" {{- if .Values.env }} {{ toYaml .Values.env | indent 8 }} {{- end }} diff --git a/etc/k8s/eshoponabp/charts/saas/values.yaml b/etc/k8s/eshoponabp/charts/saas/values.yaml index 94682c50..badbfdf7 100644 --- a/etc/k8s/eshoponabp/charts/saas/values.yaml +++ b/etc/k8s/eshoponabp/charts/saas/values.yaml @@ -1,6 +1,25 @@ - env: - - name: "App__SelfUrl" - value: "https://eshop-st-saas" - - name: "App__CorsOrigins" - value: "https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal" - \ No newline at end of file +config: + selfUrl: https://eshop-st-saas + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal + connectionStrings: + administrationService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" + saasService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" + dotnetEnv: Staging + redisHost: es-st-redis + rabbitmqHost: es-st-rabbitmq + elasticsearchHost: es-st-elasticsearch + stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 + +ingress: + host: eshop-st-saas + tlsSecret: eshop-demo-tls + +image: + repository: eshoponabp/service-saas + tag: latest + pullPolicy: IfNotPresent + +env: {} \ No newline at end of file diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index a8e540f4..65b22f9b 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -125,7 +125,7 @@ public-web: selfUrl: https://eshop-st-public-web gatewayUrl: "http://eshop-st-gateway-web-public/" authServer: - authority: http://eshop-st-AUTHSERVER + authority: http://eshop-st-authserver requireHttpsMetadata: "false" dotnetEnv: Staging redisHost: es-st-redis @@ -141,27 +141,26 @@ public-web: identity: config: selfUrl: https://eshop-st-identity - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal - 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" - saasService: - connString: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" + 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" + saasService: "Server=es-st-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true" + authServer: + authority: http://eshop-st-authserver + requireHttpsMetadata: "false" dotnetEnv: Staging redisHost: es-st-redis rabbitmqHost: es-st-rabbitmq - elasticsearchHost: es-st-elasticsearch - authServerAuthority: http://eshop-st-authserver - authServerRequireHttpsMetadata: "false" - stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8 - identityServerClients: - 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/ - saasServiceRootUrl: https://eshop-st-saas/ + elasticsearchHost: es-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/ + saasServiceRootUrl: https://eshop-st-saas/ ingress: host: eshop-st-identity image: