[charts/portal] Changes to support portal release version 5.3.2 (#356)

* US939749: initial commit of remove pssg (#328) Co-authored-by: im683661 <[email protected]> Co-authored-by: ac658123 <[email protected]> * Portal update to 5.3.1 release (#334) * DE623169 Improve DB master-master failover stability (#349) Co-authored-by: MarkChen <[email protected]> * [charts/portal]Changes to merge Stable to develop before hardening (#350) * [charts/portal] Portal 5.3.1 helm charts (#336) * Portal update to 5.3.1 release (#334) * fix for DE620051 * removing tps and portal-data check from apim-initcontainer * added troubleshooting for disabling the apim initContainer * changed apim initContainer to install only * otel update, system properties expansion, ocp routes * Bumping portal version to make lint test pass --------- Co-authored-by: sm895441 <[email protected]> Co-authored-by: Gary Vermeulen <[email protected]> * [charts/portal]Portal changes for rel 5.3.2 (#351) * Portal changes for rel 5.3.2 * Bumping gw chart version to pass the lint * Chart changes to upgrade the demo mysql chart to support mysql version 8.4.4 * DE627635: add sync route back (#353) * Updated ingress-nginx sub chart to support the latest K8s 1.30/31/32 (#354) * More changes for mySQL container * Adding mysql to the db_host * Readme update for portal 5.3.2 release * Readme update in MYSQL section * Readme update in MYSQL section * Retaining only 5.3.2 readme changes * More notes to 5.3.2 rel --------- Co-authored-by: Andrew Cheuk <[email protected]> Co-authored-by: im683661 <[email protected]> Co-authored-by: ac658123 <[email protected]> Co-authored-by: markgxchen <[email protected]> Co-authored-by: MarkChen <[email protected]> Co-authored-by: sm895441 <[email protected]> Co-authored-by: Gary Vermeulen <[email protected]> Co-authored-by: Ilya Melnikov <[email protected]>
CAAPIM · Feb 24, 2025 · 669080b · 669080b
1 parent 28bfd6c
commit 669080b
Show file tree

Hide file tree

Showing 23 changed files with 154 additions and 137 deletions.
diff --git a/charts/druid/Chart.yaml b/charts/druid/Chart.yaml
@@ -7,5 +7,5 @@ maintainers:
   - name: Gazza7205
 sources:
   - https://github.com/CAAPIM/apim-charts
-version: 1.0.14
-appVersion: 28.0.1
+version: 1.0.15
+appVersion: 31.0
diff --git a/charts/druid/templates/coordinator/coordinator-config.yaml b/charts/druid/templates/coordinator/coordinator-config.yaml
@@ -15,7 +15,7 @@ data:
   MINIO_BUCKET: {{ .Values.minio.bucketName }}
   DATABASE_TYPE: {{ required "Please fill in databaseType in values.yaml" .Values.global.databaseType | quote }}
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/druid/templates/ingestion/ingestion-config.yaml b/charts/druid/templates/ingestion/ingestion-config.yaml
@@ -20,7 +20,7 @@ data:
   PARTITION_COUNT: "{{ .Values.ingestion.config.partitionCount }}"
   REPLICATION_COUNT: "{{ .Values.kafka.replicaCount }}"
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/Chart.lock b/charts/portal/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: druid
   repository: file://../druid
-  version: 1.0.14
+  version: 1.0.15
 - name: mysql
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 10.3.0
+  version: 12.2.2
 - name: rabbitmq
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   version: 12.0.3
 - name: ingress-nginx
   repository: https://kubernetes.github.io/ingress-nginx/
-  version: 4.10.0
-digest: sha256:37372a7aae49609a719e1e1d0f9f9c6ba66b41caaeed4892981db2b50289cda4
-generated: "2024-10-14T18:34:34.4433706+05:30"
+  version: 4.12.0
+digest: sha256:3e796ef32aa794a28e20612262e6169a05ca45d22236ca0104de7f6ede5aed5d
+generated: "2025-02-17T15:59:45.9451573+05:30"
diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "5.3.1"
+appVersion: "5.3.2"
 description: CA API Developer Portal
 name: portal
-version: 2.3.11
+version: 2.3.12
 type: application
 home: https://github.com/CAAPIM/apim-charts
 maintainers:
@@ -15,7 +15,7 @@ dependencies:
   condition: portal.analytics.enabled
   repository: "file://../druid"
 - name: mysql
-  version: 10.3.0
+  version: 12.2.2
   repository: "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami"
   condition: global.setupDemoDatabase
 - name: rabbitmq
@@ -24,5 +24,5 @@ dependencies:
   condition: rabbitmq.enabled
 - name: ingress-nginx
   repository: "https://kubernetes.github.io/ingress-nginx/"
-  version: 4.10.0
+  version: 4.12.0
   condition: ingress.create
diff --git a/charts/portal/README.md b/charts/portal/README.md
diff --git a/charts/portal/charts/druid-1.0.14.tgz b/charts/portal/charts/druid-1.0.14.tgz
diff --git a/charts/portal/charts/druid-1.0.15.tgz b/charts/portal/charts/druid-1.0.15.tgz
diff --git a/charts/portal/charts/ingress-nginx-4.10.0.tgz b/charts/portal/charts/ingress-nginx-4.10.0.tgz
diff --git a/charts/portal/charts/ingress-nginx-4.12.0.tgz b/charts/portal/charts/ingress-nginx-4.12.0.tgz
diff --git a/charts/portal/charts/mysql-10.3.0.tgz b/charts/portal/charts/mysql-10.3.0.tgz
diff --git a/charts/portal/charts/mysql-12.2.2.tgz b/charts/portal/charts/mysql-12.2.2.tgz
diff --git a/charts/portal/templates/analytics-server/analytics-config.yaml b/charts/portal/templates/analytics-server/analytics-config.yaml
@@ -12,7 +12,7 @@ data:
   BROKER_PORT: "8082"
   ANALYTICS_ENABLED: {{ .Values.portal.analytics.enabled | quote }}
   {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/templates/apim/apim-config.yaml b/charts/portal/templates/apim/apim-config.yaml
@@ -9,7 +9,7 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/templates/authenticator/authenticator-config.yaml b/charts/portal/templates/authenticator/authenticator-config.yaml
@@ -11,7 +11,7 @@ data:
   CASSO_DEBUG_ENABLED: {{ required "Please fill in ssoDebug in values.yaml" .Values.portal.ssoDebug | quote}}
   CASSO_ENABLED: "true"
   {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/templates/ingress/ingress.yaml b/charts/portal/templates/ingress/ingress.yaml
@@ -106,11 +106,11 @@ spec:
           service:
             name: apim
             port:
-              name: tssg-sync
+              name: tssg-enroll
 {{- else }}
       - backend:
           serviceName: apim
-          servicePort: tssg-sync
+          servicePort: tssg-enroll
 {{- end }}
   - host: {{ include "pssg-sso-host" . | quote }}
     http:

diff --git a/charts/portal/templates/jobs/db-upgrade-job.yaml b/charts/portal/templates/jobs/db-upgrade-job.yaml
@@ -35,7 +35,7 @@ spec:
           env:
            - name: HOST
          {{ if .Values.global.setupDemoDatabase }}
-             value: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+             value: {{ .Release.Name }}-mysql-headless
         {{ else }}
              value: {{ .Values.global.databaseHost | quote }}
         {{ end }}

diff --git a/charts/portal/templates/jobs/rbac-upgrade-job.yaml b/charts/portal/templates/jobs/rbac-upgrade-job.yaml
@@ -35,7 +35,7 @@ spec:
           env:
            - name: HOST
          {{ if .Values.global.setupDemoDatabase }}
-             value: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+             value: {{ .Release.Name }}-mysql-headless
         {{ else }}
              value: {{ .Values.global.databaseHost | quote }}
         {{ end }}

diff --git a/charts/portal/templates/portal-data/portal-data-config.yaml b/charts/portal/templates/portal-data/portal-data-config.yaml
@@ -9,8 +9,8 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
-  RBAC_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-mysql-headless
+  RBAC_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
   RBAC_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}

diff --git a/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml b/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml
@@ -9,9 +9,9 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ if .Values.global.setupDemoDatabase}}
-  ENTERPRISE_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
-  RBAC_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
-  SEARCH_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  ENTERPRISE_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
+  RBAC_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
+  SEARCH_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   ENTERPRISE_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
   RBAC_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}

