Browse Source

set port 80 service of keycloak

pull/225/head
selmankoc 3 years ago
parent
commit
c05333aa6d
  1. 6
      etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-service.yaml
  2. 72
      etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml
  3. 27
      etc/k8s/eshoponabp/values.st.yaml

6
etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-service.yaml

@ -8,9 +8,9 @@ spec:
type: ClusterIP type: ClusterIP
ports: ports:
- name: "80" - name: "80"
port: 8080 port: 80
targetPort: 8080
- name: "443" - name: "443"
port: 443 port: 443
selector: selector:
app: {{ .Release.Name }}-{{ .Chart.Name }} app: {{ .Release.Name }}-{{ .Chart.Name }}

72
etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml

@ -14,42 +14,52 @@ spec:
containers: containers:
- image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
args: ["start", "--cache-stack=kubernetes"]
name: {{ .Release.Name }}-{{ .Chart.Name }} name: {{ .Release.Name }}-{{ .Chart.Name }}
ports: ports:
- name: http - name: http
containerPort: 8080 containerPort: 8080
- name: https - name: https
containerPort: 443 containerPort: 8443
env: env:
- name: App__SelfUrl - name: "KC_DB"
value: "{{ .Values.config.selfUrl }}" value: "{{ .Values.config.kcDb }}"
- name: App__CorsOrigins - name: "KC_DB_URL"
value: "{{ .Values.config.corsOrigins }}" value: "{{ .Values.config.kcDbUrl }}"
- name: "ConnectionStrings__OrderingService" - name: "KC_DB_URL_HOST"
value: {{ .Values.config.connectionStrings.orderingService }} value: "{{ .Values.config.kcDbUrlHost }}"
- name: "ConnectionStrings__AdministrationService" - name: "KC_DB_URL_PORT"
value: {{ .Values.config.connectionStrings.administrationService }} value: "{{ .Values.config.kcDbUrlPort }}"
- name: "DOTNET_ENVIRONMENT" - name: "KC_DB_URL_DATABASE"
value: "{{ .Values.config.dotnetEnv }}" value: "{{ .Values.config.kcDbUrlDatabase }}"
- name: "Redis__Configuration" - name: "KC_DB_USERNAME"
value: "{{ .Values.config.redisHost }}" value: "{{ .Values.config.kcDbUsername }}"
- name: "RabbitMQ__Connections__Default__HostName" - name: "KC_DB_PASSWORD"
value: "{{ .Values.config.rabbitmqHost }}" value: "{{ .Values.config.kcDbPassword }}"
- name: "ElasticSearch__Url" - name: "KEYCLOAK_ADMIN"
value: "{{ .Values.config.elasticsearchHost }}" value: "{{ .Values.config.keycloakAdmin }}"
- name: "AuthServer__Authority" - name: "KEYCLOAK_ADMIN_PASSWORD"
value: "{{ .Values.config.authServer.authority }}" value: "{{ .Values.config.keycloakAdminPassword }}"
- name: "AuthServer__RequireHttpsMetadata" - name: "KC_HEALTH_ENABLED"
value: "{{ .Values.config.authServer.requireHttpsMetadata }}" value: "{{ .Values.config.kcHealthEnabled }}"
- name: "AuthServer__MetadataAddress" - name: "KC_HTTP_RELATIVE_PATH"
value: "{{ .Values.config.authServer.metadataAddress }}" value: "{{ .Values.config.kcHttpRelativePath }}"
- name: "AuthServer__SwaggerClientId" - name: "KC_PROXY"
value: "{{ .Values.config.authServer.swaggerClientId }}" value: "{{ .Values.config.kcProxy }}"
- name: "AuthServer__SwaggerClientSecret" - name: "PROXY_ADDRESS_FORWARDING"
value: "{{ .Values.config.authServer.swaggerClientSecret }}" value: "{{ .Values.config.proxyAddressForwarding }}"
- name: "StringEncryption__DefaultPassPhrase" - name: "KC_HTTP_ENABLED"
value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" 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 }} {{- if .Values.env }}
{{ toYaml .Values.env | indent 8 }} {{ toYaml .Values.env | indent 8 }}
{{- end }} {{- end }}

27
etc/k8s/eshoponabp/values.st.yaml

