Browse Source

changed namespace: eshoponabp->es-st

pull/20/head
Galip Tolga Erdem 5 years ago
parent
commit
57c4f94970
  1. 2
      etc/k8s/deploy-staging.ps1
  2. 8
      etc/k8s/eshoponabp/charts/administration/values.yaml
  3. 6
      etc/k8s/eshoponabp/charts/authserver/values.yaml
  4. 16
      etc/k8s/eshoponabp/charts/gateway-internal/templates/gateway-internal-configmap.yaml
  5. 6
      etc/k8s/eshoponabp/charts/gateway-internal/templates/gateway-internal-ingress.yaml
  6. 14
      etc/k8s/eshoponabp/charts/gateway-internal/values.yaml
  7. 10
      etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-configmap.yaml
  8. 6
      etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-ingress.yaml
  9. 8
      etc/k8s/eshoponabp/charts/gateway-public-web/values.yaml
  10. 14
      etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml
  11. 6
      etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-ingress.yaml
  12. 16
      etc/k8s/eshoponabp/charts/gateway-web/values.yaml
  13. 14
      etc/k8s/eshoponabp/charts/identity/values.yaml
  14. 4
      etc/k8s/eshoponabp/charts/public-web/values.yaml
  15. 4
      etc/k8s/eshoponabp/charts/sqlserver/templates/sqlserver.yaml
  16. 44
      etc/k8s/eshoponabp/values.yaml

2
etc/k8s/deploy-staging.ps1

@ -1,3 +1,3 @@
param ($version='latest')
helm upgrade --install eshoponabp eshoponabp --namespace eshop --create-namespace --set global.eshoponabpImageVersion=$version
helm upgrade --install es-st eshoponabp --namespace eshop --create-namespace --set global.eshoponabpImageVersion=$version

8
etc/k8s/eshoponabp/charts/administration/values.yaml

@ -1,10 +1,10 @@
env:
- name: "App__SelfUrl"
value: "https://eshoponabp-administration"
value: "https://eshop-st-administration"
- name: "App__CorsOrigins"
value: "https://localhost:44371,https://localhost:44372,https://eshoponabp-public-webgateway"
value: "https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal"
- name: "RemoteServices__Default__BaseUrl"
value: "https://eshoponabp-gateway-internal/"
value: "https://eshop-st-gateway-internal/"
- name: "IdentityClients__IdentityClients__Authority"
value: "https://eshoponabp-authserver"
value: "https://eshop-st-authserver"

6
etc/k8s/eshoponabp/charts/authserver/values.yaml

@ -1,8 +1,8 @@
env:
- name: "App__SelfUrl"
value: "https://eshoponabp-authserver"
value: "https://eshop-st-authserver"
- name: "App__CorsOrigins"
value: "https://localhost:44371,https://localhost:44372,https://eshoponabp-public-webgateway"
value: "https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-saas"
- name: "App__RedirectAllowedUrls"
value: "http://localhost:4200,https://localhost:44307"
value: "http://localhost:4200"

16
etc/k8s/eshoponabp/charts/gateway-internal/templates/gateway-internal-configmap.yaml

@ -12,7 +12,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-identity",
"Host": "eshop-st-identity",
"Port": 80
}
],
@ -25,7 +25,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-identity",
"Host": "eshop-st-identity",
"Port": 80
}
],
@ -38,7 +38,7 @@ data:
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-saas",
"Host": "eshop-st-saas",
"Port": 80
}
],
@ -51,7 +51,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -64,7 +64,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -77,7 +77,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -90,7 +90,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -103,7 +103,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-payment",
"Host": "eshop-st-payment",
"Port": 80
}
],

6
etc/k8s/eshoponabp/charts/gateway-internal/templates/gateway-internal-ingress.yaml

