fixed scalableQueryEngine

jaspersoft-containers/Docker/jrs/.env

@@ -14,5 +14,5 @@ JS_INSTALL_TARGETS=gen-config pre-install-test-pro prepare-all-pro-dbs-normal
 # To connect the Scalable Adhoc worker
 # docker for desktop  , it should be host.docker.internal
 # for linux , use the complete DNS or host IP
-SCALABLE_QUERY_ENGINE_ENABLED=false
+SCALABLE_QUERY_ENGINE_ENABLED=true
 SCALABLE_QUERY_ENGINE_URL=http://host.docker.internal:8081

jaspersoft-containers/K8s/jrs/README.md

@@ -204,9 +204,9 @@ These details are stored in Kubernetes secrets and used as environment variables
       AUDIT_DB_USER_NAME: audit-db-user-name
       AUDIT_DB_PASSWORD: audit-password
 
-3. 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/scalableAdhocWorker#readme) ).
-4. Generate the keystore and copy it to the `OpenShift/jrs/helm/secrets/keystore` folder, see here for [Keystore Generation ](../../Docker/jrs#keystore-generation).
-5. Copy the TIBCO JasperReports® Server license to the `OpenShift/jrs/helm/secrets/license` folder.
+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 `OpenShift/jrs/helm/secrets/keystore` folder, see here for [Keystore Generation ](../../Docker/jrs#keystore-generation).
+6. Copy the TIBCO JasperReports® Server license to the `OpenShift/jrs/helm/secrets/license` folder.
 
 ## JMS Configuration
   By default, TIBCO JasperReports® Server will install using activemq docker image. You can disable it by changing the parameter `jms.enabled=false`. 

jaspersoft-containers/K8s/jrs/helm/Chart.lock

@@ -13,9 +13,6 @@ dependencies:
   version: 7.12.0
 - name: scalable-query-engine
   repository: file://../../scalableQueryEngine/helm
-  version: 8.0.0
-- name: jrio-at-scale
-  repository: file://../../jrio/helm
-  version: 3.0.0
-digest: sha256:9079e159a4b75b70a5c4340694dd3ed2661ec62f07e2117033cc683a864e0799
-generated: "2022-03-10T12:46:13.4875958+05:30"
+  version: 1.0.0
+digest: sha256:686ed4a690013f6a4b5d897ebe9a56f5a8aa535d29bc93ac5b626dbc234532e4
+generated: "2022-09-24T15:33:22.1156251+05:30"

jaspersoft-containers/K8s/jrs/helm/templates/NOTES.txt

@@ -2,7 +2,7 @@
 {{- if .Values.ingress.enabled }}
 
    Run below commands to get JasperReportsServer application Url
-   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ .Release.Name }}-jasperserver-ingress  -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ .Release.Name }}-jasperserver-ingress  -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
    echo http{{ if $.Values.ingress.tls }}s{{ end }}://$SERVICE_IP/jasperserver-pro
 
    {{- if .Values.metrics.enabled }}

jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.lock

@@ -13,12 +13,9 @@ dependencies:
   version: 7.12.0
 - name: redis-cluster
   repository: https://charts.bitnami.com/bitnami
-  version: 6.2.3
+  version: 7.6.0
 - name: scalable-query-engine-scaling
   repository: ""
   version: 1.0.0
-- name: adhoc-tracing
-  repository: ""
-  version: 0.1.0
-digest: sha256:565246e75e6156cae2047817b07a51361e0fb4d6a54db95879ed92ab80eea9ee
-generated: "2021-08-20T14:05:11.4230103+05:30"
+digest: sha256:54837a7c57e07241e76a031788dab4c3d23d5a5be3b5b6f88283f3ebf706aad5
+generated: "2022-09-24T15:34:11.7271186+05:30"

jaspersoft-containers/K8s/scalableQueryEngine/helm/Chart.yaml

@@ -6,7 +6,7 @@ version: 1.0.0
 appVersion: 8.0.2
 maintainers:
   - name: Jaspersoft Eng Infra
-    email: js-eng-infra@tico.com
+    email: js-eng-infra@tibco.com
 dependencies:
   - name: kubernetes-ingress
     version: 1.15.4
@@ -33,7 +33,7 @@ dependencies:
     condition: logging.enabled
 
   - name: redis-cluster
-    version: "6.2.3"
+    version: "7.6.0"
     repository: "@bitnami"
     condition: rediscluster.enabled
     tags:

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.0.0
+appVersion: 8.0.2
 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"

jaspersoft-containers/K8s/scalableQueryEngine/helm/charts/scalable-query-engine-scaling/values.yaml

@@ -1,4 +1,4 @@
-jrsVersion: 8.0.0
+jrsVersion: 8.0.2
 queryEngine:
   deployment: jrs-scalable-query-engine
 

jaspersoft-containers/K8s/scalableQueryEngine/helm/templates/NOTES.txt

@@ -1,6 +1,6 @@
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
-   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ .Release.Name }}-query-engine-ingress  -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ .Release.Name }}-query-engine-ingress  -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
    echo http{{ if $.Values.ingress.tls }}s{{ end }}://$SERVICE_IP/query-engine/actuator/health
 
    {{- if .Values.metrics.enabled }}

jaspersoft-containers/K8s/scalableQueryEngine/helm/templates/deployment.yaml

@@ -28,10 +28,6 @@ spec:
         {{ include "initcontainerconfig" . | nindent 8 }}
       containers:
         - name: scalable-query-engine
-          {{ - if .Values.image.PullSecrets }}
-          imagePullSecrets:
-            - name: {{ .Values.image.PullSecrets }}
-          {{ - end }}
           image: {{ default "scalable-query-engine" .Values.image.name}}:{{ default "latest" .Values.image.tag}}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:

jaspersoft-containers/K8s/scalableQueryEngine/helm/templates/drivers-job.yaml

@@ -17,10 +17,10 @@ spec:
         {{- include "queryEngine.labels" . | nindent 8 }}
     spec:
       restartPolicy: Never
-      {{ - if.Values.drivers.PullSecrets }}
+      {{- if.Values.drivers.PullSecrets }}
       imagePullSecrets:
         - name: {{ .Values.drivers.PullSecrets }}
-        {{ - endif }}
+        {{- end }}
       securityContext:
         fsGroup: 13999
       containers: