Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

let helm calculate the default service hosts otherwise they don't match the deployment name #41

Merged
merged 2 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ data:
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_corePoolSize=i{{ .corePoolSize | quote }}
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_httpClientMaxConnections=i{{ .httpClientMaxConnections | quote }}
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_httpClientMaxErrorRetry=B{{ .httpClientMaxErrorRetry | quote }}
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_s3Endpoint="{{ default (printf "%s-objectstorage" (include "liferay.fullname" $)) .host }}:{{ .ports.api }}"
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_s3Endpoint="{{ printf "%s%s" (default (printf "%s-objectstorage" (include "liferay.fullname" $)) .host) (ternary "" (printf ":%d" (.ports.api | int)) (empty .ports.api)) }}"
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_s3PathStyle=B{{ .pathStyle | quote }}
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_s3Region={{ .region | quote }}
configuration.override.com.liferay.portal.store.s3.configuration.S3StoreConfiguration_secretKey={{ .password | quote }}
Expand Down
6 changes: 3 additions & 3 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ database:
user: database
password: database
database: lportal
host: liferay-database
# host: liferay-database
port: 5432
# JDBC Connect String format: jdbc:{scheme}://{host}:{port}/{database}?{parameters}
jdbc:
Expand Down Expand Up @@ -135,7 +135,7 @@ search:
user: search
password: search
clusterName: liferay_cluster
host: liferay-search
# host: liferay-search
authenticationEnabled: false
httpSSLEnabled: false
port: 9200
Expand Down Expand Up @@ -177,7 +177,7 @@ objectstorage:
dlStoreImpl: com.liferay.portal.store.s3.S3Store
httpClientMaxConnections: 10
httpClientMaxErrorRetry: 3
host: liferay-objectstorage
# host: liferay-objectstorage
password: objectstorage
pathStyle: true
ports:
Expand Down
Loading