Skip to content

Commit 789a678

Browse files
pravallikavaddpravallikavadd
committed
Adding JNDI properties on Openshift
1 parent 3d6eb34 commit 789a678

File tree

4 files changed

+69
-1
lines changed

4 files changed

+69
-1
lines changed

‎jaspersoft-containers/OpenShift/jrs/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ These parameters and values are the same as parameters in values.yaml.
7676
| db.audit.dbName | JasperReports Server audit DB name | jasperserver |
7777
| db.audit.dbUserName | JasperReports Server audit DB user name | postgres |
7878
| db.audit.dbPassword | JasperReports Server audit DB password | postgres |
79+
| db.jndiRestrictedAccess | Use special read-only user to access Analytics jndi. Enable only with corresponding property in default_master.properties, refer to JasperReports® Server Install Guide | false |
80+
| db.analytics.dbUserName | JasperReports® Server analytics read-only DB username, used when secrets enabled | postgres |
81+
| db.analytics.dbPassword | JasperReports® Server analytics read-only DB password, used when secrets enabled | postgres |
82+
| db.auditAnalytics.dbUserName | JasperReports® Server Audit Analytics read-only DB username, used when secrets enabled | postgres |
83+
| db.auditAnalytics.dbPassword | JasperReports® Server Audit Analytics read-only DB password, used when secrets enabled | postgres |
7984
| extraEnv.javaopts | Adds all JAVA_OPTS | -XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 |
8085
| extraEnv.normal | Adds all the normal key value pair variables | null |
8186
| extraEnv.secrets | Adds all the environment references from secrets or configmaps| null |

‎jaspersoft-containers/OpenShift/jrs/helm/templates/db-configmap.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ data:
1818
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
1919
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
2020
/>
21+
<Resource name="jdbc/jasperserverSystemAnalytics" auth="Container" type="javax.sql.DataSource"
22+
maxActive="100" maxIdle="30" maxWait="10000"
23+
{{- if .Values.db.jndiRestrictedAccess }}
24+
username="${ANALYTICS_DB_USER_NAME}" password="${ANALYTICS_DB_PASSWORD}"
25+
{{- else }}
26+
username="${DB_USER_NAME}" password="${DB_PASSWORD}"
27+
{{- end }}
28+
driverClassName="org.postgresql.Driver"
29+
accessToUnderlyingConnectionAllowed = "true"
30+
validationQuery="SELECT 1"
31+
testOnBorrow="true"
32+
defaultReadOnly="true"
33+
defaultAutoCommit="false"
34+
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
35+
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
36+
/>
2137
{{- if .Values.db.audit.enabled }}
2238
<Resource name="jdbc/jasperserverAudit" auth="Container" type="javax.sql.DataSource"
2339
maxActive="100" maxIdle="30" maxWait="10000"
@@ -39,6 +55,41 @@ data:
3955
testOnBorrow="true"
4056
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
4157
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
58+
/>
59+
{{- end }}
60+
{{- if .Values.db.audit.enabled }}
61+
<Resource name="jdbc/jasperserverAuditAnalytics" auth="Container" type="javax.sql.DataSource"
62+
maxActive="100" maxIdle="30" maxWait="10000"
63+
{{- if .Values.db.jndiRestrictedAccess }}
64+
username="${ANALYTICS_DB_USER_NAME}" password="${ANALYTICS_DB_PASSWORD}"
65+
{{- else }}
66+
username="${AUDIT_DB_USER_NAME}" password="${AUDIT_DB_PASSWORD}"
67+
{{- end }}
68+
driverClassName="org.postgresql.Driver"
69+
accessToUnderlyingConnectionAllowed = "true"
70+
validationQuery="SELECT 1"
71+
testOnBorrow="true"
72+
defaultReadOnly="true"
73+
defaultAutoCommit="false"
74+
url="jdbc:postgresql://${AUDIT_DB_HOST}:${AUDIT_DB_PORT}/${AUDIT_DB_NAME}"
75+
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
76+
/>
77+
{{- else if semverCompare ">= 9.0.0" .Values.jrsVersion }}
78+
<Resource name="jdbc/jasperserverAuditAnalytics" auth="Container" type="javax.sql.DataSource"
79+
maxActive="100" maxIdle="30" maxWait="10000"
80+
{{- if .Values.db.jndiRestrictedAccess }}
81+
username="${AUDIT_ANALYTICS_DB_USER_NAME}" password="${AUDIT_ANALYTICS_DB_PASSWORD}"
82+
{{- else }}
83+
username="${DB_USER_NAME}" password="${DB_PASSWORD}"
84+
{{- end }}
85+
driverClassName="org.postgresql.Driver"
86+
accessToUnderlyingConnectionAllowed = "true"
87+
validationQuery="SELECT 1"
88+
testOnBorrow="true"
89+
defaultReadOnly="true"
90+
defaultAutoCommit="false"
91+
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
92+
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
4293
/>
4394
{{- end }}
4495
<Resource name="jdbc/sugarcrm" auth="Container" type="javax.sql.DataSource"

‎jaspersoft-containers/OpenShift/jrs/helm/templates/db-secret.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,10 @@ data:
1919
AUDIT_DB_USER_NAME: {{ .Values.db.audit.dbUserName | toString | b64enc | quote }}
2020
AUDIT_DB_PASSWORD: {{ .Values.db.audit.dbPassword | toString | b64enc | quote }}
2121
{{- end }}
22+
{{- if .Values.db.jndiRestrictedAccess }}
23+
ANALYTICS_DB_USER_NAME: {{ .Values.db.analytics.dbUserName | toString | b64enc | quote }}
24+
ANALYTICS_DB_PASSWORD: {{ .Values.db.analytics.dbPassword | toString | b64enc | quote }}
25+
AUDIT_ANALYTICS_DB_USER_NAME: {{ .Values.db.auditAnalytics.dbUserName | toString | b64enc | quote }}
26+
AUDIT_ANALYTICS_DB_PASSWORD: {{ .Values.db.auditAnalytics.dbPassword | toString | b64enc | quote }}
27+
{{- end}}
2228
{{- end}}

‎jaspersoft-containers/OpenShift/jrs/helm/values.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,13 @@ db:
8585
dbName:
8686
dbUserName:
8787
dbPassword:
88-
88+
jndiRestrictedAccess: false
89+
analytics:
90+
dbUserName: postgres
91+
dbPassword: postgres
92+
auditAnalytics:
93+
dbUserName: postgres
94+
dbPassword: postgres
8995
## Set env variables
9096
## ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
9197
## ref: https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-environment-variables

0 commit comments

Comments
 (0)