Merge pull request #174 from IN-CORE/release-1.31.0

Release 1.31.0
IN-CORE · Aug 16, 2024 · 7098219 · 7098219
2 parents f357480 + 148d064
commit 7098219
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 49 deletions.
diff --git a/CHANGELOG.md b/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.31.0 - 2024-08-21
+- Update registration and reset password link in playbooks
+- Use correct mongodb uri secret in auth service
+- Upgraded postgresql to bitnami/postgresql:15.5.11. This requires an upgrade of the database, which can be done using a dump and restore.
+- Updated keycloak theme to 1.1.0 that has email theme
+
 ## 1.30.2 - 2024-07-01
 - Minor release to correct the chart version number
 

diff --git a/Chart.lock b/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: keycloak
   repository: https://charts.bitnami.com/bitnami
-  version: 21.3.1
+  version: 21.4.4
 - name: postgresql
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 10.16.2
+  repository: https://charts.bitnami.com/bitnami
+  version: 15.5.11
 - name: mongodb
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   version: 9.3.1
 - name: datawolf
   repository: https://opensource.ncsa.illinois.edu/charts
   version: 1.0.1
-digest: sha256:3ccaa4b1ebc8ce3acefe3f6d6ddca239220fc1bf4ae1f5024b0135db6bac4043
-generated: "2024-06-03T11:11:49.1402651-05:00"
+digest: sha256:43ab1ae31f447de80b9a3edaa6bbdec2b4335d375781d049fc5ee4e005857fc5
+generated: "2024-06-26T13:25:35.1988004-05:00"
diff --git a/Chart.yaml b/Chart.yaml
@@ -8,12 +8,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.30.2
+version: 1.31.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 5.3.1
+appVersion: 5.4.1
 
 # List of people that maintain this helm chart.
 maintainers:
@@ -32,8 +32,8 @@ dependencies:
     version: ~21
     repository: https://charts.bitnami.com/bitnami
   - name: postgresql
-    version: ~10
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    version: ~15
+    repository: https://charts.bitnami.com/bitnami
   - name: mongodb
     version: ~9
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
@@ -47,4 +47,8 @@ annotations:
     - name: Helm Chart
       url: https://github.com/IN-CORE/incore-helm
   artifacthub.io/changes: |
-    - Minor release to correct the chart version number
+    - IN-CORE release 5.4.1
+    - Update registration and reset password link in playbooks
+    - Use correct mongodb uri secret in auth service
+    - Upgraded postgresql to bitnami/postgresql:15.5.11. This requires an upgrade of the database, which can be done using a dump and restore.
+    - Updated keycloak theme to 1.1.0 that has email theme
diff --git a/playbook-configs/galveston/globals.config.dev.json b/playbook-configs/galveston/globals.config.dev.json
@@ -22,8 +22,8 @@
 	],
 	"testbedSpace": "commresiliencegal",
 	"testbedGroup": "incore_galveston_user",
-	"registerNewUserURL": "https://identity.ncsa.illinois.edu/register/BSKC2UKQPU",
-	"resetPasswordURL": "https://identity.ncsa.illinois.edu/reset",
+	"registerNewUserURL": "https://incore-dev.ncsa.illinois.edu/auth/realms/In-core/protocol/openid-connect/registrations?client_id=react-auth&response_type=code&scope=openid&redirect_uri=https://incore-dev.ncsa.illinois.edu/playbook/galveston/",
+	"resetPasswordURL": "https://incore-dev.ncsa.illinois.edu/auth/realms/In-core/login-actions/reset-credentials?client_id=react-auth",
 	"inputDatasetTypes": {
 		"buildings": [
 			{

diff --git a/playbook-configs/galveston/globals.config.prod.json b/playbook-configs/galveston/globals.config.prod.json
@@ -22,8 +22,8 @@
 	],
 	"testbedSpace": "galveston-app",
 	"testbedGroup": "incore_galveston_user",
-	"registerNewUserURL": "https://identity.ncsa.illinois.edu/register/BSKC2UKQPU",
-	"resetPasswordURL": "https://identity.ncsa.illinois.edu/reset",
+	"registerNewUserURL": "https://incore.ncsa.illinois.edu/auth/realms/In-core/protocol/openid-connect/registrations?client_id=react-auth&response_type=code&scope=openid&redirect_uri=https://incore.ncsa.illinois.edu/playbook/galveston/",
+	"resetPasswordURL": "https://incore.ncsa.illinois.edu/auth/realms/In-core/login-actions/reset-credentials?client_id=react-auth",
 	"inputDatasetTypes": {
 		"buildings": [
 			{

diff --git a/playbook-configs/joplin/globals.config.dev.json b/playbook-configs/joplin/globals.config.dev.json
@@ -13,8 +13,8 @@
 	"allowedRegions": null,
 	"testbedSpace": "commresiliencejoplin",
 	"testbedGroup": "incore_joplin_user",
-	"registerNewUserURL": "https://identity.ncsa.illinois.edu/register/BSKC2UKQPU",
-	"resetPasswordURL": "https://identity.ncsa.illinois.edu/reset",
+	"registerNewUserURL": "https://incore-dev.ncsa.illinois.edu/auth/realms/In-core/protocol/openid-connect/registrations?client_id=react-auth&response_type=code&scope=openid&redirect_uri=https://incore-dev.ncsa.illinois.edu/playbook/joplin/",
+	"resetPasswordURL": "https://incore-dev.ncsa.illinois.edu/auth/realms/In-core/login-actions/reset-credentials?client_id=react-auth",
 	"inputDatasetTypes": {
 		"buildings": [
 			{

diff --git a/playbook-configs/joplin/globals.config.prod.json b/playbook-configs/joplin/globals.config.prod.json
@@ -13,8 +13,8 @@
 	"allowedRegions": null,
 	"testbedSpace": "joplin-app",
 	"testbedGroup": "incore_joplin_user",
-	"registerNewUserURL": "https://identity.ncsa.illinois.edu/register/BSKC2UKQPU",
-	"resetPasswordURL": "https://identity.ncsa.illinois.edu/reset",
+	"registerNewUserURL": "https://incore.ncsa.illinois.edu/auth/realms/In-core/protocol/openid-connect/registrations?client_id=react-auth&response_type=code&scope=openid&redirect_uri=https://incore.ncsa.illinois.edu/playbook/joplin/",
+	"resetPasswordURL": "https://incore.ncsa.illinois.edu/auth/realms/In-core/login-actions/reset-credentials?client_id=react-auth",
 	"inputDatasetTypes": {
 		"buildings": [
 			{

diff --git a/playbook-configs/slc/globals.config.dev.json b/playbook-configs/slc/globals.config.dev.json
@@ -42,8 +42,8 @@
 	],
 	"testbedSpace": "commresilienceslc",
 	"testbedGroup": "incore_slc_user",
-	"registerNewUserURL": "https://identity.ncsa.illinois.edu/register/BSKC2UKQPU",
-	"resetPasswordURL": "https://identity.ncsa.illinois.edu/reset",
+	"registerNewUserURL": "https://incore-dev.ncsa.illinois.edu/auth/realms/In-core/protocol/openid-connect/registrations?client_id=react-auth&response_type=code&scope=openid&redirect_uri=https://incore-dev.ncsa.illinois.edu/playbook/slc/",
+	"resetPasswordURL": "https://incore-dev.ncsa.illinois.edu/auth/realms/In-core/login-actions/reset-credentials?client_id=react-auth",
 	"inputDatasetTypes": {
 		"buildings": [
 			{

diff --git a/playbook-configs/slc/globals.config.prod.json b/playbook-configs/slc/globals.config.prod.json
@@ -42,8 +42,8 @@
 	],
 	"testbedSpace": "slc-app",
 	"testbedGroup": "incore_slc_user",
-	"registerNewUserURL": "https://identity.ncsa.illinois.edu/register/BSKC2UKQPU",
-	"resetPasswordURL": "https://identity.ncsa.illinois.edu/reset",
+	"registerNewUserURL": "https://incore.ncsa.illinois.edu/auth/realms/In-core/protocol/openid-connect/registrations?client_id=react-auth&response_type=code&scope=openid&redirect_uri=https://incore.ncsa.illinois.edu/playbook/slc/",
+	"resetPasswordURL": "https://incore.ncsa.illinois.edu/auth/realms/In-core/login-actions/reset-credentials?client_id=react-auth",
 	"inputDatasetTypes": {
 		"buildings": [
 			{

diff --git a/templates/auth/deployment.yaml b/templates/auth/deployment.yaml
@@ -59,7 +59,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "incore.fullname" . }}-services
-                  key: COMMON_MONGODB_URI
+                  key: MONGODB_URI
           volumeMounts:
             - name: {{ include "incore.name" . }}-auth
               mountPath: /srv/incore_auth/data

diff --git a/values.yaml b/values.yaml
@@ -142,7 +142,7 @@ frontend:
   replicas: 1
   image:
     repository: frontend
-    tag: 1.12.0
+    tag: 1.13.0
   service:
     type: ClusterIP
     port: 80
@@ -179,7 +179,7 @@ doc_incore:
   replicas: 1
   image:
     repository: doc/incore
-    tag: 4.12.0
+    tag: 4.13.0
   service:
     type: ClusterIP
     port: 80
@@ -368,7 +368,7 @@ svc_maestro:
     slc:
       enabled: true
       env:
-        host: incore-postgresql-headless
+        host: incore-postgresql-hl
         port: 5432
         user: user
         password: password
@@ -379,7 +379,7 @@ svc_maestro:
     joplin:
       enabled: true
       env:
-        host: incore-postgresql-headless
+        host: incore-postgresql-hl
         port: 5432
         user: user
         password: password
@@ -390,7 +390,7 @@ svc_maestro:
     galveston:
       enabled: true
       env:
-        host: incore-postgresql-headless
+        host: incore-postgresql-hl
         port: 5432
         user: user
         password: password
@@ -523,25 +523,27 @@ mongodb:
 # POSTGRESQL
 # ----------------------------------------------------------------------
 postgresql:
-  postgresqlPassword: incorerocks
-
-  initdbScripts:
-    keycloak.sql: |
-      CREATE DATABASE keycloak;
-      CREATE USER keycloak WITH PASSWORD 'keycloak';
-      GRANT ALL PRIVILEGES ON DATABASE keycloak TO keycloak;
-    datawolf.sql: |
-      CREATE DATABASE datawolf;
-      CREATE USER datawolf WITH PASSWORD 'datawolf';
-      GRANT ALL PRIVILEGES ON DATABASE datawolf TO datawolf;
-    maestro.sql: |
-      CREATE DATABASE maestro_galveston;
-      CREATE DATABASE maestro_joplin;
-      CREATE DATABASE maestro_slc;
-      CREATE USER maestro WITH PASSWORD 'maestro';
-      GRANT ALL PRIVILEGES ON DATABASE maestro_galveston TO maestro;
-      GRANT ALL PRIVILEGES ON DATABASE maestro_joplin TO maestro;
-      GRANT ALL PRIVILEGES ON DATABASE maestro_slc TO maestro;
+  auth:
+    postgresPassword: incorerocks
+  primary:
+    initdb:
+      scripts:
+        keycloak.sql: |
+          CREATE DATABASE keycloak;
+          CREATE USER keycloak WITH PASSWORD 'keycloak';
+          GRANT ALL PRIVILEGES ON DATABASE keycloak TO keycloak;
+        datawolf.sql: |
+          CREATE DATABASE datawolf;
+          CREATE USER datawolf WITH PASSWORD 'datawolf';
+          GRANT ALL PRIVILEGES ON DATABASE datawolf TO datawolf;
+        maestro.sql: |
+          CREATE DATABASE maestro_galveston;
+          CREATE DATABASE maestro_joplin;
+          CREATE DATABASE maestro_slc;
+          CREATE USER maestro WITH PASSWORD 'maestro';
+          GRANT ALL PRIVILEGES ON DATABASE maestro_galveston TO maestro;
+          GRANT ALL PRIVILEGES ON DATABASE maestro_joplin TO maestro;
+          GRANT ALL PRIVILEGES ON DATABASE maestro_slc TO maestro;
 
 # ----------------------------------------------------------------------
 # KEYCLOAK
@@ -568,14 +570,14 @@ keycloak:
   postgresql:
     enabled: false
   externalDatabase:
-    host: incore-postgresql # if the chart name is changed this needs to change as well
+    host: incore-postgresql-hl # 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
+      image: incorencsa/keycloak-theme:1.2.0
       command: 
         - sh
       args: