Merge pull request #347 from RADAR-base/chart-updates-jan

Chart updates January
RADAR-base · Jan 30, 2025 · d447332 · d447332
2 parents b7dae48 + 60a3208
commit d447332
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 60 deletions.
diff --git a/etc/base.yaml b/etc/base.yaml
@@ -65,7 +65,7 @@ cert_manager:
 # kubectl --context <my-context> apply --force-conflicts --server-side -f etc/kube-prometheus-stack/files/crds.yaml
 kube_prometheus_stack:
   _install: true
-  _chart_version: 0.4.4
+  _chart_version: 0.4.5
   _extra_timeout: 0
   kube-prometheus-stack:
     prometheus:
@@ -112,7 +112,7 @@ nginx_ingress:
 # Use letsencrypt to retrieve SSL certificates.
 cert_manager_letsencrypt:
   _install: true
-  _chart_version: 0.1.3
+  _chart_version: 0.2.0
   _extra_timeout: 0
 
 # Use confluent cloud instead of a local Kafka cluster.
@@ -148,22 +148,22 @@ cp_schema_registry:
 
 catalog_server:
   _install: true
-  _chart_version: 0.6.3
+  _chart_version: 0.7.0
   _extra_timeout: 90
   replicaCount: 1
   schema_registry: http://cp-schema-registry:8081
 
 radar_home:
   _install: true
-  _chart_version: 0.3.5
+  _chart_version: 0.4.0
   _extra_timeout: 0
 
 # --------------------------------------------------------- 10-managementportal.yaml ---------------------------------------------------------
 
 # This Postgresql is used for Management Portal and App config, postgres password should be same in them
 postgresql:
   _install: true
-  _chart_version: 0.1.0
+  _chart_version: 0.1.1
   _extra_timeout: 0
   postgresql:
     replication:
@@ -180,7 +180,7 @@ postgresql:
 
 management_portal:
   _install: true
-  _chart_version: 1.3.1
+  _chart_version: 1.4.0
   _extra_timeout: 210
   replicaCount: 1  # should be 1
   postgres:
@@ -213,9 +213,9 @@ kratos:
       smtp:
         from_address: radar@thehyve.nl
 
-kratos_ui:
+radar_self_enrolment_ui:
   _install: true
-  _chart_version: 0.0.2
+  _chart_version: 0.2.0
   _extra_timeout: 0
 
 hydra:
@@ -225,23 +225,23 @@ hydra:
 
 app_config:
   _install: true
-  _chart_version: 1.3.4
+  _chart_version: 1.4.0
   _extra_timeout: 0
   replicaCount: 1
   jdbc:
     url: jdbc:postgresql://postgresql:5432/appconfig
 
 app_config_frontend:
   _install: true
-  _chart_version: 2.1.1
+  _chart_version: 2.2.0
   _extra_timeout: 0
   replicaCount: 1
 
 # --------------------------------------------------------- 20-appserver.yaml ---------------------------------------------------------
 # The charts in 20-appserver.yaml only need to be installed if you have a custom aRMT app.
 radar_appserver_postgresql:
   _install: false
-  _chart_version: 0.1.0
+  _chart_version: 0.1.1
   _extra_timeout: 0
   postgresql:
     auth:
@@ -257,7 +257,7 @@ radar_appserver_postgresql:
 
 radar_appserver:
   _install: false
-  _chart_version: 0.7.2
+  _chart_version: 0.8.0
   _extra_timeout: 0
   replicaCount: 1
   managementportal_resource_name: res_AppServer
@@ -276,27 +276,27 @@ radar_appserver:
 # The charts in 20-fitbit.yaml only need to be installed if you will use a Fitbit, Garmin, or Oura API integration.
 radar_fitbit_connector:
   _install: false
-  _chart_version: 0.4.0
+  _chart_version: 0.7.0
   _extra_timeout: 0
   replicaCount: 1
   oauthClientId: radar_fitbit_connector
 
 radar_oura_connector:
   _install: false
-  _chart_version: 0.0.5
+  _chart_version: 0.2.0
   _extra_timeout: 0
   replicaCount: 1
   oauthClientId: radar_oura_connector
 
 radar_rest_sources_authorizer:
   _install: false
-  _chart_version: 2.1.3
+  _chart_version: 2.2.0
   _extra_timeout: 0
   replicaCount: 1
 
 radar_rest_sources_backend:
   _install: false
-  _chart_version: 1.2.3
+  _chart_version: 1.3.0
   _extra_timeout: 0
   replicaCount: 1
   postgres:
@@ -323,7 +323,7 @@ realtime_dashboard_db_username: postgres
 # Install when data_dashboard_backend._install is 'true'
 data_dashboard_timescaledb:
   _install: false
-  _chart_version: 0.1.0
+  _chart_version: 0.1.1
   _extra_timeout: 210
   replicaCount: 1
   postgresql:
@@ -341,7 +341,7 @@ data_dashboard_timescaledb:
 # Install when radar_grafana._install is 'true'
 grafana_metrics_timescaledb:
   _install: false
-  _chart_version: 0.1.0
+  _chart_version: 0.1.1
   _extra_timeout: 210
   replicaCount: 1
   postgresql:
@@ -359,7 +359,7 @@ grafana_metrics_timescaledb:
 # Install when using realtime analysis
 realtime_dashboard_timescaledb:
   _install: false
-  _chart_version: 0.1.0
+  _chart_version: 0.1.1
   _extra_timeout: 210
   replicaCount: 1
   postgresql:
@@ -392,14 +392,14 @@ radar_grafana:
 #- ksql_server._install to true
 data_dashboard_backend:
   _install: false
-  _chart_version: 0.3.7
+  _chart_version: 0.4.1
   _extra_timeout: 0
   replicaCount: 1
 
 # Install when radar_grafana._install is 'true'
 radar_jdbc_connector_grafana:
   _install: false
-  _chart_version: 0.5.5
+  _chart_version: 0.6.0
   _extra_timeout: 0
   replicaCount: 1
   sink:
@@ -409,14 +409,14 @@ radar_jdbc_connector_grafana:
 # Install when data_dashboard_backend._install is 'true'.
 radar_jdbc_connector_data_dashboard_backend:
   _install: false
-  _chart_version: 0.5.5
+  _chart_version: 0.6.0
   _extra_timeout: 0
   replicaCount: 1
 
 # Install when using realtime analysis
 radar_jdbc_connector_realtime_dashboard:
   _install: false
-  _chart_version: 0.5.5
+  _chart_version: 0.6.0
   _extra_timeout: 0
   replicaCount: 1
 
@@ -437,15 +437,15 @@ ksql_server:
 
 radar_gateway:
   _install: true
-  _chart_version: 1.2.9
+  _chart_version: 1.3.0
   _extra_timeout: 0
   replicaCount: 1
 
 # --------------------------------------------------------- 20-kafka-analysis.yaml ---------------------------------------------------------
 
 radar_backend_monitor:
   _install: false
-  _chart_version: 0.3.1
+  _chart_version: 0.4.0
   _extra_timeout: 0
   replicaCount: 1
   smtp:
@@ -457,15 +457,15 @@ radar_backend_monitor:
 
 radar_backend_stream:
   _install: false
-  _chart_version: 0.3.1
+  _chart_version: 0.4.0
   _extra_timeout: 0
   replicaCount: 1
 
 # --------------------------------------------------------- 20-redcap.yaml ---------------------------------------------------------
 
 radar_integration:
   _install: false
-  _chart_version: 0.7.3
+  _chart_version: 0.8.0
   _extra_timeout: 0
   replicaCount: 1
   oauth_client_id: radar_redcap_integrator
@@ -505,7 +505,7 @@ minio:
 radar_s3_connector:
   # set to true if radar-s3-connector should be installed
   _install: true
-  _chart_version: 0.4.1
+  _chart_version: 0.5.0
   _extra_timeout: 90
   replicaCount: 1
   # The bucket name where intermediate data for cold storage should be written to.
@@ -514,15 +514,15 @@ radar_s3_connector:
 
 s3_proxy:
   _install: false
-  _chart_version: 0.4.2
+  _chart_version: 0.5.0
   _extra_timeout: 0
   replicaCount: 1
   target:
     provider: azureblob
 
 radar_output:
   _install: true
-  _chart_version: 1.0.1
+  _chart_version: 1.2.0
   _extra_timeout: 0
   replicaCount: 1
   source:
@@ -541,7 +541,7 @@ radar_output:
 
 radar_upload_postgresql:
   _install: true
-  _chart_version: 0.1.0
+  _chart_version: 0.1.1
   _extra_timeout: 0
   postgresql:
     auth:
@@ -557,19 +557,19 @@ radar_upload_postgresql:
 
 radar_upload_connect_backend:
   _install: false
-  _chart_version: 0.5.3
+  _chart_version: 0.6.0
   _extra_timeout: 0
   replicaCount: 1
 
 radar_upload_connect_frontend:
   _install: false
-  _chart_version: 0.5.1
+  _chart_version: 0.6.0
   _extra_timeout: 0
   replicaCount: 1
 
 radar_upload_source_connector:
   _install: false
-  _chart_version: 0.3.4
+  _chart_version: 0.4.0
   _extra_timeout: 60
   replicaCount: 1
   s3Endpoint: http://minio:9000/
@@ -578,15 +578,15 @@ radar_upload_source_connector:
 
 ccSchemaRegistryProxy:
   _install: false
-  _chart_version: 0.3.3
+  _chart_version: 0.4.0
   _extra_timeout: 0
   externalName: schema-registry-domain
 
 # --------------------------------------------------------- 20-push-endpoint.yaml ---------------------------------------------------------
 
 radar_push_endpoint:
   _install: false
-  _chart_version: 0.3.6
+  _chart_version: 0.4.0
   _extra_timeout: 180
   replicaCount: 1
   adminProperties: {}
@@ -597,7 +597,7 @@ radar_push_endpoint:
 
 velero:
   _install: false
-  _chart_version: 0.3.2
+  _chart_version: 0.4.0
   _extra_timeout: 0
   objectStorageBackupReplicaCount: 1
   backup:

diff --git a/etc/kratos-ui/values.yaml → etc/radar-self-enrolment-ui/values.yaml b/etc/kratos-ui/values.yaml → etc/radar-self-enrolment-ui/values.yaml
@@ -3,18 +3,8 @@ config:
 
 ingress:
   enabled: true
-  className: "nginx"
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-  hosts:
-    - host: localhost
-      paths:
-        - path: "/kratos-ui(/|$)(.*)"
-          pathType: ImplementationSpecific
-  tls:
-    - secretName: radar-base-tls
-      hosts:
-        - localhost
+  path: "/kratos-ui(/|$)(.*)"
+
 # -- Set this to ORY Kratos's Admin URL
 kratosAdminUrl: "kratos-admin"
 

diff --git a/helmfile.d/10-services.yaml b/helmfile.d/10-services.yaml
@@ -353,24 +353,20 @@ releases:
       - name: kratos.config.selfservice.flows.verification.after.hooks[0].config.url
         value: https://{{ .Values.server_name }}/managementportal/api/kratos/subjects/activate
 
-
-  - name: kratos-selfservice-ui-node
+  - name: radar-self-enrolment-ui
     chart: radar/radar-self-enrolment-ui
-    version: {{ .Values.kratos_ui._chart_version }}
-    installed: {{ .Values.kratos_ui._install }}
-    timeout: {{ add .Values.base_timeout .Values.kratos_ui._extra_timeout }}
+    version: {{ .Values.radar_self_enrolment_ui._chart_version }}
+    installed: {{ .Values.radar_self_enrolment_ui._install }}
+    timeout: {{ add .Values.base_timeout .Values.radar_self_enrolment_ui._extra_timeout }}
     <<: *logFailedRelease
     values:
-      - "../etc/kratos-ui/values.yaml"
-      - {{ .Values.kratos_ui | toYaml | indent 8 | trim }}
+      - "../etc/radar-self-enrolment-ui/values.yaml"
+      - {{ .Values.radar_self_enrolment_ui | toYaml | indent 8 | trim }}
     set:
       - name: serverName
         value: {{ .Values.server_name }}
-      - name: ingress.hosts[0].host
+      - name: ingress.hosts[0]
         value: {{ .Values.server_name }}
-      - name: ingress.tls[0].hosts
-        values:
-          - {{ .Values.server_name }}
       - name: kratosPublicUrl
         value: https://{{ .Values.server_name }}/kratos
       - name: kratosBrowserUrl