diff --git a/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-service.yaml b/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-service.yaml index 9766e240..7d0e9837 100644 --- a/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-service.yaml +++ b/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-service.yaml @@ -8,9 +8,9 @@ spec: type: ClusterIP ports: - name: "80" - port: 8080 + port: 80 + targetPort: 8080 - name: "443" port: 443 selector: - app: {{ .Release.Name }}-{{ .Chart.Name }} - + app: {{ .Release.Name }}-{{ .Chart.Name }} \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml index 98b3fde9..4f421e31 100644 --- a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml @@ -14,42 +14,52 @@ spec: containers: - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} + args: ["start", "--cache-stack=kubernetes"] name: {{ .Release.Name }}-{{ .Chart.Name }} ports: - name: http containerPort: 8080 - name: https - containerPort: 443 - env: - - name: App__SelfUrl - value: "{{ .Values.config.selfUrl }}" - - name: App__CorsOrigins - value: "{{ .Values.config.corsOrigins }}" - - name: "ConnectionStrings__OrderingService" - value: {{ .Values.config.connectionStrings.orderingService }} - - name: "ConnectionStrings__AdministrationService" - value: {{ .Values.config.connectionStrings.administrationService }} - - 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: "AuthServer__MetadataAddress" - value: "{{ .Values.config.authServer.metadataAddress }}" - - name: "AuthServer__SwaggerClientId" - value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - - name: "StringEncryption__DefaultPassPhrase" - value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" + containerPort: 8443 + env: + - name: "KC_DB" + value: "{{ .Values.config.kcDb }}" + - name: "KC_DB_URL" + value: "{{ .Values.config.kcDbUrl }}" + - name: "KC_DB_URL_HOST" + value: "{{ .Values.config.kcDbUrlHost }}" + - name: "KC_DB_URL_PORT" + value: "{{ .Values.config.kcDbUrlPort }}" + - name: "KC_DB_URL_DATABASE" + value: "{{ .Values.config.kcDbUrlDatabase }}" + - name: "KC_DB_USERNAME" + value: "{{ .Values.config.kcDbUsername }}" + - name: "KC_DB_PASSWORD" + value: "{{ .Values.config.kcDbPassword }}" + - name: "KEYCLOAK_ADMIN" + value: "{{ .Values.config.keycloakAdmin }}" + - name: "KEYCLOAK_ADMIN_PASSWORD" + value: "{{ .Values.config.keycloakAdminPassword }}" + - name: "KC_HEALTH_ENABLED" + value: "{{ .Values.config.kcHealthEnabled }}" + - name: "KC_HTTP_RELATIVE_PATH" + value: "{{ .Values.config.kcHttpRelativePath }}" + - name: "KC_PROXY" + value: "{{ .Values.config.kcProxy }}" + - name: "PROXY_ADDRESS_FORWARDING" + value: "{{ .Values.config.proxyAddressForwarding }}" + - name: "KC_HTTP_ENABLED" + value: "{{ .Values.config.kcHttpEnabled }}" + - name: "KC_HOSTNAME_URL" + value: "{{ .Values.config.kcHostnameUrl }}" + - name: "KC_HOSTNAME_ADMIN_URL" + value: "{{ .Values.config.kcHostnameAdminUrl }}" + - name: "jgroups.dns.query" + value: "{{ .Values.config.jgroupsDnsQuery }}" + - name: "KC_HOSTNAME_STRICT_BACKCHANNEL" + value: "{{ .Values.config.kcHostnameStrictBackchannel }}" + {{- if .Values.env }} {{ toYaml .Values.env | indent 8 }} {{- end }} - + \ No newline at end of file diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml index 6cd0278d..2c0b31e3 100644 --- a/etc/k8s/eshoponabp/values.st.yaml +++ b/etc/k8s/eshoponabp/values.st.yaml @@ -17,7 +17,8 @@ keycloak: kcHttpEnabled: true kcHostnameUrl: https://account.eshoponabp.dev kcHostnameAdminUrl: https://account.eshoponabp.dev - jgroupsDnsQuery: eshop-st-keycloak + jgroupsDnsQuery: eshop-st-keycloak:8080 + kcHostnameStrictBackchannel: false ingress: host: account.eshoponabp.dev @@ -54,7 +55,7 @@ public-web: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" isOnProd: "true" - metaAddress: http://eshop-st-keycloak:8080/realms/master + metaAddress: http://eshop-st-keycloak/realms/master dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq @@ -75,14 +76,14 @@ identity: 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" keycloak: - url: http://eshop-st-keycloak:8080 + url: http://eshop-st-keycloak adminUsername: admin adminPassword: 1q2w3E* realmName: master authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak:8080/realms/master + metadataAddress: http://eshop-st-keycloak/realms/master swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging @@ -119,7 +120,7 @@ administration: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak:8080/realms/master + metadataAddress: http://eshop-st-keycloak/realms/master swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" remoteServices: @@ -227,7 +228,7 @@ basket: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak:8080/realms/master + metadataAddress: http://eshop-st-keycloak/realms/master swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging @@ -255,7 +256,7 @@ catalog: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak:8080/realms/master + metadataAddress: http://eshop-st-keycloak/realms/master swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging @@ -263,9 +264,9 @@ catalog: rabbitmqHost: eshop-st-rabbitmq elasticsearchHost: eshop-st-elasticsearch kestrel: - httpUrl: http://catalog.eshoponabp.dev:8080 + httpUrl: http://eshop-st-catalog:8080 httpProtocols: Http1AndHttp2 - grpcUrl: http://catalog.eshoponabp.dev:81 + grpcUrl: http://eshop-st-catalog:81 grpcProtocols: Http2 ingress: host: catalog.eshoponabp.dev @@ -285,7 +286,7 @@ ordering: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak:8080/realms/master + metadataAddress: http://eshop-st-keycloak/realms/master swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging @@ -305,12 +306,12 @@ cmskit: selfUrl: https://cmskit.eshoponabp.dev corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev,https://admin.eshoponabp.dev connectionStrings: - cmskitervice: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Cmskit;User ID=postgres;password=myPassw0rd;Pooling=false" + cmskitService: "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: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak:8080/realms/master + metadataAddress: http://eshop-st-keycloak/realms/master swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" remoteServices: @@ -339,7 +340,7 @@ payment: authServer: authority: http://account.eshoponabp.dev requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak:8080/realms/master + metadataAddress: http://eshop-st-keycloak/realms/master swaggerClientId: WebGateway_Swagger swaggerClientSecret: "1q2w3e*" remoteServices: