Merge pull request #320 from CAAPIM/ks_portal53

[charts/portal] Portal 5.3 helm charts

charts/druid/Chart.yaml

@@ -7,5 +7,5 @@ maintainers:
   - name: Gazza7205
 sources:
   - https://github.com/CAAPIM/apim-charts
-version: 1.0.13
-appVersion: 0.17.0
+version: 1.0.14
+appVersion: 28.0.1

charts/portal/Chart.lock

@@ -1,15 +1,15 @@
 dependencies:
 - name: druid
   repository: file://../druid
-  version: 1.0.13
+  version: 1.0.14
 - name: mysql
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 9.19.1
+  version: 10.3.0
 - 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.7.2
-digest: sha256:fabdd9a1a279335547e764c767281be489be70ddd02f0d2807e4403e591226eb
-generated: "2024-02-20T14:13:27.1279746+05:30"
+  version: 4.10.0
+digest: sha256:37372a7aae49609a719e1e1d0f9f9c6ba66b41caaeed4892981db2b50289cda4
+generated: "2024-06-20T19:08:34.36457+05:30"

charts/portal/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "5.2.3"
+appVersion: "5.3"
 description: CA API Developer Portal
 name: portal
-version: 2.3.8
+version: 2.3.9
 type: application
 home: https://github.com/CAAPIM/apim-charts
 maintainers:
@@ -16,7 +16,7 @@ dependencies:
   condition: portal.analytics.enabled
   repository: "file://../druid"
 - name: mysql
-  version: 9.19.1
+  version: 10.3.0
   repository: "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami"
   condition: global.setupDemoDatabase
 - name: rabbitmq
@@ -25,5 +25,5 @@ dependencies:
   condition: rabbitmq.enabled
 - name: ingress-nginx
   repository: "https://kubernetes.github.io/ingress-nginx/"
-  version: 4.7.2
+  version: 4.10.0
   condition: ingress.create

charts/portal/templates/analytics-server/analytics-config.yaml

