Merge pull request #149 from IN-CORE/release-1.30.0

Release 1.30.0

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Get dependencies
         run: |
           helm repo add bitnami https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-          helm repo add keycloak https://codecentric.github.io/helm-charts
+          helm repo add keycloak https://charts.bitnami.com/bitnami
           helm repo add ncsa https://opensource.ncsa.illinois.edu/charts
           helm dep build
 

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.30.0 - 2024-06-12
+- IN-CORE release 5.4.0
+- Custom theme to Keycloak login page
+- Upgraded Keycloak to 24.0.4
+- Added Google Analytics information
+
 ## 1.29.0 - 2024-05-01
 - IN-CORE release 5.3.1
 

Chart.lock

@@ -1,7 +1,7 @@
 dependencies:
 - name: keycloak
-  repository: https://codecentric.github.io/helm-charts
-  version: 18.4.3
+  repository: https://charts.bitnami.com/bitnami
+  version: 21.3.1
 - name: postgresql
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   version: 10.16.2
@@ -11,5 +11,5 @@ dependencies:
 - name: datawolf
   repository: https://opensource.ncsa.illinois.edu/charts
   version: 1.0.1
-digest: sha256:90fdbc158ade11459f9aaa49f450dcb01045108cefa9b785c752b79c9caa3b12
-generated: "2023-10-03T15:08:15.24658-05:00"
+digest: sha256:3ccaa4b1ebc8ce3acefe3f6d6ddca239220fc1bf4ae1f5024b0135db6bac4043
+generated: "2024-06-03T11:11:49.1402651-05:00"

Chart.yaml

@@ -29,8 +29,8 @@ sources:
 # dependencies for the helm chart, use helm dep install to the install them.
 dependencies:
   - name: keycloak
-    version: ~18
-    repository: https://codecentric.github.io/helm-charts
+    version: ~21
+    repository: https://charts.bitnami.com/bitnami
   - name: postgresql
     version: ~10
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
@@ -47,4 +47,7 @@ annotations:
     - name: Helm Chart
       url: https://github.com/IN-CORE/incore-helm
   artifacthub.io/changes: |
-    - IN-CORE release 5.3.1
+    - IN-CORE release 5.4.0
+    - Custom theme to Keycloak login page
+    - Upgrade keycloak to 24.0.4
+    - Added Google Analytics information

templates/configmap.yaml

@@ -5,3 +5,7 @@ metadata:
 data:
   quota.json: |
     {{- .Values.quota | nindent 4 }}
+  ga_key.json: |
+    {
+      "GA_KEY": "{{- .Values.google_analytics }}"
+    }

templates/doc-api/deployment.yaml

@@ -29,6 +29,10 @@ spec:
           ports:
             - containerPort: 80
               name: http
+          volumeMounts:
+            - name: {{ include "incore.name" . }}-config
+              mountPath: /usr/share/nginx/html/doc/api/config/config.json
+              subPath: ga_key.json
           livenessProbe:
             httpGet:
               path: /
@@ -39,6 +43,10 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.doc_api.resources | nindent 12 }}
+      volumes:
+        - name: {{ include "incore.name" . }}-config
+          configMap:
+            name: {{ include "incore.name" . }}
       {{- with .Values.doc_api.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/doc-incore/deployment.yaml

@@ -29,6 +29,10 @@ spec:
           ports:
             - containerPort: 80
               name: http
+          volumeMounts:
+            - name: {{ include "incore.name" . }}-config
+              mountPath: /usr/share/nginx/html/doc/incore/config/config.json
+              subPath: ga_key.json
           livenessProbe:
             httpGet:
               path: /
@@ -39,6 +43,10 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.doc_incore.resources | nindent 12 }}
+      volumes:
+        - name: {{ include "incore.name" . }}-config
+          configMap:
+            name: {{ include "incore.name" . }}
       {{- with .Values.doc_incore.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/doc-pyincore-data/deployment.yaml

@@ -29,6 +29,10 @@ spec:
           ports:
             - containerPort: 80
               name: http
+          volumeMounts:
+            - name: {{ include "incore.name" . }}-config
+              mountPath: /usr/share/nginx/html/doc/pyincore_data/config/config.json
+              subPath: ga_key.json
           livenessProbe:
             httpGet:
               path: /
@@ -39,6 +43,10 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.doc_pyincore_data.resources | nindent 12 }}
+      volumes:
+        - name: {{ include "incore.name" . }}-config
+          configMap:
+            name: {{ include "incore.name" . }}
       {{- with .Values.doc_pyincore_data.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/doc-pyincore-viz/deployment.yaml

@@ -29,6 +29,10 @@ spec:
           ports:
             - containerPort: 80
               name: http
+          volumeMounts:
+            - name: {{ include "incore.name" . }}-config
+              mountPath: /usr/share/nginx/html/doc/pyincore_viz/config/config.json
+              subPath: ga_key.json
           livenessProbe:
             httpGet:
               path: /
@@ -39,6 +43,10 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.doc_pyincore_viz.resources | nindent 12 }}
+      volumes:
+        - name: {{ include "incore.name" . }}-config
+          configMap:
+            name: {{ include "incore.name" . }}
       {{- with .Values.doc_pyincore_viz.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/doc-pyincore/deployment.yaml

@@ -29,6 +29,10 @@ spec:
           ports:
             - containerPort: 80
               name: http
+          volumeMounts:
+            - name: {{ include "incore.name" . }}-config
+              mountPath: /usr/share/nginx/html/doc/pyincore/config/config.json
+              subPath: ga_key.json
           livenessProbe:
             httpGet:
               path: /
@@ -39,6 +43,10 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.doc_pyincore.resources | nindent 12 }}
+      volumes:
+        - name: {{ include "incore.name" . }}-config
+          configMap:
+            name: {{ include "incore.name" . }}
       {{- with .Values.doc_pyincore.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/frontend/deployment.yaml

@@ -32,6 +32,9 @@ spec:
           volumeMounts:
             - name: {{ include "incore.name" . }}-frontend-tags
               mountPath: /usr/share/nginx/html/tags
+            - name: {{ include "incore.name" . }}-config
+              mountPath: /usr/share/nginx/html/config/config.json
+              subPath: ga_key.json
           livenessProbe:
             httpGet:
               path: /
@@ -46,6 +49,9 @@ spec:
         - name: {{ include "incore.name" . }}-frontend-tags
           persistentVolumeClaim:
             claimName: {{ include "incore.name" . }}-frontend-tags
+        - name: {{ include "incore.name" . }}-config
+          configMap:
+            name: {{ include "incore.name" . }}
       {{- with .Values.frontend.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/secrets.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     {{- include "incore.labels" . | nindent 4 }}
 data:
-  KEYCLOAK_PASSWORD: {{ .Values.keycloak.password | b64enc | quote }}
+  KEYCLOAK_PASSWORD: {{ .Values.keycloak.auth.adminPassword | b64enc | quote }}
   MAESTRO_USER_PASSWORD: {{ .Values.svc_maestro.password | b64enc | quote }}
   DATA_MONGODB_URI: {{ include "incore.mongodb.uri" . | replace "@DB@" "datadb" | b64enc | quote }}
   DFR3_MONGODB_URI: {{ include "incore.mongodb.uri" . | replace "@DB@" "dfr3db" | b64enc | quote }}

values.yaml

@@ -102,6 +102,14 @@ quota: |
      }
   }
 
+# the following information is for embedding google analytics into IN-CORE sites
+# it WILL NOT impact the operation of the site if this is NOT set up
+# it is used to track usage of the site and to help improve the site
+# to set up Google Analytics, you need to create a Google Analytics account
+# and get the tracking id, which is a string that looks like "G-AB12CDEFGH"
+# you can then set the GA_KEY to this value
+google_analytics: "GA-1234"
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
@@ -134,7 +142,7 @@ frontend:
   replicas: 1
   image:
     repository: frontend
-    tag: 1.11.0
+    tag: 1.12.0
   service:
     type: ClusterIP
     port: 80
@@ -171,7 +179,7 @@ doc_incore:
   replicas: 1
   image:
     repository: doc/incore
-    tag: 4.11.0
+    tag: 4.12.0
   service:
     type: ClusterIP
     port: 80
@@ -183,7 +191,7 @@ doc_pyincore:
   replicas: 1
   image:
     repository: doc/pyincore
-    tag: 1.18.1
+    tag: 1.19.0
   service:
     type: ClusterIP
     port: 80
@@ -195,7 +203,7 @@ doc_pyincore_viz:
   replicas: 1
   image:
     repository: doc/pyincore-viz
-    tag: 1.10.0
+    tag: 1.10.1
   service:
     type: ClusterIP
     port: 80
@@ -207,7 +215,7 @@ doc_pyincore_data:
   replicas: 1
   image:
     repository: doc/pyincore-data
-    tag: 0.6.2
+    tag: 0.6.3
   service:
     type: ClusterIP
     port: 80
@@ -219,7 +227,7 @@ doc_api:
   replicas: 1
   image:
     repository: doc/api
-    tag: v4.11.0
+    tag: v4.12.0
   service:
     type: ClusterIP
     port: 80
@@ -539,38 +547,48 @@ postgresql:
 # KEYCLOAK
 # ----------------------------------------------------------------------
 keycloak:
-  user: keycloak
-  password: keycloak
-  postgresql:
-    enabled: false
+  httpRelativePath: /auth/
+  auth:
+    adminUser: admin
+    adminPassword: admin
+  proxy: edge
   ingress:
-    tls: []
     enabled: true
+    tls: []
     servicePort: http
-    hosts:
-      - incore.example.com
+    hostname: incore.example.com
     rules:
       - host: incore.example.com
-        paths:
-          - path: /auth/
-            pathType: ImplementationSpecific
-  extraEnv: |
-    - name: PROXY_ADDRESS_FORWARDING
-      value: "true"
-    - name: KEYCLOAK_USER
-      value: keycloak
-    - name: KEYCLOAK_PASSWORD
-      value: keycloak
-    - name: DB_VENDOR
-      value: postgres
-    - name: DB_ADDR
-      value: incore-postgresql
-    - name: DB_PORT
-      value: "5432"
-    - name: DB_DATABASE
-      value: keycloak
-    - name: DB_USER
-      value: keycloak
-    - name: DB_PASSWORD
-      value: keycloak
-
+        http:
+          paths:
+            - path: /auth/
+              pathType: ImplementationSpecific
+  service:
+    type: ClusterIP
+  postgresql:
+    enabled: false
+  externalDatabase:
+    host: incore-postgresql # if the chart name is changed this needs to change as well
+    user: keycloak  # if the chart name is changed this needs to change as well
+    password: keycloak
+    database: keycloak
+    port: 5432
+  initContainers: |
+    - name: theme-provider
+      image: incorencsa/keycloak-theme:1.0.0
+      command: 
+        - sh
+      args:
+        - -c
+        - |
+          echo "Copying theme..."
+          cp -R /app/keycloak_theme/* /theme
+      volumeMounts:
+        - name: incore-theme
+          mountPath: /theme
+  extraVolumes: |
+    - name: incore-theme
+      emptyDir: {}
+  extraVolumeMounts: |
+    - name: incore-theme
+      mountPath: /opt/bitnami/keycloak/themes/incore-theme