diff --git a/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml b/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml
@@ -15,7 +15,7 @@ data:
   APIM_PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain }}
   BUSINESS_REPORTS_ENABLED: "false"
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-mysql-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/values-production.yaml b/charts/portal/values-production.yaml
@@ -486,17 +486,17 @@ tenantProvisioner:
   additionalEnv:
 
 image:
-  dispatcher: dispatcher:5.3.1
-  apim: ingress:5.3.1
-  enterprise: portal-enterprise:5.3.1
-  data: portal-data:5.3.1
-  tps: tenant-provisioning-service:5.3.1
-  analytics: analytics-server:5.3.1
-  authenticator: authenticator:5.3.1
-  dbUpgrade: db-upgrade-portal:5.3.1
-  rbacUpgrade: db-upgrade-rbac:5.3.1
-  upgradeVerify: upgrade-verify:5.3.1
-  tlsManager: tls-automator:5.3.1
+  dispatcher: dispatcher:5.3.2
+  apim: ingress:5.3.2
+  enterprise: portal-enterprise:5.3.2
+  data: portal-data:5.3.2
+  tps: tenant-provisioning-service:5.3.2
+  analytics: analytics-server:5.3.2
+  authenticator: authenticator:5.3.2
+  dbUpgrade: db-upgrade-portal:5.3.2
+  rbacUpgrade: db-upgrade-rbac:5.3.2
+  upgradeVerify: upgrade-verify:5.3.2
+  tlsManager: tls-automator:5.3.2
 
 ##
 ## Subchart Configuration
@@ -797,14 +797,14 @@ druid:
   #         topologyKey: kubernetes.io/hostname
 
   image:
-    zookeeper: zookeeper:5.3.1
-    broker: druid:5.3.1
-    coordinator: druid:5.3.1
-    middlemanager: druid:5.3.1
-    minio: minio:5.3.1
-    historical: druid:5.3.1
-    kafka: kafka:5.3.1
-    ingestion: ingestion-server:5.3.1
+    zookeeper: zookeeper:5.3.2
+    broker: druid:5.3.2
+    coordinator: druid:5.3.2
+    middlemanager: druid:5.3.2
+    minio: minio:5.3.2
+    historical: druid:5.3.2
+    kafka: kafka:5.3.2
+    ingestion: ingestion-server:5.3.2
 
 # Settings for RabbitMQ - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq
 rabbitmq:
@@ -814,7 +814,7 @@ rabbitmq:
   image:
     registry: caapim
     repository: message-broker
-    tag: "5.3.1"
+    tag: "5.3.2"
     pullSecrets:
       - broadcom-apim
   pdb:
@@ -940,7 +940,7 @@ jobs:
 # MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
 mysql:
   image:
-    tag: "8.0.37-debian-12-r2"
+    tag: "8.4.4-debian-12-r0"
   auth:
     username: portal
     existingSecret: database-secret
@@ -962,7 +962,7 @@ mysql:
       default-character-set=utf8mb4
       plugin_dir=/opt/bitnami/mysql/plugin
       [mysqld]
-      default_authentication_plugin=mysql_native_password
+      mysql_native_password=ON
       skip-name-resolve
       explicit_defaults_for_timestamp
       basedir=/opt/bitnami/mysql

diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
@@ -425,17 +425,17 @@ tenantProvisioner:
   additionalEnv:
 
 image:
-  dispatcher: dispatcher:5.3.1
-  apim: ingress:5.3.1
-  enterprise: portal-enterprise:5.3.1
-  data: portal-data:5.3.1
-  tps: tenant-provisioning-service:5.3.1
-  analytics: analytics-server:5.3.1
-  authenticator: authenticator:5.3.1
-  dbUpgrade: db-upgrade-portal:5.3.1
-  rbacUpgrade: db-upgrade-rbac:5.3.1
-  upgradeVerify: upgrade-verify:5.3.1
-  tlsManager: tls-automator:5.3.1
+  dispatcher: dispatcher:5.3.2
+  apim: ingress:5.3.2
+  enterprise: portal-enterprise:5.3.2
+  data: portal-data:5.3.2
+  tps: tenant-provisioning-service:5.3.2
+  analytics: analytics-server:5.3.2
+  authenticator: authenticator:5.3.2
+  dbUpgrade: db-upgrade-portal:5.3.2
+  rbacUpgrade: db-upgrade-rbac:5.3.2
+  upgradeVerify: upgrade-verify:5.3.2
+  tlsManager: tls-automator:5.3.2
 
 ##
 ## Subchart Configuration
@@ -662,14 +662,14 @@ druid:
   # affinity: {}
 
   image:
-    zookeeper: zookeeper:5.3.1
-    broker: druid:5.3.1
-    coordinator: druid:5.3.1
-    middlemanager: druid:5.3.1
-    minio: minio:5.3.1
-    historical: druid:5.3.1
-    kafka: kafka:5.3.1
-    ingestion: ingestion-server:5.3.1
+    zookeeper: zookeeper:5.3.2
+    broker: druid:5.3.2
+    coordinator: druid:5.3.2
+    middlemanager: druid:5.3.2
+    minio: minio:5.3.2
+    historical: druid:5.3.2
+    kafka: kafka:5.3.2
+    ingestion: ingestion-server:5.3.2
 
 # Settings for RabbitMQ - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq
 rabbitmq:
@@ -679,7 +679,7 @@ rabbitmq:
   image:
     registry: caapim
     repository: message-broker
-    tag: "5.3.1"
+    tag: "5.3.2"
     pullSecrets:
       - broadcom-apim
   pdb:
@@ -794,7 +794,7 @@ jobs:
 # MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
 mysql:
   image:
-    tag: "8.0.37-debian-12-r2"
+    tag: "8.4.4-debian-12-r0"
   auth:
     username: portal
     existingSecret: database-secret
@@ -816,7 +816,7 @@ mysql:
       default-character-set=utf8mb4
       plugin_dir=/opt/bitnami/mysql/plugin
       [mysqld]
-      default_authentication_plugin=mysql_native_password
+      mysql_native_password=ON
       skip-name-resolve
       explicit_defaults_for_timestamp
       basedir=/opt/bitnami/mysql