@ -17,7 +17,8 @@ keycloak:
kcHttpEnabled: true kcHttpEnabled: true
kcHostnameUrl: https://account.eshoponabp.dev kcHostnameUrl: https://account.eshoponabp.dev
kcHostnameAdminUrl: https://account.eshoponabp.dev kcHostnameAdminUrl: https://account.eshoponabp.dev
jgroupsDnsQuery: eshop-st-keycloak jgroupsDnsQuery: eshop-st-keycloak:8080
kcHostnameStrictBackchannel: false
ingress: ingress:
host: account.eshoponabp.dev host: account.eshoponabp.dev
@ -54,7 +55,7 @@ public-web:
authority: https://account.eshoponabp.dev/realms/master authority: https://account.eshoponabp.dev/realms/master
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
isOnProd: "true" isOnProd: "true"
metaAddress: http://eshop-st-keycloak:8080/realms/master metaAddress: http://eshop-st-keycloak/realms/master
dotnetEnv: Staging dotnetEnv: Staging
redisHost: eshop-st-redis redisHost: eshop-st-redis
rabbitmqHost: eshop-st-rabbitmq 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" 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" administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
keycloak: keycloak:
url: http://eshop-st-keycloak:8080 url: http://eshop-st-keycloak
adminUsername: admin adminUsername: admin
adminPassword: 1q2w3E* adminPassword: 1q2w3E*
realmName: master realmName: master
authServer: authServer:
authority: https://account.eshoponabp.dev/realms/master authority: https://account.eshoponabp.dev/realms/master
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
metadataAddress: http://eshop-st-keycloak:8080/realms/master metadataAddress: http://eshop-st-keycloak/realms/master
swaggerClientId: WebGateway_Swagger swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*" swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging dotnetEnv: Staging
@ -119,7 +120,7 @@ administration:
authServer: authServer:
authority: https://account.eshoponabp.dev/realms/master authority: https://account.eshoponabp.dev/realms/master
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
metadataAddress: http://eshop-st-keycloak:8080/realms/master metadataAddress: http://eshop-st-keycloak/realms/master
swaggerClientId: WebGateway_Swagger swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*" swaggerClientSecret: "1q2w3e*"
remoteServices: remoteServices:
@ -227,7 +228,7 @@ basket:
authServer: authServer:
authority: https://account.eshoponabp.dev/realms/master authority: https://account.eshoponabp.dev/realms/master
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
metadataAddress: http://eshop-st-keycloak:8080/realms/master metadataAddress: http://eshop-st-keycloak/realms/master
swaggerClientId: WebGateway_Swagger swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*" swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging dotnetEnv: Staging
@ -255,7 +256,7 @@ catalog:
authServer: authServer:
authority: https://account.eshoponabp.dev/realms/master authority: https://account.eshoponabp.dev/realms/master
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
metadataAddress: http://eshop-st-keycloak:8080/realms/master metadataAddress: http://eshop-st-keycloak/realms/master
swaggerClientId: WebGateway_Swagger swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*" swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging dotnetEnv: Staging
@ -263,9 +264,9 @@ catalog:
rabbitmqHost: eshop-st-rabbitmq rabbitmqHost: eshop-st-rabbitmq
elasticsearchHost: eshop-st-elasticsearch elasticsearchHost: eshop-st-elasticsearch
kestrel: kestrel:
httpUrl: http://catalog.eshoponabp.dev:8080 httpUrl: http://eshop-st-catalog:8080
httpProtocols: Http1AndHttp2 httpProtocols: Http1AndHttp2
grpcUrl: http://catalog.eshoponabp.dev:81 grpcUrl: http://eshop-st-catalog:81
grpcProtocols: Http2 grpcProtocols: Http2
ingress: ingress:
host: catalog.eshoponabp.dev host: catalog.eshoponabp.dev
@ -285,7 +286,7 @@ ordering:
authServer: authServer:
authority: https://account.eshoponabp.dev/realms/master authority: https://account.eshoponabp.dev/realms/master
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
metadataAddress: http://eshop-st-keycloak:8080/realms/master metadataAddress: http://eshop-st-keycloak/realms/master
swaggerClientId: WebGateway_Swagger swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*" swaggerClientSecret: "1q2w3e*"
dotnetEnv: Staging dotnetEnv: Staging
@ -305,12 +306,12 @@ cmskit:
selfUrl: https://cmskit.eshoponabp.dev selfUrl: https://cmskit.eshoponabp.dev
corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev,https://admin.eshoponabp.dev corsOrigins: https://gateway-web.eshoponabp.dev,https://gateway-public.eshoponabp.dev,https://admin.eshoponabp.dev
connectionStrings: 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" administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
authServer: authServer:
authority: https://account.eshoponabp.dev/realms/master authority: https://account.eshoponabp.dev/realms/master
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
metadataAddress: http://eshop-st-keycloak:8080/realms/master metadataAddress: http://eshop-st-keycloak/realms/master
swaggerClientId: WebGateway_Swagger swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*" swaggerClientSecret: "1q2w3e*"
remoteServices: remoteServices:
@ -339,7 +340,7 @@ payment:
authServer: authServer:
authority: http://account.eshoponabp.dev authority: http://account.eshoponabp.dev
requireHttpsMetadata: "false" requireHttpsMetadata: "false"
metadataAddress: http://eshop-st-keycloak:8080/realms/master metadataAddress: http://eshop-st-keycloak/realms/master
swaggerClientId: WebGateway_Swagger swaggerClientId: WebGateway_Swagger
swaggerClientSecret: "1q2w3e*" swaggerClientSecret: "1q2w3e*"
remoteServices: remoteServices:

Loading…
Cancel
Save