diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml index af72a3c7..6fab6b7b 100644 --- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml @@ -22,6 +22,8 @@ spec: - name: grpc containerPort: 81 protocol: TCP + - name: https + containerPort: 443 env: - name: "ASPNETCORE_URLS" value: "http://+:8080;http://+:81" diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-ingress.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-ingress.yaml index ab2b6312..32363329 100644 --- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-ingress.yaml +++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-ingress.yaml @@ -29,4 +29,4 @@ spec: service: name: {{ .Release.Name }}-{{ .Chart.Name }} port: - number: 80 \ No newline at end of file + number: 8080 \ No newline at end of file diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml index 3fff7172..6651655d 100644 --- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml +++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-service.yaml @@ -14,5 +14,7 @@ spec: targetPort: grpc protocol: TCP port: {{ .Values.config.grpcPort }} + - name: "https" + port: 443 selector: app: {{ .Release.Name }}-{{ .Chart.Name }} diff --git a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml index 4f421e31..76b9c998 100644 --- a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml @@ -20,44 +20,36 @@ spec: - name: http containerPort: 8080 - name: https - containerPort: 8443 + containerPort: 443 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 }}" + - 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 }}" {{- if .Values.env }} {{ toYaml .Values.env | indent 8 }}