@@ -24,7 +24,7 @@ data:
   DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
   NSS_SDB_USE_CACHE: "no"
   ONPREM: "true"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_HOST: {{ .Values.rabbitmq.host | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
   PAPI_PUBLIC_HOST: {{ include "tssg-public-host" . | quote }}

charts/portal/templates/apim/apim-config.yaml

@@ -22,7 +22,7 @@ data:
   OTK_DATABASE_NAME: {{ include "otk-db-name" . | quote }}
   OTK_PORT: {{ .Values.portal.otk.port | quote }}
   PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   SSG_CLUSTER_HOST: {{ include "tssg-public-host" . | quote }}
   SSG_JVM_HEAP: 4096m
   TENANT_ID: {{ include "default-tenant-id" . | quote }}

charts/portal/templates/authenticator/authenticator-config.yaml

@@ -22,7 +22,7 @@ data:
   DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
   JAVA_OPTIONS: {{ .Values.authenticator.javaOptions | default "-Xms1g -Xmx1g" | quote }}
   NSS_SDB_USE_CACHE: "no"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
 {{ if .Values.authenticator.additionalEnv }}
 {{- range $key, $val := .Values.authenticator.additionalEnv }}

charts/portal/templates/dispatcher/dispatcher-config.yaml

@@ -10,7 +10,7 @@ metadata:
 data:
   NSS_SDB_USE_CACHE: "no"
   PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   TSSG_PUBLIC_HOST: {{ include "tssg-public-host" . | quote }}
   USE_PROXY_PROTOCOL: "false"
 {{ if .Values.dispatcher.additionalEnv }}

charts/portal/templates/portal-data/portal-data-config.yaml

@@ -31,7 +31,7 @@ data:
   NSS_SDB_USE_CACHE: "no"
   PAPI_PUBLIC_HOST: {{ include "tssg-public-host" . | quote }}
   PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_HOST: {{ .Values.rabbitmq.host | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
   RBAC_DATABASE_NAME: {{ include "rbac-db-name" . | quote }}

charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml

@@ -23,7 +23,7 @@ data:
   HELP_BASE_URL: {{ include "portal.help.page" . | quote }}
   JAVA_OPTIONS: {{ .Values.portalEnterprise.javaOptions | default "-Xms2g -Xmx2g" | quote }}
   NSS_SDB_USE_CACHE: "no"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   RABBITMQ_HOST: {{ .Values.rabbitmq.host | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
   RBAC_DATABASE_NAME: {{ include "rbac-db-name" . | quote }}

charts/portal/templates/pssg/pssg-config.yaml

@@ -36,7 +36,7 @@ data:
   DATABASE_USE_SSL: {{ .Values.global.databaseUseSSL | quote }}
   DATABASE_REQUIRE_SSL: {{ .Values.global.databaseRequireSSL | quote }}
   NSS_SDB_USE_CACHE: "no"
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   SSG_JVM_HEAP: 4096m
 {{ if .Values.pssg.additionalEnv }}
 {{- range $key, $val := .Values.pssg.additionalEnv }}

charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml

@@ -27,7 +27,7 @@ data:
   JAVA_OPTIONS: {{ .Values.tenantProvisioner.javaOptions | default "-Xms512m -Xmx512m" | quote }}
   NSS_SDB_USE_CACHE: "no"
   OTK_PORT: {{ .Values.portal.otk.port | quote }}
-  PORTAL_VERSION: {{ .Chart.AppVersion }}
+  PORTAL_VERSION: {{ .Chart.AppVersion | quote }}
   PORTAL_DATABASE_NAME: {{ include "portal-db-name" . | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.service.port | quote }}
 {{ if .Values.tenantProvisioner.additionalEnv }}

charts/portal/values-production.yaml

@@ -32,7 +32,7 @@ global:
   containerSecurityContext: {}
   #   containerSecurityContext:
   #     runAsUser: 1001
-  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-2/
+  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/
 # storageClass: "_"
 # schedulerName:
 
@@ -523,18 +523,18 @@ tenantProvisioner:
   additionalEnv:
 
 image:
-  dispatcher: dispatcher:5.2.3
-  pssg: pssg:5.2.3
-  apim: ingress:5.2.3
-  enterprise: portal-enterprise:5.2.3
-  data: portal-data:5.2.3
-  tps: tenant-provisioning-service:5.2.3
-  analytics: analytics-server:5.2.3
-  authenticator: authenticator:5.2.3
-  dbUpgrade: db-upgrade-portal:5.2.3
-  rbacUpgrade: db-upgrade-rbac:5.2.3
-  upgradeVerify: upgrade-verify:5.2.3
-  tlsManager: tls-automator:5.2.3
+  dispatcher: dispatcher:5.3
+  pssg: pssg:5.3
+  apim: ingress:5.3
+  enterprise: portal-enterprise:5.3
+  data: portal-data:5.3
+  tps: tenant-provisioning-service:5.3
+  analytics: analytics-server:5.3
+  authenticator: authenticator:5.3
+  dbUpgrade: db-upgrade-portal:5.3
+  rbacUpgrade: db-upgrade-rbac:5.3
+  upgradeVerify: upgrade-verify:5.3
+  tlsManager: tls-automator:5.3
 
 ##
 ## Subchart Configuration
@@ -835,14 +835,14 @@ druid:
   #         topologyKey: kubernetes.io/hostname
 
   image:
-    zookeeper: zookeeper:5.2.3
-    broker: druid:5.2.3
-    coordinator: druid:5.2.3
-    middlemanager: druid:5.2.3
-    minio: minio:5.2.3
-    historical: druid:5.2.3
-    kafka: kafka:5.2.3
-    ingestion: ingestion-server:5.2.3
+    zookeeper: zookeeper:5.3
+    broker: druid:5.3
+    coordinator: druid:5.3
+    middlemanager: druid:5.3
+    minio: minio:5.3
+    historical: druid:5.3
+    kafka: kafka:5.3
+    ingestion: ingestion-server:5.3
 
 # Settings for RabbitMQ - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq
 rabbitmq:
@@ -852,7 +852,7 @@ rabbitmq:
   image:
     registry: caapim
     repository: message-broker
-    tag: "5.2.3"
+    tag: "5.3"
     pullSecrets:
       - broadcom-apim
   pdb:
@@ -978,7 +978,7 @@ jobs:
 # MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
 mysql:
   image:
-    tag: "8.0.36-debian-11-r4"
+    tag: "8.0.37-debian-12-r2"
   auth:
     username: portal
     existingSecret: database-secret

charts/portal/values.yaml

@@ -32,7 +32,7 @@ global:
   containerSecurityContext: {}
   #   containerSecurityContext:
   #     runAsUser: 1001
-  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-2/
+  helpPage: https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/
 # storageClass: "_"
 # schedulerName:
 # The saas flag should be left as is unless otherwise specified by support.
@@ -453,18 +453,18 @@ tenantProvisioner:
   additionalEnv:
 
 image:
-  dispatcher: dispatcher:5.2.3
-  pssg: pssg:5.2.3
-  apim: ingress:5.2.3
-  enterprise: portal-enterprise:5.2.3
-  data: portal-data:5.2.3
-  tps: tenant-provisioning-service:5.2.3
-  analytics: analytics-server:5.2.3
-  authenticator: authenticator:5.2.3
-  dbUpgrade: db-upgrade-portal:5.2.3
-  rbacUpgrade: db-upgrade-rbac:5.2.3
-  upgradeVerify: upgrade-verify:5.2.3
-  tlsManager: tls-automator:5.2.3
+  dispatcher: dispatcher:5.3
+  pssg: pssg:5.3
+  apim: ingress:5.3
+  enterprise: portal-enterprise:5.3
+  data: portal-data:5.3
+  tps: tenant-provisioning-service:5.3
+  analytics: analytics-server:5.3
+  authenticator: authenticator:5.3
+  dbUpgrade: db-upgrade-portal:5.3
+  rbacUpgrade: db-upgrade-rbac:5.3
+  upgradeVerify: upgrade-verify:5.3
+  tlsManager: tls-automator:5.3
 
 ##
 ## Subchart Configuration
@@ -691,14 +691,14 @@ druid:
   # affinity: {}
 
   image:
-    zookeeper: zookeeper:5.2.3
-    broker: druid:5.2.3
-    coordinator: druid:5.2.3
-    middlemanager: druid:5.2.3
-    minio: minio:5.2.3
-    historical: druid:5.2.3
-    kafka: kafka:5.2.3
-    ingestion: ingestion-server:5.2.3
+    zookeeper: zookeeper:5.3
+    broker: druid:5.3
+    coordinator: druid:5.3
+    middlemanager: druid:5.3
+    minio: minio:5.3
+    historical: druid:5.3
+    kafka: kafka:5.3
+    ingestion: ingestion-server:5.3
 
 # Settings for RabbitMQ - https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq
 rabbitmq:
@@ -708,7 +708,7 @@ rabbitmq:
   image:
     registry: caapim
     repository: message-broker
-    tag: "5.2.3"
+    tag: "5.3"
     pullSecrets:
       - broadcom-apim
   pdb:
@@ -823,7 +823,7 @@ jobs:
 # MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
 mysql:
   image:
-    tag: "8.0.36-debian-11-r4"
+    tag: "8.0.37-debian-12-r2"
   auth:
     username: portal
     existingSecret: database-secret

utils/create-tenant.sh

@@ -30,7 +30,7 @@ function print_steps() {
 
 	The tenant has been added to the database. The tenant info can be found in the tenant_info file in the current directory.
 	Please follow the rest of the instructions at TechDocs to enroll your gateway with the portal.
-	(https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-2/install-configure-and-upgrade/post-installation-tasks/enroll-a-layer7-api-gateway.html)
+	(https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/install-configure-and-upgrade/post-installation-tasks/enroll-a-layer7-api-gateway.html)
 			
 	1. You will need to navigate to the portal at https://${tenant_id}.${domain} and create a new API PROXY. 
 	2. Copy the enrollment URL