diff --git a/jaspersoft-containers/Docker/jrs/.env b/jaspersoft-containers/Docker/jrs/.env index 488fdca..187b8e9 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.1.0 -JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.1.0 -JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.1.0 +JASPERREPORTS_SERVER_VERSION=8.1.1 +JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.1.1 +JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.1.1 TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk JDK_BASE_IMAGE=openjdk:11-jdk RELEASE_DATE=May 13,2022 diff --git a/jaspersoft-containers/Docker/jrs/Dockerfile b/jaspersoft-containers/Docker/jrs/Dockerfile index cf2afe1..34b0adf 100644 --- a/jaspersoft-containers/Docker/jrs/Dockerfile +++ b/jaspersoft-containers/Docker/jrs/Dockerfile @@ -5,7 +5,7 @@ #ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-corretto ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk ARG INSTALL_CHROMIUM=false -ARG JASPERREPORTS_SERVER_VERSION=8.1.0 +ARG JASPERREPORTS_SERVER_VERSION=8.1.1 FROM ${TOMCAT_BASE_IMAGE} as deployment @@ -16,7 +16,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.1.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1} 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 aafd58a..e3d6657 100644 --- a/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic +++ b/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic @@ -6,11 +6,11 @@ ARG JDK_BASE_IMAGE=openjdk:11-jdk FROM ${JDK_BASE_IMAGE} -ARG JASPERREPORTS_SERVER_VERSION=8.1.0 +ARG JASPERREPORTS_SERVER_VERSION=8.1.1 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.1.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1} 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 65bbb4f..c4340e3 100644 --- a/jaspersoft-containers/Docker/jrs/README.md +++ b/jaspersoft-containers/Docker/jrs/README.md @@ -71,9 +71,9 @@ These variables are passed to the command line with `--build-arg` for docker bui |INSTALL_CHROMIUM| Whether Chromium installed. **Note: TIBCO Software Inc. is not liable for license violation of chromium.**| false| |JASPERREPORTS_SERVER_APP_IMAGE_NAME| Name of the TIBCO JasperReports® Server image | jasperserver-webapp| |JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME| Name of the TIBCO JasperReports® Server buildomatic image | jasperserver-buildomatic| -|JASPERREPORTS_SERVER_VERSION|Version number of TIBCO JasperReports® Server|8.1.0| -|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server web app |8.1.0| -|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server buildomatic |8.1.0| +|JASPERREPORTS_SERVER_VERSION|Version number of TIBCO JasperReports® Server|8.1.1| +|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server web app |8.1.1| +|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server buildomatic |8.1.1| |TOMCAT_BASE_IMAGE|Tomcat Docker image certified for the version of TIBCO JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types "tomcat:9.0.54-jdk11-openjdk" for Debian and "tomcat:9.0.54-jdk11-corretto" for Amazon Linux 2 |tomcat:9.0.54-jdk11-openjdk| |JDK_BASE_IMAGE|Java Docker image certified for the version of TIBCO JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types openjdk:11-jdk and amazoncorretto:11|openjdk:11-jdk| RELEASE_DATE|Release date of TIBCO JasperReports® Server | May 13, 2022 | @@ -231,13 +231,12 @@ If you plan to work with **default** JasperReports® Server and buildomatic setu # Deploying the Application in Cluster Mode - It uses haproxy as a load balancer and activemq as a cache replication. Before launching the application, make sure images are created successfully and repository DB setup is also completed. +- Update the value of parameter 'replicas' in cluster-docker-compose.yml file depending upon how many containers you would want to create. `docker-compose -f cluster-docker-compose.yml up -d` - Wait for the application to start and access the application by using `host-name/jasperserver-pro` (port is not needed, haproxy is running on port 80). - **Note:** Although an external repository DB is used, a PostgreSQL container is created, and it does not impact TIBCO JasperReports® Server. If you don't want to create a PostgreSQL container, then remove repository dependency from jasperserver-webapp-1 and jasperserver-webapp-2 services in cluster-docker-compose.yaml. - # Deploying JasperReports Server and Scalable Query Engine diff --git a/jaspersoft-containers/Docker/jrs/cluster-config/haproxy.cfg b/jaspersoft-containers/Docker/jrs/cluster-config/haproxy.cfg index 9b8ed38..f2159a2 100644 --- a/jaspersoft-containers/Docker/jrs/cluster-config/haproxy.cfg +++ b/jaspersoft-containers/Docker/jrs/cluster-config/haproxy.cfg @@ -3,27 +3,39 @@ global daemon maxconn 256 +resolvers docker + nameserver dns1 127.0.0.11:53 + resolve_retries 3 + timeout resolve 1s + timeout retry 1s + hold other 10s + hold refused 10s + hold nx 10s + hold timeout 10s + hold valid 10s + hold obsolete 10s + defaults - mode http - timeout connect 5000ms + mode http + timeout connect 5000ms timeout client 50000ms timeout server 50000ms + log global + option httplog - listen stats +listen stats bind *:9999 stats enable stats hide-version stats uri /stats stats auth admin:admin@123 - + frontend myApp bind *:80 - #acl acl_myApp path_sub myApp - #use_backend myAppBackEnd if acl_myApp use_backend jasperserver-pro backend jasperserver-pro balance roundrobin - cookie JSESSIONID prefix nocache - server web01 jasperserver-webapp-1:8080 check cookie web01 - server web02 jasperserver-webapp-2:8080 check cookie web02 + dynamic-cookie-key mysecretphrase + cookie JSESSIONID prefix dynamic nocache + server-template jasperserver-webapp- 10 jasperserver-webapp:8080 check resolvers docker init-addr libc,none diff --git a/jaspersoft-containers/Docker/jrs/cluster-docker-compose.yml b/jaspersoft-containers/Docker/jrs/cluster-docker-compose.yml index ed2bd5b..ffe7d19 100644 --- a/jaspersoft-containers/Docker/jrs/cluster-docker-compose.yml +++ b/jaspersoft-containers/Docker/jrs/cluster-docker-compose.yml @@ -5,71 +5,54 @@ version: '3.9' services: -##### JRS First instance - jasperserver-webapp-1: + ##### JRS First instance + jasperserver-webapp: image: "${JASPERREPORTS_SERVER_APP_IMAGE_NAME}:${JASPERREPORTS_SERVER_APP_IMAGE_TAG}" + networks: + - jrs_network env_file: .env environment: - JAVA_OPTS: "-Xmx3500M -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 " + JAVA_OPTS: "-XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 " volumes: - ./resources/keystore:/usr/local/share/jasperserver-pro/keystore - ./resources/license/jasperserver.license:/usr/local/share/jasperserver-pro/license/jasperserver.license mem_limit: 6g mem_reservation: 3g cpu_shares: 1000 - - depends_on: - - activemq - - repository - -##### JRS Second instance - jasperserver-webapp-2: - image: "${JASPERREPORTS_SERVER_APP_IMAGE_NAME}:${JASPERREPORTS_SERVER_APP_IMAGE_TAG}" - env_file: .env - environment: - JAVA_OPTS: "-Xmx3500M -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 " - volumes: - - ./resources/keystore:/usr/local/share/jasperserver-pro/keystore - - ./resources/license/jasperserver.license:/usr/local/share/jasperserver-pro/license/jasperserver.license - mem_limit: 6g - mem_reservation: 3g - cpu_shares: 1000 - + deploy: + mode: replicated + replicas: 2 depends_on: - activemq - - repository -####### Loadbalancer to manage the JRS Instances and session replication + ####### Loadbalancer to manage the JRS Instances and session replication haproxy: image: haproxy:2.3.9-alpine + networks: + - jrs_network ports: - 80:80 - 9999:9999 volumes: - ./cluster-config:/usr/local/etc/haproxy depends_on: - - jasperserver-webapp-1 - - jasperserver-webapp-2 + - jasperserver-webapp -##### Repository cache replication runs on 61616 port and 8161 to access from web + ##### Repository cache replication runs on 61616 port and 8161 to access from web activemq: - image: rangareddyv/activemq-openshift:5.16.2 + image: bansamadev/activemq:5.17.2 + networks: + - jrs_network ports: - 8161:8161 - 61616:61616 -#### JRS Repository database - repository: - image: postgres:12 - ports: - - 5432:5432 - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - volumes: - - postgres-data:/var/lib/postgresql/data - -#### Postgresql Volume -volumes: - postgres-data: - name: jrs-repository-vol +networks: + jrs_network: + # use the bridge driver, but enable IPv6 + driver: bridge + ipam: + driver: default + config: + - subnet: 172.16.238.0/24 + gateway: 172.16.238.1 diff --git a/jaspersoft-containers/Docker/jrs/docker-compose.yml b/jaspersoft-containers/Docker/jrs/docker-compose.yml index 1163a90..172a2f4 100644 --- a/jaspersoft-containers/Docker/jrs/docker-compose.yml +++ b/jaspersoft-containers/Docker/jrs/docker-compose.yml @@ -20,7 +20,7 @@ services: - 8080:8080 - 8443:8443 environment: - JAVA_OPTS: "-Xmx3500M -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 " + JAVA_OPTS: "-XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 " volumes: - ./resources/keystore:/usr/local/share/jasperserver-pro/keystore - ./resources/license/jasperserver.license:/usr/local/share/jasperserver-pro/license/jasperserver.license @@ -60,7 +60,7 @@ services: - postgres-data:/var/lib/postgresql/data activemq: - image: rangareddyv/activemq-openshift:5.16.2 + image: bansamadev/activemq:5.17.2 ports: - 8161:8161 - 61616:61616 diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/.env b/jaspersoft-containers/Docker/scalableQueryEngine/.env index 807c3be..90069b1 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/.env +++ b/jaspersoft-containers/Docker/scalableQueryEngine/.env @@ -1,8 +1,8 @@ -JASPERREPORTS_SERVER_VERSION=8.1.0 +JASPERREPORTS_SERVER_VERSION=8.1.1 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.1.0 -SCALABLE_QUERY_ENGINE_IMAGE_TAG=8.1.0 +SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG=8.1.1 +SCALABLE_QUERY_ENGINE_IMAGE_TAG=8.1.1 JDK_BASE_IMAGE=openjdk:11-jdk ks=/etc/secrets/keystore ksp=/etc/secrets/keystore diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile index 5d0215f..7ce0f17 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile +++ b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile @@ -4,13 +4,13 @@ #ARG JDK_BASE_IMAGE=amazoncorretto:11 ARG JDK_BASE_IMAGE=openjdk:11-jdk -ARG JASPERREPORTS_SERVER_VERSION=8.1.0 +ARG JASPERREPORTS_SERVER_VERSION=8.1.1 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.1.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1} ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin ENV WORKER_HOME /usr/local/scalable-query-engine @@ -59,4 +59,4 @@ COPY --from=worker --chown=jasperserver:root /usr/local/scalable-query-engine/sp COPY --from=worker --chown=jasperserver:root /usr/local/scalable-query-engine/snapshot-dependencies/ . COPY --from=worker --chown=jasperserver:root /usr/local/scalable-query-engine/application/ . -ENTRYPOINT ["java", "org.springframework.boot.loader.PropertiesLauncher"] \ No newline at end of file +ENTRYPOINT ["java", "org.springframework.boot.loader.PropertiesLauncher"] diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers index 9fd4c6c..fbfbc04 100644 --- a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers +++ b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers @@ -3,12 +3,12 @@ # in the license file that is distributed with this file #ARG JDK_BASE_IMAGE=amazoncorretto:11 ARG JDK_BASE_IMAGE=openjdk:11-jdk -ARG JASPERREPORTS_SERVER_VERSION=8.1.0 +ARG JASPERREPORTS_SERVER_VERSION=8.1.1 FROM ${JDK_BASE_IMAGE} as driver ARG JASPERREPORTS_SERVER_VERSION -ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1} ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine ENV JRS_HOME /usr/local/jasperreports-server @@ -26,7 +26,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.1.0} +ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1} 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 194c4e9..77d3d0b 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.1.0| +|JASPERREPORTS_SERVER_VERSION | JasperReports Server release version | 8.1.1| |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.1.0| -|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 8.1.0| +|SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG| Docker tag for Scalable Query Engine | 8.1.1| +|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 8.1.1| |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** for Debian and **amazoncorretto:11** for Amazon Linux 2 |openjdk:11-jdk| |ks | .jrsks keystore path |/etc/secrets/keystore| |ksp | .jrsksp keystore path | /etc/secrets/keystore | diff --git a/jaspersoft-containers/K8s/jrs/README.md b/jaspersoft-containers/K8s/jrs/README.md index a6081f1..cf3cfca 100644 --- a/jaspersoft-containers/K8s/jrs/README.md +++ b/jaspersoft-containers/K8s/jrs/README.md @@ -51,7 +51,7 @@ These parameters and values are the same as parameters in `K8s/jrs/helm/values.y | Parameter | Description | default Value | |------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | replicaCount | Number of pods | 1 (It will not come into effect if autoscaling is enabled.) | -| jrsVersion | TIBCO JasperReports® Server release version | 8.1.0 | +| jrsVersion | TIBCO JasperReports® Server release version | 8.1.1 | | image.tag | Name of the TIBCO JasperReports® Server webapp image tag | TIBCO JasperReports® Server Release Version | | image.name | Name of the TIBCO JasperReports® Server webapp image | jasperserver-webapp | | image.pullPolicy | Docker image pull policy | IfNotPresent | @@ -115,8 +115,8 @@ These parameters and values are the same as parameters in `K8s/jrs/helm/values.y | 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 | rangareddyv/activemq-openshift | -| jms.imageTag | Activemq image tag | 5.16.2 | +| 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 | @@ -133,11 +133,11 @@ These parameters and values are the same as parameters in `K8s/jrs/helm/values.y | 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.1.0 | +| scalable-query-engine.image.tag | Scalable Query Engine image tag | 8.1.1 | | 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.1.0 | +| scalable-query-engine.drivers.image.tag | Scalable Query Engine Drivers image tag | 8.1.1 | | 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 | @@ -207,7 +207,7 @@ These details are stored in Kubernetes secrets and used as environment variables AUDIT_DB_NAME: audit-db-name AUDIT_DB_USER_NAME: audit-db-user-name AUDIT_DB_PASSWORD: audit-password - + 4. Build the docker images for TIBCO JasperReports® Server, and Scalable Query Engine (see the [Docker JasperReports Server readme](../../Docker/jrs#readme) and [Docker Scalable Query Engine readme](../../Docker/scalableQueryEngine#readme) ). 5. Generate the keystore and copy it to the `k8s/jrs/helm/secrets/keystore` folder, see here for [Keystore Generation ](../../Docker/jrs#keystore-generation). 6. Copy the TIBCO JasperReports® Server license to the `k8s/jrs/helm/secrets/license` folder. @@ -259,7 +259,7 @@ For more information and configuration, see the [Official Docs](https://github.c - To set up the Repository DB in K8s cluster, run the below command. For this, we are using bitnami/postgresql Helm chart. See the [Official Docs](https://artifacthub.io/packages/helm/bitnami/postgresql) to configure the DB in cluster mode. -`helm install repository bitnami/postgresql --set auth.postgresPassword=postgres --version 11.6.0 --namespace jrs --create-namespace` +`helm install repository bitnami/postgresql --set auth.postgresPassword=postgres --version 11.9.13 --namespace jrs --create-namespace` - Check the pods status and make sure pods are in a running state. diff --git a/jaspersoft-containers/K8s/jrs/helm/Chart.lock b/jaspersoft-containers/K8s/jrs/helm/Chart.lock index 8bc44bd..170e799 100644 --- a/jaspersoft-containers/K8s/jrs/helm/Chart.lock +++ b/jaspersoft-containers/K8s/jrs/helm/Chart.lock @@ -13,6 +13,6 @@ dependencies: version: 7.12.0 - name: scalable-query-engine repository: file://../../scalableQueryEngine/helm - version: 8.1.0 -digest: sha256:9079e159a4b75b70a5c4340694dd3ed2661ec62f07e2117033cc683a864e0799 -generated: "2022-03-10T12:46:13.4875958+05:30" + version: 1.0.0 +digest: sha256:686ed4a690013f6a4b5d897ebe9a56f5a8aa535d29bc93ac5b626dbc234532e4 +generated: "2022-12-15T17:13:42.7253296+05:30" diff --git a/jaspersoft-containers/K8s/jrs/helm/Chart.yaml b/jaspersoft-containers/K8s/jrs/helm/Chart.yaml index 23d2491..d2e94d9 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.1.0" +appVersion: "8.1.1" keywords: - Analytics - BI Tool diff --git a/jaspersoft-containers/K8s/jrs/helm/charts/elasticsearch-7.12.0.tgz b/jaspersoft-containers/K8s/jrs/helm/charts/elasticsearch-7.12.0.tgz new file mode 100644 index 0000000..cd9df00 Binary files /dev/null and b/jaspersoft-containers/K8s/jrs/helm/charts/elasticsearch-7.12.0.tgz differ diff --git a/jaspersoft-containers/K8s/jrs/helm/charts/kibana-7.12.0.tgz b/jaspersoft-containers/K8s/jrs/helm/charts/kibana-7.12.0.tgz new file mode 100644 index 0000000..aa12fe9 Binary files /dev/null and b/jaspersoft-containers/K8s/jrs/helm/charts/kibana-7.12.0.tgz differ diff --git a/jaspersoft-containers/K8s/jrs/helm/charts/kube-prometheus-stack-16.0.1.tgz b/jaspersoft-containers/K8s/jrs/helm/charts/kube-prometheus-stack-16.0.1.tgz new file mode 100644 index 0000000..84cd993 Binary files /dev/null and b/jaspersoft-containers/K8s/jrs/helm/charts/kube-prometheus-stack-16.0.1.tgz differ diff --git a/jaspersoft-containers/K8s/jrs/helm/charts/kubernetes-ingress-1.15.4.tgz b/jaspersoft-containers/K8s/jrs/helm/charts/kubernetes-ingress-1.15.4.tgz new file mode 100644 index 0000000..16b8d46 Binary files /dev/null and b/jaspersoft-containers/K8s/jrs/helm/charts/kubernetes-ingress-1.15.4.tgz differ diff --git a/jaspersoft-containers/K8s/jrs/helm/charts/scalable-query-engine-1.0.0.tgz b/jaspersoft-containers/K8s/jrs/helm/charts/scalable-query-engine-1.0.0.tgz new file mode 100644 index 0000000..eaeb8ce Binary files /dev/null and b/jaspersoft-containers/K8s/jrs/helm/charts/scalable-query-engine-1.0.0.tgz differ diff --git a/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml b/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml index ed86c6c..94b56c3 100644 --- a/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml +++ b/jaspersoft-containers/K8s/jrs/helm/templates/db-configmap.yaml @@ -29,7 +29,7 @@ data: url="jdbc:postgresql://${AUDIT_DB_HOST}:${AUDIT_DB_PORT}/${AUDIT_DB_NAME}" factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory" /> - {{- else if semverCompare ">= 8.1.0" .Values.jrsVersion }} + {{- else if semverCompare ">= 8.1.1" .Values.jrsVersion }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/jaspersoft-containers/K8s/jrs/helm/values.yaml b/jaspersoft-containers/K8s/jrs/helm/values.yaml index 0b4a20d..d412848 100644 --- a/jaspersoft-containers/K8s/jrs/helm/values.yaml +++ b/jaspersoft-containers/K8s/jrs/helm/values.yaml @@ -3,9 +3,9 @@ # Declare variables to be passed into your templates. replicaCount: 1 -jrsVersion: 8.1.0 +jrsVersion: 8.1.1 image: - tag: 8.1.0 + tag: 8.1.1 name: pullPolicy: IfNotPresent ## Secrets must be manually created in the namespace. @@ -78,7 +78,7 @@ db: buildomatic: enabled: true name: jasperserver-buildomatic - imageTag: 8.1.0 + imageTag: 8.1.1 imageName: pullPolicy: IfNotPresent ## Secrets must be manually created in the namespace. @@ -155,8 +155,8 @@ jms: name: jasperserver-cache serviceName: jasperserver-cache-service repository: - imageName: rangareddyv/activemq-openshift - imageTag: 5.16.2 + imageName: bansamadev/activemq + imageTag: 5.17.2 healthcheck: enabled: true @@ -243,7 +243,7 @@ scalableQueryEngineUrl: {} scalable-query-engine: replicaCount: 1 image: - tag: 8.1.0 + tag: 8.1.1 name: pullPolicy: IfNotPresent autoscaling: @@ -255,7 +255,7 @@ scalable-query-engine: drivers: enabled: true image: - tag: 8.1.0 + tag: 8.1.1 name: kubernetes-ingress: controller: diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/README.md b/jaspersoft-containers/K8s/scalableQueryEngine/README.md index f68d326..faeb86b 100644 --- a/jaspersoft-containers/K8s/scalableQueryEngine/README.md +++ b/jaspersoft-containers/K8s/scalableQueryEngine/README.md @@ -35,7 +35,7 @@ These parameters and values are the same as parameters in `K8s/scalableQueryEngi | Parameter| Description | Default Value | |------------| -------------| ----------| | replicaCount| Number of pods | 2 (It will not come into effect if autoscaling is enabled.)| -| jrsVersion| TIBCO JasperReports® Server release version | 8.1.0| +| jrsVersion| TIBCO JasperReports® Server release version | 8.1.1| | image.name| Name of the Scalable Query Engine image | null | | image.tag | Name of the Scalable Query Engine image tag | JasperReports® Server Release Version| | image.pullPolicy | Docker image pull policy | IfNotPresent | @@ -133,7 +133,7 @@ These parameters and values are the same as parameters in `K8s/scalableQueryEngi | jrs.proxy.timedOut | timeout | 30000 | | drivers.image.enabled | Enables the drivers | true | | drivers.image.name | Image name for Scalable Query Engine Driver image | null | -| drivers.image.tag | Scalable Query Engine Driver image tag | 8.1.0 | +| drivers.image.tag | Scalable Query Engine Driver image tag | 8.1.1 | | drivers.image.pullPolicy | Image pull policy | IfNotPresent | | drivers.storageClassName | Driver image storage class name | hostPath | | drivers.image.jdbcDriversPath | JDBC drivers path | /usr/lib/drivers | diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.lock b/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.lock index c1a331e..89d2cd7 100644 --- a/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.lock +++ b/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.lock @@ -13,9 +13,9 @@ dependencies: version: 7.12.0 - name: redis-cluster repository: https://charts.bitnami.com/bitnami - version: 6.2.3 + version: 7.6.4 - name: scalable-query-engine-scaling repository: "" version: 1.0.0 -digest: sha256:565246e75e6156cae2047817b07a51361e0fb4d6a54db95879ed92ab80eea9ee -generated: "2021-08-20T14:05:11.4230103+05:30" +digest: sha256:8dd4ce24539438f888c86ad3440e5b9caf6bc21a8aa71659e4b20002e172e623 +generated: "2022-12-20T23:14:04.179542+05:30" diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.yaml b/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.yaml index e869ded..21d1f7c 100644 --- a/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.yaml +++ b/jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.yaml @@ -3,7 +3,7 @@ name: scalable-query-engine description: Helm Chart for Scalable Query Engine type: application version: 1.0.0 -appVersion: 8.1.0 +appVersion: 8.1.1 maintainers: - name: Jaspersoft Eng Infra email: js-eng-infra@tico.com @@ -33,7 +33,7 @@ dependencies: condition: logging.enabled - name: redis-cluster - version: "7.6.0" + version: 7.6.4 repository: "@bitnami" condition: rediscluster.enabled tags: diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/redis-cluster-6.2.3.tgz b/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/redis-cluster-6.2.3.tgz deleted file mode 100644 index fb54e0e..0000000 Binary files a/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/redis-cluster-6.2.3.tgz and /dev/null differ diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/redis-cluster-7.6.4.tgz b/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/redis-cluster-7.6.4.tgz new file mode 100644 index 0000000..6ff42de Binary files /dev/null and b/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/redis-cluster-7.6.4.tgz differ diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml b/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml index b755b69..4faccbc 100644 --- a/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml +++ b/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml @@ -3,10 +3,10 @@ name: scalable-query-engine-scaling description: Scalable Query Engine custome scaling type: application version: 1.0.0 -appVersion: 8.1.0 +appVersion: 8.1.1 maintainers: - name: Jaspersoft Eng Infra - email: js-eng-infra@tico.com + email: js-eng-infra@tibco.com dependencies: - name: prometheus-adapter version: "2.15.2" diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml b/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml index fec1e83..4b974b9 100644 --- a/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml +++ b/jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml @@ -1,4 +1,4 @@ -jrsVersion: 8.1.0 +jrsVersion: 8.1.1 queryEngine: deployment: jrs-scalable-query-engine diff --git a/jaspersoft-containers/K8s/scalableQueryEngine/helm/values.yaml b/jaspersoft-containers/K8s/scalableQueryEngine/helm/values.yaml index ad3d105..1825b3a 100644 --- a/jaspersoft-containers/K8s/scalableQueryEngine/helm/values.yaml +++ b/jaspersoft-containers/K8s/scalableQueryEngine/helm/values.yaml @@ -1,7 +1,7 @@ replicaCount: 1 -jrsVersion: 8.1.0 +jrsVersion: 8.1.1 image: - tag: 8.1.0 + tag: 8.1.1 name: pullPolicy: IfNotPresent ## Secrets must be manually created in the namespace. @@ -232,7 +232,7 @@ jrs: drivers: enabled: true image: - tag: 8.1.0 + tag: 8.1.1 name: pullPolicy: IfNotPresent PullSecrets: diff --git a/jaspersoft-containers/OpenShift/jrs/README.md b/jaspersoft-containers/OpenShift/jrs/README.md index a14166e..0d620c9 100644 --- a/jaspersoft-containers/OpenShift/jrs/README.md +++ b/jaspersoft-containers/OpenShift/jrs/README.md @@ -40,7 +40,7 @@ These parameters and values are the same as parameters in values.yaml. | Parameter| Description | default Value | |------------| -------------| ----------| | replicaCount| Number of pods | 1 (It will not come into effect if autoscaling is enabled.)| -| jrsVersion|TIBCO JasperReports® Server release version | 8.1.0 | +| jrsVersion|TIBCO JasperReports® Server release version | 8.1.1 | | image.tag | Name of the TIBCO JasperReports® Server webapp image tag | TIBCO JasperReports® Server Release Version| | image.name| Name of the TIBCO JasperReports® Server webapp image | jrscontainerregistry.azurecr.io/jrs/webapp| | image.pullPolicy| Docker image pull policy | IfNotPresent| @@ -103,8 +103,8 @@ These parameters and values are the same as parameters in values.yaml. | jms.jmsBrokerUrl | | null| | jms.name | Name of the JMS | jasperserver-cache| | jms.serviceName | Name of the JMS Service | jasperserver-cache-service | -| jms.imageName | Name of the Activemq image | rangareddyv/activemq-openshift | -| jms.imageTag | Activemq image tag | 5.16.2 | +| 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 | @@ -121,11 +121,11 @@ These parameters and values are the same as parameters in values.yaml. | ingress.tls | Adds TLS secret name to allow secure traffic | null| | scalableQueryEngine.enabled | Communicates with 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.1.0| +| scalable-query-engine.image.tag | Scalable Query Engine image tag | 8.1.1| | 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 image tag | 8.1.0 | +| scalable-query-engine.drivers.image.tag | Scalable Query Engine image tag | 8.1.1 | | scalable-query-engine.drivers.image.name | | null | | scalable-query-engine.drivers.storageClassName | | hostpath | | scalable-query-engine.kubernetes-ingress.controller.service.type | | ClusterIP | @@ -199,7 +199,7 @@ External JMS instance can also be used instead of in-build JMS setup by adding t - To set up the Repository DB in the OpenShift cluster, run the below command. For this, we are using bitnami/postgresql Helm chart. See the [Official Docs](https://artifacthub.io/packages/helm/bitnami/postgresql) to configure the DB in cluster mode. -`helm install repository bitnami/postgresql --set auth.postgresPassword=postgres --version 11.6.0 ` +`helm install repository bitnami/postgresql --set auth.postgresPassword=postgres --version 11.9.13 ` - Check the pods status and make sure pods are in a running state. diff --git a/jaspersoft-containers/OpenShift/jrs/helm/Chart.yaml b/jaspersoft-containers/OpenShift/jrs/helm/Chart.yaml index c2fadb1..2c6b2a3 100644 --- a/jaspersoft-containers/OpenShift/jrs/helm/Chart.yaml +++ b/jaspersoft-containers/OpenShift/jrs/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: jasperserver-pro description: JasperReportServer deployment in K8s type: application -version: 1.0.1 -appVersion: "8.1.0" +version: 1.0.0 +appVersion: "8.1.1" keywords: - Analytics - BI Tool diff --git a/jaspersoft-containers/OpenShift/jrs/helm/charts/scalable-query-engine-1.0.0.tgz b/jaspersoft-containers/OpenShift/jrs/helm/charts/scalable-query-engine-1.0.0.tgz index 9a09ce2..72ad654 100644 Binary files a/jaspersoft-containers/OpenShift/jrs/helm/charts/scalable-query-engine-1.0.0.tgz and b/jaspersoft-containers/OpenShift/jrs/helm/charts/scalable-query-engine-1.0.0.tgz differ diff --git a/jaspersoft-containers/OpenShift/jrs/helm/templates/db-configmap.yaml b/jaspersoft-containers/OpenShift/jrs/helm/templates/db-configmap.yaml index ed86c6c..94b56c3 100644 --- a/jaspersoft-containers/OpenShift/jrs/helm/templates/db-configmap.yaml +++ b/jaspersoft-containers/OpenShift/jrs/helm/templates/db-configmap.yaml @@ -29,7 +29,7 @@ data: url="jdbc:postgresql://${AUDIT_DB_HOST}:${AUDIT_DB_PORT}/${AUDIT_DB_NAME}" factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory" /> - {{- else if semverCompare ">= 8.1.0" .Values.jrsVersion }} + {{- else if semverCompare ">= 8.1.1" .Values.jrsVersion }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/jaspersoft-containers/OpenShift/jrs/helm/values.yaml b/jaspersoft-containers/OpenShift/jrs/helm/values.yaml index 83ba360..ef6a454 100644 --- a/jaspersoft-containers/OpenShift/jrs/helm/values.yaml +++ b/jaspersoft-containers/OpenShift/jrs/helm/values.yaml @@ -3,9 +3,9 @@ # Declare variables to be passed into your templates. replicaCount: 1 -jrsVersion: 8.1.0 +jrsVersion: 8.1.1 image: - tag: 8.1.0 + tag: 8.1.1 name: jrscontainerregistry.azurecr.io/jrs/webapp pullPolicy: IfNotPresent ## Secrets must be manually created in the namespace. @@ -57,7 +57,7 @@ securityContext: buildomatic: enabled: true name: jasperserver-buildomatic - imageTag: 8.1.0 + imageTag: 8.1.1 imageName: jrscontainerregistry.azurecr.io/jrs/buildomatic pullPolicy: IfNotPresent ## Secrets must be manually created in the namespace. @@ -155,8 +155,8 @@ jms: name: jasperserver-cache serviceName: jasperserver-cache-service repository: - imageName: rangareddyv/activemq-openshift - imageTag: 5.16.2 + imageName: bansamadev/activemq + imageTag: 5.17.2 healthcheck: enabled: true @@ -207,7 +207,7 @@ route: ## Enable/ Disable Scalable query engine scalableQueryEngine: - enabled: true + enabled: false ## Provide the external Scalable query engine URL @@ -220,7 +220,7 @@ scalableQueryEngineUrl: {} scalable-query-engine: replicaCount: 1 image: - tag: 8.1.0 + tag: 8.1.1 name: pullPolicy: IfNotPresent autoscaling: @@ -232,7 +232,7 @@ scalable-query-engine: drivers: enabled: true image: - tag: 8.1.0 + tag: 8.1.1 name: kubernetes-ingress: controller: diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/README.md b/jaspersoft-containers/OpenShift/scalableQueryEngine/README.md index db01773..823df34 100644 --- a/jaspersoft-containers/OpenShift/scalableQueryEngine/README.md +++ b/jaspersoft-containers/OpenShift/scalableQueryEngine/README.md @@ -33,7 +33,7 @@ | Parameter| Description | Default Value | |------------| -------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | replicaCount| Number of pods | 1 (It will not come into effect if autoscaling is enabled.) | -| jrsVersion| TIBCO JasperReports® Server release version | 8.1.0 | +| jrsVersion| TIBCO JasperReports® Server release version | 8.1.1 | | image.name| Name of the Scalable Query Engine image | jrscontainerregistry.azurecr.io/engine/worker | | image.tag | Name of the Scalable Query Engine image tag | JasperReports® Server Release Version | | image.pullPolicy | Docker image pull policy | IfNotPresent | @@ -138,7 +138,7 @@ | jrs.load-balancer.timedOut | | 30000 | | drivers.enabled | Enable the drivers | true | | drivers.image.name | Image name for Scalable Query Engine Driver image | jrscontainerregistry.azurecr.io/engine/driver | -| drivers.image.tag | Scalable Query Engine Driver image tag | 8.1.0 | +| drivers.image.tag | Scalable Query Engine Driver image tag | 8.1.1 | | drivers.image.pullPolicy | Image pull policy | IfNotPresent | | drivers.storageClassName | Driver image storage class name | hostPath | | drivers.image.jdbcDriversPath | JDBC drivers path | /usr/lib/drivers | diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.lock b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.lock index 7757f0a..1041b45 100644 --- a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.lock +++ b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.lock @@ -13,6 +13,9 @@ dependencies: version: 7.12.0 - name: redis-cluster repository: https://charts.bitnami.com/bitnami - version: 6.2.3 -digest: sha256:dc3a159c559fe4a2d7c95561efa59559086fc3f7df315cdf88c684b3241652d2 -generated: "2021-08-02T16:34:51.1229948+05:30" + version: 7.6.4 +- name: scalable-query-engine-scaling + repository: "" + version: 1.0.0 +digest: sha256:8dd4ce24539438f888c86ad3440e5b9caf6bc21a8aa71659e4b20002e172e623 +generated: "2022-12-20T23:16:25.6932285+05:30" diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.yaml b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.yaml index e869ded..21d1f7c 100644 --- a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.yaml +++ b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/Chart.yaml @@ -3,7 +3,7 @@ name: scalable-query-engine description: Helm Chart for Scalable Query Engine type: application version: 1.0.0 -appVersion: 8.1.0 +appVersion: 8.1.1 maintainers: - name: Jaspersoft Eng Infra email: js-eng-infra@tico.com @@ -33,7 +33,7 @@ dependencies: condition: logging.enabled - name: redis-cluster - version: "7.6.0" + version: 7.6.4 repository: "@bitnami" condition: rediscluster.enabled tags: diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/redis-cluster-6.2.3.tgz b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/redis-cluster-6.2.3.tgz deleted file mode 100644 index fb54e0e..0000000 Binary files a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/redis-cluster-6.2.3.tgz and /dev/null differ diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/redis-cluster-7.6.4.tgz b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/redis-cluster-7.6.4.tgz new file mode 100644 index 0000000..6ff42de Binary files /dev/null and b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/redis-cluster-7.6.4.tgz differ diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml index b755b69..4faccbc 100644 --- a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml +++ b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/Chart.yaml @@ -3,10 +3,10 @@ name: scalable-query-engine-scaling description: Scalable Query Engine custome scaling type: application version: 1.0.0 -appVersion: 8.1.0 +appVersion: 8.1.1 maintainers: - name: Jaspersoft Eng Infra - email: js-eng-infra@tico.com + email: js-eng-infra@tibco.com dependencies: - name: prometheus-adapter version: "2.15.2" diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml index fec1e83..4b974b9 100644 --- a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml +++ b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml @@ -1,4 +1,4 @@ -jrsVersion: 8.1.0 +jrsVersion: 8.1.1 queryEngine: deployment: jrs-scalable-query-engine diff --git a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/values.yaml b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/values.yaml index 042bfef..ae06569 100644 --- a/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/values.yaml +++ b/jaspersoft-containers/OpenShift/scalableQueryEngine/helm/values.yaml @@ -1,7 +1,7 @@ replicaCount: 1 -jrsVersion: 8.1.0 +jrsVersion: 8.1.1 image: - tag: 8.1.0 + tag: 8.1.1 name: pullPolicy: IfNotPresent ## Secrets must be manually created in the namespace. @@ -244,7 +244,7 @@ jrs: drivers: enabled: true image: - tag: 8.1.0 + tag: 8.1.1 name: pullPolicy: IfNotPresent PullSecrets: