From 38efe55b7fd733516bea68db2eeb7ce65724ec9d Mon Sep 17 00:00:00 2001 From: Pravallika Vadde Date: Tue, 16 Jan 2024 12:31:39 +0530 Subject: [PATCH] pushing from internal-repo to public-repo --- jaspersoft-containers/Docker/jrs/.env | 6 +- jaspersoft-containers/Docker/jrs/Dockerfile | 4 +- .../Docker/jrs/Dockerfile.buildomatic | 4 +- jaspersoft-containers/Docker/jrs/README.md | 8 +- .../default_master.properties | 7 + .../Docker/jrs/scripts/unpackWARInstaller.sh | 2 +- .../Docker/scalableQueryEngine/.env | 6 +- .../Docker/scalableQueryEngine/Dockerfile | 4 +- .../scalableQueryEngine/Dockerfile.drivers | 6 +- .../Docker/scalableQueryEngine/README.md | 6 +- .../installPackagesForScalableAdhoc.sh | 7 +- jaspersoft-containers/K8s/jrs/README.md | 225 +++++++++--------- jaspersoft-containers/K8s/jrs/helm/Chart.yaml | 2 +- .../K8s/jrs/helm/templates/db-configmap.yaml | 51 ++++ .../K8s/jrs/helm/templates/db-secret.yaml | 6 + .../K8s/jrs/helm/templates/hpa.yaml | 2 +- .../K8s/jrs/helm/values.yaml | 18 +- .../K8s/scalableQueryEngine/README.md | 4 +- .../K8s/scalableQueryEngine/helm/Chart.yaml | 4 +- .../scalable-query-engine-scaling/Chart.yaml | 2 +- .../templates/hpa.yaml | 2 +- .../scalable-query-engine-scaling/values.yaml | 2 +- .../helm/templates/hpa.yaml | 4 +- .../K8s/scalableQueryEngine/helm/values.yaml | 6 +- jaspersoft-containers/OpenShift/jrs/README.md | 6 +- .../OpenShift/jrs/helm/Chart.yaml | 2 +- .../OpenShift/jrs/helm/templates/hpa.yaml | 2 +- .../OpenShift/jrs/helm/values.yaml | 10 +- .../OpenShift/scalableQueryEngine/README.md | 4 +- .../scalableQueryEngine/helm/Chart.yaml | 2 +- .../scalable-query-engine-scaling/Chart.yaml | 2 +- .../templates/hpa.yaml | 2 +- .../scalable-query-engine-scaling/values.yaml | 2 +- .../helm/templates/hpa.yaml | 2 +- .../scalableQueryEngine/helm/values.yaml | 6 +- 35 files changed, 253 insertions(+), 175 deletions(-) diff --git a/jaspersoft-containers/Docker/jrs/.env b/jaspersoft-containers/Docker/jrs/.env index 75f7b79..a452e01 100644 --- a/jaspersoft-containers/Docker/jrs/.env +++ b/jaspersoft-containers/Docker/jrs/.env @@ -1,9 +1,9 @@ INSTALL_CHROMIUM=false JASPERREPORTS_SERVER_APP_IMAGE_NAME=jasperserver-webapp JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME=jasperserver-buildomatic -JASPERREPORTS_SERVER_VERSION=8.2.0 -JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.2.0 -JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.2.0 +JASPERREPORTS_SERVER_VERSION=9.0.0 +JASPERREPORTS_SERVER_APP_IMAGE_TAG=9.0.0 +JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=9.0.0 TOMCAT_BASE_IMAGE= tomcat:9.0.65-jdk11-openjdk JDK_BASE_IMAGE=openjdk:11-jdk ## TOMCAT_BASE_IMAGE=tomcat:9.0.62-jdk17-openjdk diff --git a/jaspersoft-containers/Docker/jrs/Dockerfile b/jaspersoft-containers/Docker/jrs/Dockerfile index db0246b..b3ed292 100644 --- a/jaspersoft-containers/Docker/jrs/Dockerfile +++ b/jaspersoft-containers/Docker/jrs/Dockerfile @@ -8,7 +8,7 @@ ARG TOMCAT_BASE_IMAGE=tomcat:9.0.65-jdk11-openjdk ARG INSTALL_CHROMIUM=false -ARG JASPERREPORTS_SERVER_VERSION=8.2.0 +ARG JASPERREPORTS_SERVER_VERSION=9.0.0 FROM ${TOMCAT_BASE_IMAGE} as deployment @@ -19,7 +19,7 @@ ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin ENV INSTALL_CHROMIUM ${INSTALl_CHROMIUM:-false} -ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0} ENV JRS_HOME /usr/src/jasperreports-server ENV BUILDOMATIC_MODE non-interactive diff --git a/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic b/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic index ceab8d6..efe3abf 100644 --- a/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic +++ b/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic @@ -8,11 +8,11 @@ ARG JDK_BASE_IMAGE=openjdk:11-jdk FROM ${JDK_BASE_IMAGE} -ARG JASPERREPORTS_SERVER_VERSION=8.2.0 +ARG JASPERREPORTS_SERVER_VERSION=9.0.0 ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/jrs ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin -ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0} ENV JRS_HOME /usr/src/jasperreports-server ENV BUILDOMATIC_MODE non-interactive ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022} diff --git a/jaspersoft-containers/Docker/jrs/README.md b/jaspersoft-containers/Docker/jrs/README.md index 6b2a16b..bd6eb76 100644 --- a/jaspersoft-containers/Docker/jrs/README.md +++ b/jaspersoft-containers/Docker/jrs/README.md @@ -31,7 +31,7 @@ This distribution includes Dockerfile and supporting files for building, configu # Prerequisites -1. Docker-engine (19.x+) setup with Docker Compose (3.9+) +1. Docker-engine (20.x+) setup with Docker Compose (3.9+) 1. Knowledge of Docker 1. Git 1. JasperReports® Server @@ -71,9 +71,9 @@ These variables are passed to the command line with `--build-arg` for docker bui |INSTALL_CHROMIUM| Whether Chromium installed. **Note: Cloud Software Group, Inc. is not liable for license violation of chromium.**| false| |JASPERREPORTS_SERVER_APP_IMAGE_NAME| Name of the JasperReports® Server image | jasperserver-webapp| |JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME| Name of the JasperReports® Server buildomatic image | jasperserver-buildomatic| -|JASPERREPORTS_SERVER_VERSION|Version number of JasperReports® Server|8.2.0| -|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the JasperReports® Server web app |8.2.0| -|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the JasperReports® Server buildomatic |8.2.0| +|JASPERREPORTS_SERVER_VERSION|Version number of JasperReports® Server|9.0.0| +|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the JasperReports® Server web app |9.0.0| +|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the JasperReports® Server buildomatic |9.0.0| |TOMCAT_BASE_IMAGE|Tomcat Docker image certified for the version of JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types "tomcat:9.0.65-jdk11-openjdk" ,"tomcat:9.0.62-jdk17-openjdk" for Debian and "tomcat:9.0.73-jdk11-corretto","tomcat:9.0.73-jdk-17-corretto" for Amazon Linux 2 |tomcat:9.0.65-jdk11-openjdk| |JDK_BASE_IMAGE|Java Docker image certified for the version of JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types "openjdk:11-jdk","eclipse-temurin:17-jdk" and "amazoncorretto:11","amazoncorretto:17"|openjdk:11-jdk| RELEASE_DATE|Release date of JasperReports® Server | May 13, 2022 | diff --git a/jaspersoft-containers/Docker/jrs/resources/default-properties/default_master.properties b/jaspersoft-containers/Docker/jrs/resources/default-properties/default_master.properties index 85c05d0..c02749d 100644 --- a/jaspersoft-containers/Docker/jrs/resources/default-properties/default_master.properties +++ b/jaspersoft-containers/Docker/jrs/resources/default-properties/default_master.properties @@ -16,6 +16,13 @@ js.dbName=jasperserver dbUsername=postgres dbPassword=postgres +#Disable Edit/Delete access to jasperserver and jasperserverAudit JNDI connections +#jndi.restrictedAccess=true +#analytics.dbUsername=jasperuser +#analytics.dbPassword=password +#auditAnalytics.dbUsername=jasperuser +#auditAnalytics.dbPassword=password + #############SCALABLE QUERY ENGINE PROPERTIES########### scalableQueryEngine.enabled=true scalableQueryEngine.url=http://localhost:8081 diff --git a/jaspersoft-containers/Docker/jrs/scripts/unpackWARInstaller.sh b/jaspersoft-containers/Docker/jrs/scripts/unpackWARInstaller.sh index fcca2e8..c45e816 100644 --- a/jaspersoft-containers/Docker/jrs/scripts/unpackWARInstaller.sh +++ b/jaspersoft-containers/Docker/jrs/scripts/unpackWARInstaller.sh @@ -5,5 +5,5 @@ # in the license file that is distributed with this file. cd ../../../../ -unzip -o -q TIB_js-jrs_*.zip -d . +unzip -o -q js-jrs_*.zip -d . diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/.env b/jaspersoft-containers/Docker/scalableQueryEngine/.env index 2148aad..0d44316 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/.env +++ b/jaspersoft-containers/Docker/scalableQueryEngine/.env @@ -1,8 +1,8 @@ -JASPERREPORTS_SERVER_VERSION=8.2.0 +JASPERREPORTS_SERVER_VERSION=9.0.0 SCALABLE_QUERY_ENGINE_IMAGE_NAME=scalable-query-engine SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_NAME=scalable-query-engine-drivers -SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG=8.2.0 -SCALABLE_QUERY_ENGINE_IMAGE_TAG=8.2.0 +SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG=9.0.0 +SCALABLE_QUERY_ENGINE_IMAGE_TAG=9.0.0 JDK_BASE_IMAGE=openjdk:11-jdk ## JDK_BASE_IMAGE=eclipse-temurin:17-jdk ks=/etc/secrets/keystore diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile index 7cb8135..25edfd6 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile +++ b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile @@ -6,13 +6,13 @@ #ARG JDK_BASE_IMAGE=amazoncorretto:17 #ARG JDK_BASE_IMAGE=eclipse-temurin:17-jdk ARG JDK_BASE_IMAGE=openjdk:11-jdk -ARG JASPERREPORTS_SERVER_VERSION=8.2.0 +ARG JASPERREPORTS_SERVER_VERSION=9.0.0 FROM ${JDK_BASE_IMAGE} AS worker ARG JASPERREPORTS_SERVER_VERSION ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine -ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0} ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin ENV WORKER_HOME /usr/local/scalable-query-engine diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers index 7a3d337..562570d 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers +++ b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers @@ -5,12 +5,12 @@ #ARG JDK_BASE_IMAGE=amazoncorretto:17 #ARG JDK_BASE_IMAGE=eclipse-temurin:17-jdk ARG JDK_BASE_IMAGE=openjdk:11-jdk -ARG JASPERREPORTS_SERVER_VERSION=8.2.0 +ARG JASPERREPORTS_SERVER_VERSION=9.0.0 FROM ${JDK_BASE_IMAGE} as driver ARG JASPERREPORTS_SERVER_VERSION -ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0} ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine ENV JRS_HOME /usr/local/jasperreports-server @@ -28,7 +28,7 @@ FROM ${JDK_BASE_IMAGE} ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine ENV WAR_JARS=/usr/local/jasperreports-server/buildomatic/conf_source/iePro/lib ENV WAR_LIB_JARS=/usr/local/jasperreports-server/jasperserver-pro/WEB-INF/lib -ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0} ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022} LABEL "org.jasperosft.name"="Jasper Reports Server Scalable Query Engine" \ diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/README.md b/jaspersoft-containers/Docker/scalableQueryEngine/README.md index dfb91b6..66a07c1 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/README.md +++ b/jaspersoft-containers/Docker/scalableQueryEngine/README.md @@ -56,11 +56,11 @@ and all the deployment configurations are managed by Helm charts and Redis is us | Environment Variable Name | Description | Default Value| |------------| -------------|--------------| -|JASPERREPORTS_SERVER_VERSION | JasperReports Server release version | 8.2.0| +|JASPERREPORTS_SERVER_VERSION | JasperReports Server release version | 9.0.0| |SCALABLE_QUERY_ENGINE_IMAGE_NAME| Scalable Query Engine image name |scalable-query-engine| |SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_NAME| Scalable Query Engine JDBC drivers image name| scalable-query-engine-driver| -|SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG| Docker tag for Scalable Query Engine | 8.2.0| -|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 8.2.0| +|SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG| Docker tag for Scalable Query Engine | 9.0.0| +|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 9.0.0| |JDK_BASE_IMAGE | Docker image certified for the version of JasperReports Server being deployed based on Debian and Amazon Linux 2, and it is of two types "openjdk:11-jdk","eclipse-temurin:17-jdk"and "amazoncorretto:11", "amazoncorretto:17" |openjdk:11-jdk| |ks | .jrsks keystore path |/etc/secrets/keystore| |ksp | .jrsksp keystore path | /etc/secrets/keystore | diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/scripts/installPackagesForScalableAdhoc.sh b/jaspersoft-containers/Docker/scalableQueryEngine/scripts/installPackagesForScalableAdhoc.sh index c9cba32..8eb2aaf 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/scripts/installPackagesForScalableAdhoc.sh +++ b/jaspersoft-containers/Docker/scalableQueryEngine/scripts/installPackagesForScalableAdhoc.sh @@ -21,10 +21,9 @@ case "$PACKAGE_MGR" in rm -rf /var/cache/yum ;; "apt_get" ) - apt-get -y update && - apt-get install -y --no-install-recommends apt-utils rsync - apt-get install unzip - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + DEBIAN_FRONTEND=noninteractive apt-get -y update && + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends apt-utils unzip rsync + DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false rm -rf /var/lib/apt/lists/* ;; esac diff --git a/jaspersoft-containers/K8s/jrs/README.md b/jaspersoft-containers/K8s/jrs/README.md index 9ec6c8e..70e214e 100644 --- a/jaspersoft-containers/K8s/jrs/README.md +++ b/jaspersoft-containers/K8s/jrs/README.md @@ -1,4 +1,6 @@ + +
Table of Contents @@ -30,8 +32,8 @@ This helm chart is used to install JasperReports® Server in Kubernetes and integrate it with the Scalable Query Engine. # Prerequisites -1. Docker-engine (19.x+) setup with Docker Compose (3.9+) -1. K8s cluster with 1.19+ +1. Docker-engine (20.x+) setup with Docker Compose (3.9+) +1. K8s cluster with 1.25+ 1. JasperReports® Server 1. Keystore 1. Git @@ -46,113 +48,118 @@ To deploy JasperReports® Server K8s Cluster from scratch, you can follow ins These parameters and values are the same as parameters in `K8s/jrs/helm/values.yaml` and will be used by JasperReports® Server Helm chart during installation. -| Parameter | Description | default Value | -|------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| replicaCount | Number of pods | 1 (It will not come into effect if autoscaling is enabled.) | -| jrsVersion | JasperReports® Server release version | 8.2.0 | -| image.tag | Name of the JasperReports® Server webapp image tag | JasperReports® Server Release Version | -| image.name | Name of the JasperReports® Server webapp image | jasperserver-webapp | -| image.pullPolicy | Docker image pull policy | IfNotPresent | -| image.PullSecrets | Name of the image pull secret | Pull secret should be created manually before using it in same namespace, [See Docs](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) | -| nameOverride | Override the default helm chart name | jasperserver-pro | -| fullnameOverride | Override the default full chart name | null | -| secretKeyStoreName | Name of the keystore secret | jasperserver-keystore | -| secretLicenseName | Name of the license secret | jasperserver-license | -| serviceAccount.enabled | Service account for JasperReports® Server webapp | true | -| serviceAccount.annotations | Adds new annotations | null | -| serviceAccount.name | Name of the service account | jasperserver-pro | -| rbac.create | Creates role and role binding | true | -| rbac.name | Name of the JasperReports® Server role and role binding | jasperserver-role | -| podAnnotations | Adds pod annotations | null | -| securityContext.capabilities.drop | Drops Linux capabilites for the JasperReports® Server webapp | All | -| securityContext.runAsNonRoot | Runs the JasperReports® Server webapp as non root user | true | -| securityContext.runAsUser | User id to run the JasperReports® Server webapp | 10099 | -| buildomatic.enabled | Installs or skips creation of the JasperReports® Server repository DB | true | -| buildomatic.name | Name of the JasperReports® Server command line tool | jasperserver-buildomatic | -| buildomatic.imageTag | Buildomatic image tag | Same as JasperReports® Server release version | -| buildomatic.imageName | Name of the buildomatic image | null | -| buildomatic.pullPolicy | Image pull policy | IfNotPresent | -| buildomatic.PullSecrets | Image pull secrets | null | -| buildomatic.includeSamples | Installs JasperReports® Server samples in JasperReports Server DB | true | -| db.env | Enables the DB configuration using environment variables | false | -| db.jrs.dbHost | JasperReports Server repository DB host | repository-postgresql.default.svc.cluster.local | -| db.jrs.dbPort | JasperReports Server repository DB port | 5432 | -| db.jrs.dbName | JasperReports Server repository DB name | jasperserver | -| db.jrs.dbUserName | JasperReports Server repository DB user name | postgres | -| db.jrs.dbPassword | JasperReports Server repository DB password | postgres | -| db.audit.enabled | Install JasperReports Server Audit into separate DB | false | -| db.audit.dbHost | JasperReports Server audit DB host | null | -| db.audit.dbPort | JasperReports Server audit DB port | null | -| db.audit.dbName | JasperReports Server audit DB name | null | -| db.audit.dbUserName | JasperReports Server audit DB user name | null | -| db.audit.dbPassword | JasperReports Server audit DB password | null | -| extraEnv.javaopts | Adds JAVA_OPTS to JasperReports® Server application | -XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 | -| extraEnv.normal | Adds all the normal key value pair variables | null | -| extraEnv.secrets | Adds all the environment references from secrets or configmaps | null | -| extraVolumeMounts | Adds extra volume mounts | null | -| extraVolumes | Adds extra volumes | null | -| Service.type | JasperReports® Server Service type | ClusterIP | -| Service.port | JasperReports® Server Service port | 80 | -| healthcheck.enabled | Checks JasperReports® Server pod health status | true | -| healthcheck.livenessProbe.port | JasperReports® Server container port | 8080 | -| healthcheck.livenessProbe.initialDelaySeconds | Initial waiting time to check the health and restarts the JasperReports® Server Webapp pod | 350 | -| healthcheck.livenessProbe.failureThreshold | Threshold for health checks | 10 | -| healthcheck.livenessProbe.periodSeconds | Time period to check the health | 10 | -| healthcheck.livenessProbe.timeoutSeconds | Timeout | 4 | -| healthcheck.readinessProbe.port | JasperReports® Server container port | 8080 | -| healthcheck.readinessProbe.initialDelaySeconds | Initial delay before checking the health checks | 90 | -| healthcheck.readinessProbe.failureThreshold | Threshold for health checks | 15 | -| healthcheck.readinessProbe.periodSeconds | Time period to check the health checks | 10 | -| healthcheck.readinessProbe.timeoutSeconds | Timeout | 4 | -| resources.enabled | Enables the minimum and maximum resources used by JasperReports® Server | true | -| resources.limits.cpu | Maximum CPU for JasperReports® Server Webapp pod | "3" | -| resources.limits.memory | Maximum Memory for JasperReports® Server Webapp pod | 7.5Gi | -| resources.requests.cpu | Minimum CPU for JasperReports® Server Webapp pod | "2" | -| resources.requests.memory | Minimum Memory for JasperReports® Server Webapp pod | 3.5Gi | -| jms.enabled | Enables the ActiveMQ cache service | true | -| jms.jmsBrokerUrl | Override ActiveMQ Broker Url | null | -| jms.name | ActiveMQ deployment name | jasperserver-cache | -| jms.serviceName | ActiveMQ service name | jasperserver-cache-service | -| jms.imageName | Name of the Activemq image | bansamadev/activemq | -| jms.imageTag | Activemq image tag | 5.17.2 | -| jms.healthcheck.enabled | | true | -| jms.healthcheck.livenessProbe.port | Container port | 61616 | -| jms.healthcheck.livenessProbe.initialDelaySeconds | Initial delay | 100 | -| jms.healthcheck.livenessProbe.failureThreshold | Threshold for health check | 10 | -| jms.healthcheck.livenessProbe.periodSeconds | Time period for health check | 10 | -| jms.healthcheck.readinessProbe.port | Container port | 61616 | -| jms.healthcheck.readinessProbe.initialDelaySeconds | Initial delay | 10 | -| jms.healthcheck.readinessProbe.failureThreshold | Threshold for health check | 15 | -| jms.healthcheck.readinessProbe.periodSeconds | Time period for health check | 10 | -| jms.securityContext.capabilities.drop | Linux capabilities to drop for the pod | All | -| ingress.enabled | JasperReports® Server ingress | true | -| ingress.annotations.ingress.kubernetes.io\/cookie-persistence | Work with multiple pods and stickyness | "JRS_COOKIE" | -| ingress.hosts.host | Adds valid DNS hostname to access the JasperReports® Server | null | -| ingress.tls | Adds TLS secret name to allow secure traffic | null | -| scalableQueryEngine.enabled | Deploy and configure Scalable Query Engine | false | -| scalable-query-engine.replicaCount | Number of pods for Scalable Query Engine | 1 | -| scalable-query-engine.image.tag | Scalable Query Engine image tag | 8.2.0 | -| scalable-query-engine.image.name | Name of the Scalable Query Engine image | null | -| scalable-query-engine.image.pullPolicy | Scalable Query Engine image pull policy | ifNotPresent | -| scalable-query-engine.autoscaling.enabled | Enables the HPA for Scalable Query Engine | true | -| scalable-query-engine.drivers.image.tag | Scalable Query Engine Drivers image tag | 8.2.0 | -| scalable-query-engine.drivers.image.name | Scalable Query Engine Drivers image name | null | -| scalable-query-engine.kubernetes-ingress.controller.service.type | Scalable Query Engine Service Type | ClusterIP | -| autoscaling.enabled | Scales the JasperReports Server application, **Note:** Make sure metric server is installed or metrics are enabled | false | -| autoscaling.minReplicas | Minimum number of pods maintained by autoscaler | 1 | -| autoscaling.maxReplicas | Maximum number of pods maintained by autoscaler | 4 | -| autoscaling.targetCPUUtilizationPercentage | Minimum CPU utilization to scale up the application | 50% | -| autoscaling.targetMemoryUtilizationPercentage | Minimum memory utilization to scale up the JasperReports® Server applications | 50% | -| autoscaling.scaleDown.stabilizationWindowSeconds | Time to give JasperReports® Server Webapp pod to finish all current tasks | 300 | -| metrics.enabled | Enables the Prometheus metrics | false | -| kube-prometheus-stack.prometheus-node-exporter.hostRootFsMount | | false | -| kube-prometheus-stack.grafana.service.type | Grafana service type | NodePort | -| logging.enabled | Enables the centralized logging setup | false | -| elasticsearch.volumeClaimTemplate.resources.requests.storage | | 10Gi | -| kibana.service.type | Kibana service type | NodePort | -| elasticsearch.replicas | Number of replicas for Elasticsearch | 1 | -| tolerations | Adds the tolerations as per K8s standard if needed | null | -| affinity | Adds the affinity as per K8s standards if needed | null | +| Parameter | Description | default Value | +|------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| replicaCount | Number of pods | 1 (It will not come into effect if autoscaling is enabled.) | +| jrsVersion | JasperReports® Server release version | 9.0.0 | +| image.tag | Name of the JasperReports® Server webapp image tag | JasperReports® Server Release Version | +| image.name | Name of the JasperReports® Server webapp image | jasperserver-webapp | +| image.pullPolicy | Docker image pull policy | IfNotPresent | +| image.PullSecrets | Name of the image pull secret | Pull secret should be created manually before using it in same namespace, [See Docs](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) | +| nameOverride | Override the default helm chart name | jasperserver-pro | +| fullnameOverride | Override the default full chart name | null | +| secretKeyStoreName | Name of the keystore secret | jasperserver-keystore | +| secretLicenseName | Name of the license secret | jasperserver-license | +| serviceAccount.enabled | Service account for JasperReports® Server webapp | true | +| serviceAccount.annotations | Adds new annotations | null | +| serviceAccount.name | Name of the service account | jasperserver-pro | +| rbac.create | Creates role and role binding | true | +| rbac.name | Name of the JasperReports® Server role and role binding | jasperserver-role | +| podAnnotations | Adds pod annotations | null | +| securityContext.capabilities.drop | Drops Linux capabilites for the JasperReports® Server webapp | All | +| securityContext.runAsNonRoot | Runs the JasperReports® Server webapp as non root user | true | +| securityContext.runAsUser | User id to run the JasperReports® Server webapp | 10099 | +| buildomatic.enabled | Installs or skips creation of the JasperReports® Server repository DB | true | +| buildomatic.name | Name of the JasperReports® Server command line tool | jasperserver-buildomatic | +| buildomatic.imageTag | Buildomatic image tag | Same as JasperReports® Server release version | +| buildomatic.imageName | Name of the buildomatic image | null | +| buildomatic.pullPolicy | Image pull policy | IfNotPresent | +| buildomatic.PullSecrets | Image pull secrets | null | +| buildomatic.includeSamples | Installs JasperReports® Server samples in JasperReports Server DB | true | +| db.env | Enables the DB configuration using environment variables | false | +| db.jrs.dbHost | JasperReports Server repository DB host | repository-postgresql.default.svc.cluster.local | +| db.jrs.dbPort | JasperReports Server repository DB port | 5432 | +| db.jrs.dbName | JasperReports Server repository DB name | jasperserver | +| db.jrs.dbUserName | JasperReports Server repository DB user name | postgres | +| db.jrs.dbPassword | JasperReports Server repository DB password | postgres | +| db.audit.enabled | Install JasperReports Server Audit into separate DB | false | +| db.audit.dbHost | JasperReports Server audit DB host | null | +| db.audit.dbPort | JasperReports Server audit DB port | null | +| db.audit.dbName | JasperReports Server audit DB name | null | +| db.audit.dbUserName | JasperReports Server audit DB user name | null | +| db.audit.dbPassword | JasperReports Server audit DB password | null | +| 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 | +| db.analytics.dbUserName | JasperReports® Server analytics read-only DB username, used when secrets enabled | postgres | +| db.analytics.dbPassword | JasperReports® Server analytics read-only DB password, used when secrets enabled | postgres | +| db.auditAnalytics.dbUserName | JasperReports® Server Audit Analytics read-only DB username, used when secrets enabled | postgres | +| db.auditAnalytics.dbPassword | JasperReports® Server Audit Analytics read-only DB password, used when secrets enabled | postgres | +| extraEnv.javaopts | Adds JAVA_OPTS to JasperReports® Server application | -XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 | +| extraEnv.normal | Adds all the normal key value pair variables | null | +| extraEnv.secrets | Adds all the environment references from secrets or configmaps | null | +| extraVolumeMounts | Adds extra volume mounts | null | +| extraVolumes | Adds extra volumes | null | +| Service.type | JasperReports® Server Service type | ClusterIP | +| Service.port | JasperReports® Server Service port | 80 | +| healthcheck.enabled | Checks JasperReports® Server pod health status | true | +| healthcheck.livenessProbe.port | JasperReports® Server container port | 8080 | +| healthcheck.livenessProbe.initialDelaySeconds | Initial waiting time to check the health and restarts the JasperReports® Server Webapp pod | 350 | +| healthcheck.livenessProbe.failureThreshold | Threshold for health checks | 10 | +| healthcheck.livenessProbe.periodSeconds | Time period to check the health | 10 | +| healthcheck.livenessProbe.timeoutSeconds | Timeout | 4 | +| healthcheck.readinessProbe.port | JasperReports® Server container port | 8080 | +| healthcheck.readinessProbe.initialDelaySeconds | Initial delay before checking the health checks | 90 | +| healthcheck.readinessProbe.failureThreshold | Threshold for health checks | 15 | +| healthcheck.readinessProbe.periodSeconds | Time period to check the health checks | 10 | +| healthcheck.readinessProbe.timeoutSeconds | Timeout | 4 | +| resources.enabled | Enables the minimum and maximum resources used by JasperReports® Server | true | +| resources.limits.cpu | Maximum CPU for JasperReports® Server Webapp pod | "3" | +| resources.limits.memory | Maximum Memory for JasperReports® Server Webapp pod | 7.5Gi | +| resources.requests.cpu | Minimum CPU for JasperReports® Server Webapp pod | "2" | +| resources.requests.memory | Minimum Memory for JasperReports® Server Webapp pod | 3.5Gi | +| jms.enabled | Enables the ActiveMQ cache service | true | +| jms.jmsBrokerUrl | Override ActiveMQ Broker Url | null | +| jms.name | ActiveMQ deployment name | jasperserver-cache | +| jms.serviceName | ActiveMQ service name | jasperserver-cache-service | +| jms.imageName | Name of the Activemq image | bansamadev/activemq | +| jms.imageTag | Activemq image tag | 5.17.2 | +| jms.healthcheck.enabled | | true | +| jms.healthcheck.livenessProbe.port | Container port | 61616 | +| jms.healthcheck.livenessProbe.initialDelaySeconds | Initial delay | 100 | +| jms.healthcheck.livenessProbe.failureThreshold | Threshold for health check | 10 | +| jms.healthcheck.livenessProbe.periodSeconds | Time period for health check | 10 | +| jms.healthcheck.readinessProbe.port | Container port | 61616 | +| jms.healthcheck.readinessProbe.initialDelaySeconds | Initial delay | 10 | +| jms.healthcheck.readinessProbe.failureThreshold | Threshold for health check | 15 | +| jms.healthcheck.readinessProbe.periodSeconds | Time period for health check | 10 | +| jms.securityContext.capabilities.drop | Linux capabilities to drop for the pod | All | +| ingress.enabled | JasperReports® Server ingress | true | +| ingress.annotations.ingress.kubernetes.io\/cookie-persistence | Work with multiple pods and stickyness | "JRS_COOKIE" | +| ingress.hosts.host | Adds valid DNS hostname to access the JasperReports® Server | null | +| ingress.tls | Adds TLS secret name to allow secure traffic | null | +| scalableQueryEngine.enabled | Deploy and configure Scalable Query Engine | false | +| scalable-query-engine.replicaCount | Number of pods for Scalable Query Engine | 1 | +| scalable-query-engine.image.tag | Scalable Query Engine image tag | 9.0.0 | +| scalable-query-engine.image.name | Name of the Scalable Query Engine image | null | +| scalable-query-engine.image.pullPolicy | Scalable Query Engine image pull policy | ifNotPresent | +| scalable-query-engine.autoscaling.enabled | Enables the HPA for Scalable Query Engine | true | +| scalable-query-engine.drivers.image.tag | Scalable Query Engine Drivers image tag | 9.0.0 | +| scalable-query-engine.drivers.image.name | Scalable Query Engine Drivers image name | null | +| scalable-query-engine.kubernetes-ingress.controller.service.type | Scalable Query Engine Service Type | ClusterIP | +| autoscaling.enabled | Scales the JasperReports Server application, **Note:** Make sure metric server is installed or metrics are enabled | false | +| autoscaling.minReplicas | Minimum number of pods maintained by autoscaler | 1 | +| autoscaling.maxReplicas | Maximum number of pods maintained by autoscaler | 4 | +| autoscaling.targetCPUUtilizationPercentage | Minimum CPU utilization to scale up the application | 50% | +| autoscaling.targetMemoryUtilizationPercentage | Minimum memory utilization to scale up the JasperReports® Server applications | 50% | +| autoscaling.scaleDown.stabilizationWindowSeconds | Time to give JasperReports® Server Webapp pod to finish all current tasks | 300 | +| metrics.enabled | Enables the Prometheus metrics | false | +| kube-prometheus-stack.prometheus-node-exporter.hostRootFsMount | | false | +| kube-prometheus-stack.grafana.service.type | Grafana service type | NodePort | +| logging.enabled | Enables the centralized logging setup | false | +| elasticsearch.volumeClaimTemplate.resources.requests.storage | | 10Gi | +| kibana.service.type | Kibana service type | NodePort | +| elasticsearch.replicas | Number of replicas for Elasticsearch | 1 | +| tolerations | Adds the tolerations as per K8s standard if needed | null | +| affinity | Adds the affinity as per K8s standards if needed | null | # Adding External Helm Repositories diff --git a/jaspersoft-containers/K8s/jrs/helm/Chart.yaml b/jaspersoft-containers/K8s/jrs/helm/Chart.yaml index 8ba5d83..e6d04d8 100644 --- a/jaspersoft-containers/K8s/jrs/helm/Chart.yaml +++ b/jaspersoft-containers/K8s/jrs/helm/Chart.yaml @@ -3,7 +3,7 @@ name: jasperserver-pro description: JasperReportServer deployment in K8s type: application version: 1.0.0 -appVersion: "8.2.0" +appVersion: "9.0.0" keywords: - Analytics - BI Tool diff --git a/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml b/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml index 3656145..42b6dc5 100644 --- a/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml +++ b/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml @@ -18,6 +18,22 @@ data: url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}" factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory" /> + {{- if .Values.db.audit.enabled }} + {{- end }} + {{- if .Values.db.audit.enabled }} + + {{- else if semverCompare ">= 9.0.0" .Values.jrsVersion }} + {{- end }}