diff --git a/charts/druid/Chart.yaml b/charts/druid/Chart.yaml index d0024053..c81339b7 100644 --- 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 index 2eafbf9c..2342a9b0 100644 --- 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 index 3507c51c..436c9397 100644 --- 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 index ec265a08..d3616efa 100644 --- 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 index 9671a529..70dde21d 100644 --- 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 index 4eeaf175..1931e216 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -6,6 +6,11 @@ This Chart deploys the Layer7 API Developer Portal on a Kubernetes Cluster using ## Release Notes +## 2.3.12 General Updates +- This new version of the chart supports API Portal 5.2.3 +- Upgrade to 2.3.12 is only supported from 2.3.9 chart version as per the Portal version. +- Ingress-NGINX Subchart is upgraded to version 4.12.0 to support K8s 1.29 version. +- DB container(for testing) upgraded to support 8.4.4 MySQL version. ## 2.3.11 General Updates - Added a preflight check (initContainer) for the core apim/ingress deployment - This resolves a race condition that occurs on slower hardware where apim/ingress starts before other dependent services are ready. @@ -107,7 +112,7 @@ This Chart deploys the Layer7 API Developer Portal on a Kubernetes Cluster using Solutions & Patches](https://techdocs.broadcom.com/us/product-content/recommended-reading/technical-document-index/ca-api-developer-portal-solutions-and-patches.html) page. ### Production -- A dedicated MySQL 8.0.31/8.0.33/8.0.34/8.0.37/8.0.39 server [See TechDocs for more information](https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/install-configure-and-upgrade/install-portal-on-docker-swarm/configure-an-external-database.html) +- A dedicated MySQL 8.0.31/8.0.33/8.0.34/8.0.37/8.0.39/8.4.4 server [See TechDocs for more information](https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/install-configure-and-upgrade/install-portal-on-docker-swarm/configure-an-external-database.html) - 3 Worker nodes with at least 4vcpu and 32GB ram - High Availability with analytics - Access to a DNS Server - Signed SSL Server Certificate @@ -440,57 +445,67 @@ This section describes configurable parameters in **values.yaml**, there is also ### Database Node Pool Configurations #### Common configurations across multiple containers -| Parameter | Description | Default | Container | -|------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|--------------|-------------------------------------------------------------------------------------| -| `.additionalEnv.DATABASE_POOL_MINPOOLSIZE` | Minimum number of Connections a pool will maintain at any given time | `5` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | -| `.additionalEnv.DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| Parameter | Description | Default | Container | +|------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------|--------------|-------------------------------------------------------------------------------------| +| `.additionalEnv.DATABASE_POOL_MINPOOLSIZE` | Minimum number of Connections a pool will maintain at any given time | `5` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | | `.additionalEnv.DATABASE_POOL_CHECKOUTTIMEOUT` | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | -| `.additionalEnv.DATABASE_POOL_MAXSTATEMENTSPERCONNECTION` | The number of PreparedStatements to be cached for a single pooled Connection | `50` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | -| `.additionalEnv.DATABASE_POOL_IDLECONNECTIONTESTPERIOD` | Test all idle, pooled but unchecked-out connections, every this number of seconds | `60 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | -| `.additionalEnv.DATABASE_POOL_INITIALPOOLSIZE` | Number of Connections a pool will try to acquire upon startup | `5` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | -| `.additionalEnv.DATABASE_POOL_MAXSTATEMENTS` | The size of global PreparedStatement cache | `300` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, | -| `.additionalEnv.DATABASE_POOL_MAXCONNECTIONAGE` | A Connection older than maxConnectionAge will be destroyed and purged from the pool | `0 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | -| `.additionalEnv.DATABASE_POOL_MAXIDLETIME` | Seconds a Connection can remain pooled but unused before being discarded. | `0 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | -| `.additionalEnv.DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled | `0 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_MAXSTATEMENTSPERCONNECTION` | The number of PreparedStatements to be cached for a single pooled Connection | `50` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_IDLECONNECTIONTESTPERIOD` | Test all idle, pooled but unchecked-out connections, every this number of seconds | `60 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_INITIALPOOLSIZE` | Number of Connections a pool will try to acquire upon startup | `5` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_MAXSTATEMENTS` | The size of global PreparedStatement cache | `300` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress`, | +| `.additionalEnv.DATABASE_POOL_MAXCONNECTIONAGE` | A Connection older than maxConnectionAge will be destroyed and purged from the pool | `0 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_MAXIDLETIME` | Seconds a Connection can remain pooled but unused before being discarded. | `0 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled | `0 seconds` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | +| `.additionalEnv.DATABASE_POOL_SOCKETTIMEOUT` | The number of milliseconds on network socket operations specified as socketTimeout property in the JDBC URL. Value 0 means no timeout. | `120000 (ms)`| `portalData`, `portalEnterprise`, `tenantProvisioner`,`ingress` | +| `.additionalEnv.DATABASE_POOL_CONNECTTIMEOUT` | The number of milliseconds timeout for socket connect specified as connectTimeout property in the JDBC URL. Value 0 means no timeout. | `10000 (ms)` | `portalData`, `portalEnterprise`, `tenantProvisioner`, `analytics`,`ingress` | #### Authenticator specific configurations -| Parameter | Description | Default | -|----------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|---------------| -| `authenticator.additionalEnv.DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | -| `authenticator.additionalEnv.DATABASE_POOL_CHECKOUTTIMEOUT` | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 ms` | -| `authenticator.additionalEnv.DATABASE_POOL_PINGCONNECTIONNOTUSERFOR` | Ping the database to make sure connection is still good if it has not been used in this many milliseconds, | `5000 ms` | -| `authenticator.additionalEnv.DATABASE_POOL_PINGENABLED` | Periodically pings and tests the connections in connection pool if they are alive and responsive | `true` | -| `authenticator.additionalEnv.DATABASE_POOL_PINGQUERY` | SQL query to be executed when connection pool is pinged to test the health of connections. | `select1` | -| `authenticator.additionalEnv.DATABASE_POOL_MAXIMUMIDLECONNECTIONS` | The maximum number of idle connections | `10` | +| Parameter | Description | Default | +|---------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|---------------| +| `authenticator.additionalEnv.DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | +| `authenticator.additionalEnv.DATABASE_POOL_CHECKOUTTIMEOUT` | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 ms` | +| `authenticator.additionalEnv.DATABASE_POOL_PINGCONNECTIONNOTUSERFOR` | Ping the database to make sure connection is still good if it has not been used in this many milliseconds, | `5000 ms` | +| `authenticator.additionalEnv.DATABASE_POOL_PINGENABLED` | Periodically pings and tests the connections in connection pool if they are alive and responsive | `true` | +| `authenticator.additionalEnv.DATABASE_POOL_PINGQUERY` | SQL query to be executed when connection pool is pinged to test the health of connections. | `select1` | +| `authenticator.additionalEnv.DATABASE_POOL_MAXIMUMIDLECONNECTIONS` | The maximum number of idle connections | `10` | +| `authenticator.additionalEnv.DATABASE_POOL_SOCKETTIMEOUT` | The number of milliseconds on network socket operations specified as socketTimeout property in the JDBC URL. Value 0 means no timeout. | `120000 (ms)` | +| `authenticator.additionalEnv.DATABASE_POOL_CONNECTTIMEOUT` | The number of milliseconds timeout for socket connect specified as connectTimeout property in the JDBC URL. Value 0 means no timeout. | `10000 (ms)` | + #### Additional portalData configurations for File Repository Database -| Parameter | Description | Default | -|---------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|--------------| -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MINPOOLSIZE` | Minimum number of Connections a pool will maintain at any given time | `5` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_CHECKOUTTIMEOUT` | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION` | The number of PreparedStatements to be cached for a single pooled Connection | `50` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_IDLECONNECTIONTESTPERIOD` | Test all idle, pooled but unchecked-out connections, every this number of seconds | `60 seconds` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_INITIALPOOLSIZE` | Number of Connections a pool will try to acquire upon startup | `5` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTS` | The size of global PreparedStatement cache | `300` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXCONNECTIONAGE` | A Connection older than maxConnectionAge will be destroyed and purged from the pool | `0 seconds` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIME` | Seconds a Connection can remain pooled but unused before being discarded. | `0 seconds` | -| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled | `0 seconds` | +| Parameter | Description | Default | +|---------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|------------------| +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MINPOOLSIZE` | Minimum number of Connections a pool will maintain at any given time | `5` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_CHECKOUTTIMEOUT` | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION` | The number of PreparedStatements to be cached for a single pooled Connection | `50` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_IDLECONNECTIONTESTPERIOD` | Test all idle, pooled but unchecked-out connections, every this number of seconds | `60 seconds` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_INITIALPOOLSIZE` | Number of Connections a pool will try to acquire upon startup | `5` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXSTATEMENTS` | The size of global PreparedStatement cache | `300` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXCONNECTIONAGE` | A Connection older than maxConnectionAge will be destroyed and purged from the pool | `0 seconds` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIME` | Seconds a Connection can remain pooled but unused before being discarded. | `0 seconds` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled | `0 seconds` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_SOCKETTIMEOUT` | The number of milliseconds on network socket operations specified as socketTimeout property in the JDBC URL. Value 0 means no timeout. | `120000 (ms)` | +| `portalData.additionalEnv.FILE_REPOSITORY_DATABASE_POOL_CONNECTTIMEOUT` | The number of milliseconds timeout for socket connect specified as connectTimeout property in the JDBC URL. Value 0 means no timeout. | `10000 (ms)` | -#### Additional tenantProvisioner configurations for Portal Database -| Parameter | Description | Default | -|---------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|--------------| -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MINPOOLSIZE` | Minimum number of Connections a pool will maintain at any given time | `5` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_CHECKOUTTIMEOUT` | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION` | The number of PreparedStatements to be cached for a single pooled Connection | `50` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_IDLECONNECTIONTESTPERIOD` | Test all idle, pooled but unchecked-out connections, every this number of seconds | `60 seconds` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_INITIALPOOLSIZE` | Number of Connections a pool will try to acquire upon startup | `5` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTS` | The size of global PreparedStatement cache | `300` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXCONNECTIONAGE` | A Connection older than maxConnectionAge will be destroyed and purged from the pool | `0 seconds` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIME` | Seconds a Connection can remain pooled but unused before being discarded. | `0 seconds` | -| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled | `0 seconds` | + +#### Additional tenantProvisioner configurations for Portal Database +| Parameter | Description | Default | +|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|--------------| +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MINPOOLSIZE` | Minimum number of Connections a pool will maintain at any given time | `5` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXPOOLSIZE` | Maximum number of Connections a pool will maintain at any given time | `30` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_CHECKOUTTIMEOUT` | The number of milliseconds a client calling getConnection() will wait for a Connection to be checked-in or acquired when the pool is exhausted | `30000 (ms)` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTSPERCONNECTION` | The number of PreparedStatements to be cached for a single pooled Connection | `50` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_IDLECONNECTIONTESTPERIOD` | Test all idle, pooled but unchecked-out connections, every this number of seconds | `60 seconds` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_INITIALPOOLSIZE` | Number of Connections a pool will try to acquire upon startup | `5` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXSTATEMENTS` | The size of global PreparedStatement cache | `300` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXCONNECTIONAGE` | A Connection older than maxConnectionAge will be destroyed and purged from the pool | `0 seconds` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIME` | Seconds a Connection can remain pooled but unused before being discarded. | `0 seconds` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_MAXIDLETIMEEXCESSCONNECTIONS` | Number of seconds that Connections in excess of minPoolSize should be permitted to remain idle in the pool before being culled | `0 seconds` | +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_SOCKETTIMEOUT` | The number of milliseconds on network socket operations specified as socketTimeout property in the JDBC URL. Value 0 means no timeout. | `120000 (ms)`| +| `tenantProvisioner.additionalEvn.PORTAL_DATABASE_POOL_CONNECTTIMEOUT` | The number of milliseconds timeout for socket connect specified as connectTimeout property in the JDBC URL. Value 0 means no timeout. | `10000 (ms)` | ### Portal TLS Defaults Portal TLS defaults if the parameters are not set. | Parameter | Description | Default | @@ -656,17 +671,17 @@ Portal Analytics ### Portal Images | Parameter | Description | Default | |-------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| -| `image.dispatcher` | dispatcher image | `dispatcher:5.3.1` | -| `image.apim` | APIM ingress image | `ingress:5.3.1` | -| `image.enterprise` | portal-enterprise image | `portal-enterprise:5.3.1` | -| `image.data` | portal-data image | `portal-data:5.3.1` | -| `image.tps` | tenant provisioner image | `tenant-provisioning-service:5.3.1` | -| `image.analytics` | Analytics image | `analytics-server:5.3.1` | -| `image.authenticator` | Authenticator image | `authenticator:5.3.1` | -| `image.dbUpgrade` | db upgrade image | `db-upgrade-portal:5.3.1` | -| `image.rbacUpgrade` | Analytics image, per Portal version | `db-upgrade-rbac:5.3.1` | -| `image.upgradeVerify` | Upgrade verification image | `upgrade-verify:5.3.1` | -| `image.tlsManager` | TLS manager image | `tls-automator:5.3.1` | +| `image.dispatcher` | dispatcher image | `dispatcher:5.3.2` | +| `image.apim` | APIM ingress image | `ingress:5.3.2` | +| `image.enterprise` | portal-enterprise image | `portal-enterprise:5.3.2` | +| `image.data` | portal-data image | `portal-data:5.3.2` | +| `image.tps` | tenant provisioner image | `tenant-provisioning-service:5.3.2` | +| `image.analytics` | Analytics image | `analytics-server:5.3.2` | +| `image.authenticator` | Authenticator image | `authenticator:5.3.2` | +| `image.dbUpgrade` | db upgrade image | `db-upgrade-portal:5.3.2` | +| `image.rbacUpgrade` | Analytics image, per Portal version | `db-upgrade-rbac:5.3.2` | +| `image.upgradeVerify` | Upgrade verification image | `upgrade-verify:5.3.2` | +| `image.tlsManager` | TLS manager image | `tls-automator:5.3.2` | ## Subcharts For Production, use an external MySQL Server. @@ -798,14 +813,14 @@ The following table lists the configured parameters of the Druid Subchart | Parameter | Description | Default | |-----------------------------|---------------------|--------------------------| -| `druid.image.zookeeper ` | Zookeeper image | `zookeeper:5.3.1` | -| `druid.image.broker` | Broker image | `druid:5.3.1` | -| `druid.image.coordinator` | Coordinator | `druid:5.3.1` | -| `druid.image.middlemanager` | Middlemanager image | `druid:5.3.1` | -| `druid.image.minio` | Minio image | `minio:5.3.1` | -| `druid.image.historical` | Historical image | `druid:5.3.1` | -| `druid.image.kafka` | Kafka image | `kafka:5.3.1` | -| `druid.image.ingestion` | Ingestion image | `ingestion-server:5.3.1` | +| `druid.image.zookeeper ` | Zookeeper image | `zookeeper:5.3.2` | +| `druid.image.broker` | Broker image | `druid:5.3.2` | +| `druid.image.coordinator` | Coordinator | `druid:5.3.2` | +| `druid.image.middlemanager` | Middlemanager image | `druid:5.3.2` | +| `druid.image.minio` | Minio image | `minio:5.3.2` | +| `druid.image.historical` | Historical image | `druid:5.3.2` | +| `druid.image.kafka` | Kafka image | `kafka:5.3.2` | +| `druid.image.ingestion` | Ingestion image | `ingestion-server:5.3.2` | ## RabbitMQ The following table lists the configured parameters of the Bitnami RabbitMQ Subchart - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq @@ -814,7 +829,7 @@ The following table lists the configured parameters of the Bitnami RabbitMQ Subc | ----------------------------- | ----------------------------------- | ----------------------------------------------------------- | | `rabbitmq.enabled` | Enable this subchart | `true` | | `rabbitmq.host` | Host - must match fullnameOverride | `rabbitmq` | -| `rabbitmq.image.tag` | RabbitMQ image version | `5.2.2` | +| `rabbitmq.image.tag` | RabbitMQ image version | `5.3.2` | | `rabbitmq.fullnameOverride` | Overrides the name of the subchart | `rabbitmq` | | `rabbitmq.pdb.create` | Create PodDisruptionBudget (PDB) Object | `false` | | `rabbitmq.pdb.maxUnavailable | Maximum number of simultaneous unavailable pods | `not set` | @@ -846,9 +861,11 @@ The following table lists the configured parameters of the Bitnami RabbitMQ Subc ## MySQL The following table lists the configured parameters of the MySQL Subchart - https://github.com/bitnami/charts/tree/master/bitnami/mysql +**_NOTE:- From chart version 2.3.12 dont include 'mysql' string in release-name of `helm install ` command._** + | Parameter | Description | Default | | ----------------------------- | ----------------------------------- | ----------------------------------------------------------- | -| `mysql.image.tag` | MySQL Image to use | `8.0.37-debian-12-r2` | +| `mysql.image.tag` | MySQL Image to use | `8.4.4-debian-12-r0` | | `mysql.auth.username` | MySQL Username | `admin` | | `mysql.auth.existingSecret` | Secret where credentials are stored, see global.databaseSecret | `database-secret` | | `mysql.initdbScripts` | Dictionary of initdb scripts | `see values.yaml` | @@ -1038,6 +1055,6 @@ $ kubectl scale statefulset -mysql --replicas= ``` ## License -Copyright (c) 2024 CA, A Broadcom Company. All rights reserved. +Copyright (c) 2025 CA, A Broadcom Company. All rights reserved. This software may be modified and distributed under the terms of the MIT license. See the [LICENSE](https://github.com/CAAPIM/apim-charts/blob/stable/LICENSE) file for details. diff --git a/charts/portal/charts/druid-1.0.14.tgz b/charts/portal/charts/druid-1.0.14.tgz deleted file mode 100644 index e4b01066..00000000 Binary files a/charts/portal/charts/druid-1.0.14.tgz and /dev/null differ diff --git a/charts/portal/charts/druid-1.0.15.tgz b/charts/portal/charts/druid-1.0.15.tgz new file mode 100644 index 00000000..e9a5a980 Binary files /dev/null and b/charts/portal/charts/druid-1.0.15.tgz differ diff --git a/charts/portal/charts/ingress-nginx-4.10.0.tgz b/charts/portal/charts/ingress-nginx-4.10.0.tgz deleted file mode 100644 index 795ef644..00000000 Binary files a/charts/portal/charts/ingress-nginx-4.10.0.tgz and /dev/null differ diff --git a/charts/portal/charts/ingress-nginx-4.12.0.tgz b/charts/portal/charts/ingress-nginx-4.12.0.tgz new file mode 100644 index 00000000..e1db02c5 Binary files /dev/null and b/charts/portal/charts/ingress-nginx-4.12.0.tgz differ diff --git a/charts/portal/charts/mysql-10.3.0.tgz b/charts/portal/charts/mysql-10.3.0.tgz deleted file mode 100644 index 920bca02..00000000 Binary files a/charts/portal/charts/mysql-10.3.0.tgz and /dev/null differ diff --git a/charts/portal/charts/mysql-12.2.2.tgz b/charts/portal/charts/mysql-12.2.2.tgz new file mode 100644 index 00000000..11b326f8 Binary files /dev/null and b/charts/portal/charts/mysql-12.2.2.tgz differ diff --git a/charts/portal/templates/analytics-server/analytics-config.yaml b/charts/portal/templates/analytics-server/analytics-config.yaml index 5bd323a4..420afe17 100644 --- 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 index 8c75a826..8440b355 100644 --- 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 index 1c762301..c7e3f7dd 100644 --- 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 index 2ce2b160..9db4f412 100644 --- 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 index e33acc14..7a3d97e9 100644 --- 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 index b6c7de17..f3c59d77 100644 --- 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 index 477da187..3b263266 100644 --- 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 index f3cb8978..b1c33b2e 100644 --- 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 index 26bc7309..27ead84f 100644 --- 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 index 776620cc..33abf671 100644 --- 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 index 3127412f..4e7908c4 100644 --- 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