@ -8,7 +8,7 @@ metadata:
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 }}"
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
{{- end }}
cert-manager.io/cluster-issuer: letsencrypt
@ -16,12 +16,12 @@ spec:
tls:
- hosts:
- {{ .Values.global.gatewayInternal.domain }}
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
- {{ print "www." .Values.global.gatewayInternal.domain }}
{{- end }}
secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
rules:
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
- host: "{{ print "www." .Values.global.gatewayInternal.domain }}"
{{- else }}
- host: "{{ .Values.global.gatewayInternal.domain }}"

14
etc/k8s/eshoponabp/charts/gateway-internal/values.yaml

@ -1,35 +1,35 @@
env:
- name: "App__SelfUrl"
value: "https://eshoponabp-gateway-internal"
value: "https://eshop-st-gateway-internal"
- name: "GlobalConfiguration__BaseUrl"
value: "http://eshoponabp-gateway-internal"
value: "http://eshop-st-gateway-internal"
- name: "Routes__0__DownstreamScheme"
value: "http"
- name: "Routes__0__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-identity"
value: "eshop-st-identity"
- name: "Routes__0__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__1__DownstreamScheme"
value: "http"
- name: "Routes__1__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-identity"
value: "eshop-st-identity"
- name: "Routes__1__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__2__DownstreamScheme"
value: "http"
- name: "Routes__2__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-saas"
value: "eshop-st-saas"
- name: "Routes__2__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__3__DownstreamScheme"
value: "http"
- name: "Routes__3__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-administration"
value: "eshop-st-administration"
- name: "Routes__3__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__4__DownstreamScheme"
value: "http"
- name: "Routes__4__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-administration"
value: "eshop-st-administration"
- name: "Routes__4__DownstreamHostAndPorts__0__Port"
value: "80"

10
etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-configmap.yaml

@ -12,7 +12,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-identity",
"Host": "eshop-st-identity",
"Port": 80
}
],
@ -25,7 +25,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -38,7 +38,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-catalog",
"Host": "eshop-st-catalog",
"Port": 80
}
],
@ -51,7 +51,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-basket",
"Host": "eshop-st-basket",
"Port": 80
}
],
@ -64,7 +64,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-ordering",
"Host": "eshop-st-ordering",
"Port": 80
}
],

6
etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-ingress.yaml

@ -8,7 +8,7 @@ metadata:
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 }}"
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
{{- end }}
cert-manager.io/cluster-issuer: letsencrypt
@ -16,12 +16,12 @@ spec:
tls:
- hosts:
- {{ .Values.global.gatewayPublicWeb.domain }}
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
- {{ print "www." .Values.global.gatewayPublicWeb.domain }}
{{- end }}
secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
rules:
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
- host: "{{ print "www." .Values.global.gatewayPublicWeb.domain }}"
{{- else }}
- host: "{{ .Values.global.gatewayPublicWeb.domain }}"

8
etc/k8s/eshoponabp/charts/gateway-public-web/values.yaml

@ -1,18 +1,18 @@
env:
- name: "App__SelfUrl"
value: "https://eshoponabp-gateway-public-web"
value: "https://eshop-st-gateway-public-web"
- name: "GlobalConfiguration__BaseUrl"
value: "http://eshoponabp-gateway-public-web"
value: "http://eshop-st-gateway-public-web"
- name: "Routes__0__DownstreamScheme"
value: "http"
- name: "Routes__0__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-identity"
value: "eshop-st-identity"
- name: "Routes__0__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__1__DownstreamScheme"
value: "http"
- name: "Routes__1__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-administration"
value: "eshop-st-administration"
- name: "Routes__1__DownstreamHostAndPorts__0__Port"
value: "80"

14
etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml

