switch to cybco 0.6

Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: visualization
 description: The CYBELE Visualization
 type: application
-version: 0.2.0
+version: 0.3.0
 appVersion: 0.1.0
 
 home: https://gitlab.res.eng.it/cybele/visualization

templates/_cybco_helpers.yaml

+
+{{- define "mongodb.secretName" -}}
+{{ .Release.Name }}-mongodb-credentials
+{{- end -}}
\ No newline at end of file

templates/backend-deployment.yaml

@@ -3,6 +3,9 @@
 spec:
   template:
     spec:
+      initContainers:
+      -
+      {{ include "cybco.container" (list . "visualization.backend-init-container") }}
       containers:
       - 
       {{- include "cybco.container" (list . "visualization.backend-container") }}
@@ -13,6 +16,8 @@ ports:
 - name: http
   containerPort: 4000
 env:
+  - name: SERVER_PORT
+    value: "4000"
   - name: MONGO_URL
     value: mongodb://{{ include "cybco.call-in-virtual-context" (list "mongodb.fullname" . "mongodb" "") }}:27017
   - name: DB_NAME
@@ -24,4 +29,38 @@ env:
       secretKeyRef:
         name: {{ include "mongodb.secretName" . }}
         key: mongodb-root-password
-{{- end -}}
\ No newline at end of file
+  - name: DEV_FLAG_AUTHENTICATION_ENABLED
+    value: {{ .Values.keycloak.enabled | quote }}
+{{- if .Values.keycloak.enabled }}
+  - name: KEYCLOAK_REALM
+    value: {{ .Values.keycloak.realm }}
+  - name: KEYCLOAK_AUTH_URL
+    value: {{ .Values.keycloak.authUrl }}
+  - name: KEYCLOAK_CLIENT_ID
+    value: {{ .Values.keycloak.clientId }}
+  - name: CORS_ORIGIN_STRING
+    value: localhost:3000
+{{- end }}
+  - name: DEV_FLAG_LXS_ENABLED
+    value: {{ .Values.features.lxs | quote }}
+{{- if .Values.features.lxs }}
+  - name: LXS_JDBC_DRIVER_PATH
+    value: /app/drivers/qe-driver-1.5-SNAPSHOT_latest-jdbc-client.jar
+  - name: LXS_JDBC_URL
+    value: jdbc:leanxcale://localhost:30641/CYBELE
+{{- end }}
+  - name: AQB_REQUEST_ENABLED
+    value: {{ .Values.features.aqb | quote }}
+{{- if .Values.features.aqb }}
+  - name: AQB_GET_QUERIES_URL
+    value: {{ include "cybco.call-in-virtual-context" (list "cybco.external.url" . "query-builder" "") }}api/list_user_queries
+  - name: AQB_GET_SQL_URL
+    value: {{ include "cybco.call-in-virtual-context" (list "cybco.external.url" . "query-builder" "") }}api/get_query_statement
+{{- end }}
+{{- end -}}
+
+{{- define "visualization.backend-init-container" -}}
+name: init-db-wait
+image: "busybox:1.30.1"
+command: ['sh', '-c', 'until nc -w3 -z  {{ include "cybco.call-in-virtual-context" (list "mongodb.fullname" . "mongodb" "") }} 27017; do echo waiting for mongodb; sleep 3; done;']
+{{- end -}}

values.yaml

@@ -3,6 +3,13 @@ mongodb:
   auth:
     existingSecret: "fake"
 
+keycloak:
+  clientId: visualization
+
+features:
+  lxs: true
+  aqb: true
+
 image:
   repository: harbor.res.eng.it/cybele/visualization/visualization-frontend
   pullPolicy: IfNotPresent
@@ -12,6 +19,8 @@ image:
 # parameters for the backend component. If not specified here, the ones
 # at top-level will be used as default
 backend:
+  external:
+    path: /graphql
   image:
     repository: harbor.res.eng.it/cybele/visualization/visualization-backend
     pullPolicy: IfNotPresent
@@ -35,13 +44,6 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
-service:
-  # if not specified, the global.services.type value is used, or "ClusterIP"
-  type:
-  port: 80
-  # if NodePort type is used, it is possible to specify the node port
-  # nodePort: 32000
-
 ingress:
   # Not defined by default, because it is controlled by the global.ingresses.enabled key
   # enabled: false