@ -12,7 +12,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-identity",
"Host": "eshop-st-identity",
"Port": 80
}
],
@ -25,7 +25,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-identity",
"Host": "eshop-st-identity",
"Port": 80
}
],
@ -38,7 +38,7 @@ data:
"DownstreamScheme": "https",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-saas",
"Host": "eshop-st-saas",
"Port": 80
}
],
@ -51,7 +51,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -64,7 +64,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -77,7 +77,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],
@ -90,7 +90,7 @@ data:
"DownstreamScheme": "http",
"DownstreamHostAndPorts": [
{
"Host": "eshoponabp-administration",
"Host": "eshop-st-administration",
"Port": 80
}
],

6
etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-ingress.yaml

@ -8,7 +8,7 @@ metadata:
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 }}"
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
{{- end }}
cert-manager.io/cluster-issuer: letsencrypt
@ -16,12 +16,12 @@ spec:
tls:
- hosts:
- {{ .Values.global.gatewayWeb.domain }}
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
- {{ print "www." .Values.global.gatewayWeb.domain }}
{{- end }}
secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
rules:
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
- host: "{{ print "www." .Values.global.gatewayWeb.domain }}"
{{- else }}
- host: "{{ .Values.global.gatewayWeb.domain }}"

16
etc/k8s/eshoponabp/charts/gateway-web/values.yaml

@ -1,37 +1,37 @@
env:
- name: "App__SelfUrl"
value: "https://eshoponabp-gateway-web"
value: "https://eshop-st-gateway-web"
- name: "App__CorsOrigins"
value: "https://eshoponabp-web"
value: "https://eshop-st-web"
- name: "GlobalConfiguration__BaseUrl"
value: "http://eshoponabp-gateway-web"
value: "http://eshop-st-gateway-web"
- name: "Routes__0__DownstreamScheme"
value: "http"
- name: "Routes__0__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-identity"
value: "eshop-st-identity"
- name: "Routes__0__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__1__DownstreamScheme"
value: "http"
- name: "Routes__1__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-identity"
value: "eshop-st-identity"
- name: "Routes__1__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__2__DownstreamScheme"
value: "http"
- name: "Routes__2__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-saas"
value: "eshop-st-saas"
- name: "Routes__2__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__3__DownstreamScheme"
value: "http"
- name: "Routes__3__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-administration"
value: "eshop-st-administration"
- name: "Routes__3__DownstreamHostAndPorts__0__Port"
value: "80"
- name: "Routes__4__DownstreamScheme"
value: "http"
- name: "Routes__4__DownstreamHostAndPorts__0__Host"
value: "eshoponabp-administration"
value: "eshop-st-administration"
- name: "Routes__4__DownstreamHostAndPorts__0__Port"
value: "80"

14
etc/k8s/eshoponabp/charts/identity/values.yaml

@ -1,15 +1,15 @@
env:
- name: "App__SelfUrl"
value: "https://eshoponabp-identity"
value: "https://eshop-st-identity"
- name: "App__CorsOrigins"
value: "https://localhost:44371,https://localhost:44372,https://eshoponabp-public-webgateway"
value: "https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal"
- name: "IdentityServerClients__EShopOnAbp_Angular__RootUrl"
value: "https://eshoponabp-web/"
value: "https://eshop-st-web/"
- name: "IdentityServerClients__EShopOnAbp_PublicWeb__RootUrl"
value: "https://eshoponabp-public-web/"
value: "https://eshop-st-public-web/"
- name: "IdentityServerClients__IdentityService__RootUrl"
value: "https://eshoponabp-identity/"
value: "https://eshop-st-identity/"
- name: "IdentityServerClients__SaasService__RootUrl"
value: "https://eshoponabp-saas/"
value: "https://eshop-st-saas/"
- name: "IdentityServerClients__AdministrationService__RootUrl"
value: "https://eshoponabp-administration/"
value: "https://eshop-st-administration/"

4
etc/k8s/eshoponabp/charts/public-web/values.yaml

@ -1,6 +1,6 @@
env:
- name: "App__SelfUrl"
value: "https://eshoponabp-public-web"
value: "https://eshop-st-public-web"
- name: "RemoteServices__Default__BaseUrl"
value: "http://eshoponabp-gateway-public-web/"
value: "http://eshop-st-gateway-public-web/"

4
etc/k8s/eshoponabp/charts/sqlserver/templates/sqlserver.yaml

@ -16,7 +16,7 @@ spec:
containers:
- image: mcr.microsoft.com/mssql/server
name: {{ .Release.Name }}-{{ .Chart.Name }}
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
volumeMounts:
- mountPath: "/var/opt/mssql"
name: {{ .Release.Name }}-{{ .Chart.Name }}-database-volume
@ -30,7 +30,7 @@ spec:
value: "myPassw@rd"
- name: ACCEPT_EULA
value: "Y"
{{- if eq .Release.Name "eh-az" }}
{{- if eq .Release.Name "es-az" }}
volumeClaimTemplates:
- metadata:
name: {{ .Release.Name }}-{{ .Chart.Name }}-database-volume

44
etc/k8s/eshoponabp/values.yaml

@ -91,45 +91,45 @@ global:
imagePullPolicy: Never
eshoponabpImageVersion: latest
publicWeb:
domain: eshoponabp-public-web
url: https://eshoponabp-public-web
domain: eshop-st-public-web
url: https://eshop-st-public-web
containerImage: "eshoponabp/app-publicweb"
authServer:
domain: eshoponabp-authserver
url: https://eshoponabp-authserver
domain: eshop-st-authserver
url: https://eshop-st-authserver
containerImage: "eshoponabp/app-authserver"
identityService:
domain: eshoponabp-identity
url: https://eshoponabp-identity
domain: eshop-st-identity
url: https://eshop-st-identity
containerImage: "eshoponabp/service-identity"
connString: "Server=eshoponabp-sqldb,1433;Database=EShopOnAbp_Identity;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
connString: "Server=es-st-sqldb-sqldb,1433;Database=EShopOnAbp_Identity;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
administrationService:
domain: eshoponabp-administration
url: https://eshoponabp-administration
domain: eshop-st-administration
url: https://eshop-st-administration
containerImage: "eshoponabp/service-administration"
connString: "Server=eshoponabp-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
connString: "Server=es-st-sqldb-sqldb,1433;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
saasService:
domain: eshoponabp-saas
url: https://eshoponabp-saas
domain: eshop-st-saas
url: https://eshop-st-saas
containerImage: "eshoponabp/service-saas"
connString: "Server=eshoponabp-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
connString: "Server=es-st-sqldb-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
gatewayWeb:
domain: eshoponabp-gateway-web
url: https://eshoponabp-gateway-web
domain: eshop-st-gateway-web
url: https://eshop-st-gateway-web
containerImage: "eshoponabp/gateway-web"
gatewayPublicWeb:
domain: eshoponabp-gateway-public-web
url: https://eshoponabp-gateway-public-web
domain: eshop-st-gateway-public-web
url: https://eshop-st-gateway-public-web
containerImage: "eshoponabp/gateway-publicweb"
gatewayInternal:
domain: eshoponabp-gateway-internal
url: https://eshoponabp-gateway-internal
domain: eshop-st-gateway-internal
url: https://eshop-st-gateway-internal
containerImage: "eshoponabp/gateway-internal"
redisConfiguration: "eshoponabp-redis"
rabbitMqHostName: "eshoponabp-rabbitmq"
redisConfiguration: "es-st-redis"
rabbitMqHostName: "es-st-rabbitmq"
elasticSearchUrl: ""
nginxProxyBufferSize: "32k"
nginxProxyBuffersNumber: "8"
internalAuthServerAuthority: "http://eshoponabp-authserver"
internalAuthServerAuthority: "http://eshop-st-authserver"
internalAuthServerRequireHttpsMetadata: "false"
stringEncryptionDefaultPassPhrase: "gsKnGZ041HLL4IM8"
Loading…
Cancel
Save