[charts/portal] Merging stable to develop/portal (#289)

* Support for readonly db connection * update values file * readme * image * mysql url change * add lables * remove spaces * remove spaces * Ro DB secret * Chart version * US896244: DB upgrade job * Resolve merge conflicts * Fix read only connection check * Update readme with new parameters * modify production values * Address review comments * Change chart version * Fixed lint error * Update production values as per the values yaml file * Add ddl user name and password to values and production values files * merge * add changeLogSync * add changeLogSync * fix condition * add password field * adding init container for OTK to stage bundles in GW bootstrap * addressing code review comments * fix conditions * adding trusted certificate to be read by otk init container * adding missed changes during merge. * create otk_db in demo db * values * init otk db * db scripts * adding read me updates to the chart for otk on ephemeral gw * configmap * change config map gen * adding fields OTK_TEST_CLIENTS_REDIRECT_URL & OTK_CREATE_TEST_CLIENTS * move customizations to top * addressing review comments * fixing lint findings * resetting formatting of GW param table * remove hooks * Fix annotations * remove hooks * doc * Database Properties are required for cassandra connection also * undo changes * undo changes * update readme * fix lint issues * Release updates * Release updates * Update README.md * adding skipInternalServerTools * Cron jobs * add cass condition * add dmz condition * updating connection properties to indicate that the values should be of string type * Fix name * update service name * remove tailing spaces * otk README * Update README.md * Update README.md * Update README.md * fix readme * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * updating documentation * replace find command * updated readme, updated gateway chart version * update doc * update doc * update doc * Update deprecation note in obsoleted OTK chart README.md * preinstall hooks for otk db install * autoscale-off * add resources support for OTK job * increment chart version * Update values.yaml * [charts/portal] Changes to support Portal 5.2.2 version (#271) * US855843 Add env var for audit log cleanup * cast & use integer values for replicaCounts * 1.0.9 tarball bump * bump chart version * new Chart.lock/tarball from newer version of helm * US857194 add README for portalData.additionalEnv.AUDIT_LOG_TRUNCATE_BATCH_SIZE and portalData.additionalEnv.AUDIT_LOG_TRUNCATE_FREQ_MIN (#189) Co-authored-by: Mark Chen <[email protected]> * charts/portal: For Portal 5.2 changes (#188) * 0000000 : For Portal 5.2 changes * 0000000: For Portal 5.2 changes * 0000000: For Portal 5.2 changes * 0000000: For Portal 5.2 changes * 0000000: For Portal 5.2 changes * Updating mysql image tag from 8.0.26-debian-10-r78 to 8.0.31-debian-1… (#195) * Updating mysql image tag from 8.0.26-debian-10-r78 to 8.0.31-debian-10-r78 * US840140: Adding ip/range property PROBE_IP_RANGE to support CIDR in dispatcher additionalEnv * [charts/portal] Rabbit upgrade (#210) * Update rabbitmq-load-definition-secret.yaml * added vhosts declaration * Update Chart.yaml * bring over portal/druid changes from previous PR * US880884 dispatcher portal health check enhancement (#217) Co-authored-by: MarkChen <[email protected]> * US880924 Remove Postgres refs (#216) Co-authored-by: ac658123 <[email protected]> * update chart dep * more accurate doc values, use bitnami options for mysql chart * missed minavailable in minio template * forgot to update tarball * Re-adjusting the duplicates from stable branch * Changes to support Portal version 5.2.1 * Removing redundant version * doc better reflects values * post-merge helm dep update * [charts/portal] Adding provision to configure liveness and readiness probe of historical container (#225) * Adding provision to configure the liveness and readies probe threshold to provide additional time for SaaS deployment * Addig provision to configure historal probe values and allowing a max of 32M upload file size to support custompages and gw bundles --------- Co-authored-by: Kiran Saladi <[email protected]> * Upgrading RMQ chart to simplify the volume permissions conf * bring minavailable/maxunavailable in line with gw/otk values ("") * Adding the doc for mountpath * Adding the doc for mountpath-corrections adjusted * Changes to use existing DB secret that contains the DB password * Moved the useExistingDatabaseSecret to global section from portal section in values yaml * Moved the useExistingDatabaseSecret to global section from portal section in values yaml * Comments correction * Comments correction * [charts/portal] - Added support for configuring db node pool properties for portal container (#231) * US898231 - Added support for configuring db properties * US899914 upgraded ingress-ngnix to 4.7.2 * Update Chart.lock * [Charts/Portal]- Adding tag changes for 5.2.2 release (#264) Co-authored-by: Prem Chander Vodela <[email protected]> * Changes to chart version for portal 5.2.2 version * Updating the doc links * updated Chart.lock and druid tar as lint failures occured when pushing the existing ones to stable branch * updated druid chart version --------- Co-authored-by: ac658123 <[email protected]> Co-authored-by: Andrew Cheuk <[email protected]> Co-authored-by: Justin Maurer <[email protected]> Co-authored-by: markgxchen <[email protected]> Co-authored-by: Mark Chen <[email protected]> Co-authored-by: premchandervodela <[email protected]> Co-authored-by: jmmAVGO <[email protected]> Co-authored-by: sm895441 <[email protected]> Co-authored-by: Ilya Melnikov <[email protected]> Co-authored-by: Kiran Saladi <[email protected]> Co-authored-by: Meet Patel <[email protected]> Co-authored-by: im683661 <[email protected]> Co-authored-by: kiran vaddadi <[email protected]> Co-authored-by: Prem Chander Vodela <[email protected]> * restman host and port * trim tailing spaces * fix issue * Update README.md * review comments * review comments * review comments * ScheduleJOB Start IP and Network mask * ScheduleJOB Start IP and Network mask * ScheduleJOB Start IP and Network mask * schedule tasks * update resources * resources * Adding lint-tests to GW and Portal. Removing schema-validation for develop/gateway and develop/portal * Update README.md * image pull secret * fix changeLogSync level * hooks for ro secret * post-upgrade * Update README.md updating release info in the Read Me * formatting release information * Revert health check bundle path as it is causing gateway reboot * increase chart version * Update README.md * Update deployment.yaml * Update README.md * Update README.md * charts/gateway redis support, ingress update, restart on config change * updated production-values.yaml * added redis commandTimeout * updated values, additional redis config refs * charts/gateway update to Gateway image to v11.0.00_CR2 * charts/gateway updated readme, values, added graphman bundle support for bootstrap script * updated documentation for redis authentication * updated redis configuration in value files * Removing the unwanted druid file package --------- Co-authored-by: kiran vaddadi <[email protected]> Co-authored-by: U-BRCMLTD\su671781 <[email protected]> Co-authored-by: uppoju <[email protected]> Co-authored-by: APIM-KiranVaddadi <[email protected]> Co-authored-by: as673366 <[email protected]> Co-authored-by: ab-sub <[email protected]> Co-authored-by: Emily Zhang <[email protected]> Co-authored-by: Gazza7205 <[email protected]> Co-authored-by: Ben Urbanski <[email protected]> Co-authored-by: volol01 <[email protected]> Co-authored-by: ac658123 <[email protected]> Co-authored-by: Andrew Cheuk <[email protected]> Co-authored-by: Justin Maurer <[email protected]> Co-authored-by: markgxchen <[email protected]> Co-authored-by: Mark Chen <[email protected]> Co-authored-by: premchandervodela <[email protected]> Co-authored-by: jmmAVGO <[email protected]> Co-authored-by: sm895441 <[email protected]> Co-authored-by: Ilya Melnikov <[email protected]> Co-authored-by: Kiran Saladi <[email protected]> Co-authored-by: Meet Patel <[email protected]> Co-authored-by: im683661 <[email protected]> Co-authored-by: Prem Chander Vodela <[email protected]>
CAAPIM · Feb 7, 2024 · 2767dad · 2767dad
1 parent c72649d
commit 2767dad
Show file tree

Hide file tree

Showing 34 changed files with 1,854 additions and 223 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -4,6 +4,8 @@ on:
   pull_request:
     branches:
       - stable
+      - develop/gateway
+      - develop/portal
 
 jobs:
   lint-test:

diff --git a/.github/workflows/schema-validation.yaml b/.github/workflows/schema-validation.yaml
@@ -5,8 +5,7 @@ on:
     branches:
       - stable
       - unstable
-      - develop/gateway
-      - develop/portal
+
 
 jobs:
   kubeval-chart:

diff --git a/charts/gateway-otk/Chart.yaml b/charts/gateway-otk/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: gateway-otk
-version: 2.0.2
+version: 2.0.3
 appVersion: "10.1.00"
 description: This alpha Helm Chart deploys the Layer7 Gateway with OTK in Kubernetes.
 maintainers:

diff --git a/charts/gateway-otk/README.md b/charts/gateway-otk/README.md
@@ -1,6 +1,6 @@
-# Layer7 API Gateway - OAUTH TOOLKIT (NOTE: In Development)
+# Layer7 API Gateway - OAuth Toolkit (DEPRECATED)
 
-###Note:This Chart is deprecated. The OTK is integrated with Gateway into a single chart. Refer to gateway directory
+**Note: This Chart is deprecated. The OTK is integrated with Gateway into a single chart. Refer to gateway directory**
 
 This Chart deploys the API Gateway - OAUTH TOOLKIT with the following `optional` subcharts: hazelcast, mysql, influxdb, grafana.
 

diff --git a/charts/gateway/Chart.lock b/charts/gateway/Chart.lock
@@ -7,9 +7,12 @@ dependencies:
   version: 4.12.0
 - name: grafana
   repository: https://charts.bitnami.com/bitnami
-  version: 8.0.11
+  version: 9.5.2
 - name: mysql
   repository: https://charts.bitnami.com/bitnami
-  version: 9.2.6
-digest: sha256:0db027a0602128156cbcb7b23f694bde96686411367a8cb640a081978112a418
-generated: "2022-08-11T11:15:13.621619+01:00"
+  version: 9.14.2
+- name: redis
+  repository: https://charts.bitnami.com/bitnami
+  version: 18.2.1
+digest: sha256:ad87dbcf8a73e3780500b3bda4157820b4a214bcbdf07db4ccdb3e5063f32ccb
+generated: "2023-12-12T13:13:58.809885Z"
diff --git a/charts/gateway/Chart.yaml b/charts/gateway/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "11.0.00"
+appVersion: "11.0.00_CR2"
 description: This Helm Chart deploys the Layer7 Gateway in Kubernetes.
 name: gateway
-version: 3.0.14
+version: 3.0.21
 type: application
 home: https://github.com/CAAPIM/apim-charts
 maintainers:
@@ -19,10 +19,14 @@ dependencies:
     repository: "https://helm.influxdata.com/"
     condition: influxdb.enabled
   - name: grafana
-    version: 8.0.11
+    version: 9.5.2
     repository: "https://charts.bitnami.com/bitnami"
     condition: grafana.enabled
   - name: mysql
-    version: 9.2.6
+    version: 9.14.2
     repository: "https://charts.bitnami.com/bitnami"
     condition: database.create
+  - name: redis
+    version: 18.2.1
+    repository: "https://charts.bitnami.com/bitnami"
+    condition: config.redis.subChart.enabled
diff --git a/charts/gateway/README.md b/charts/gateway/README.md
diff --git a/charts/gateway/bundles/otk-healthcheck.bundle b/charts/gateway/bundles/otk-healthcheck.bundle
@@ -43,8 +43,8 @@
     &lt;wsp:All wsp:Usage=&quot;Required&quot;&gt;
         &lt;L7p:SslAssertion/&gt;
         &lt;L7p:RemoteIpAddressRange&gt;
-            &lt;L7p:NetworkMask stringValue=&quot;16&quot;/&gt;
-            &lt;L7p:StartIp stringValue=&quot;240.224.2.1&quot;/&gt;
+            &lt;L7p:NetworkMask stringValue=&quot;{{ default "16" .Values.otk.networkMask}}&quot;/&gt;
+            &lt;L7p:StartIp stringValue=&quot;{{ default "240.224.2.1" .Values.otk.startIP }}&quot;/&gt;
         &lt;/L7p:RemoteIpAddressRange&gt;
         &lt;L7p:SetVariable&gt;
             &lt;L7p:Base64Expression stringValue=&quot;YWR2YW5jZWQ=&quot;/&gt;

diff --git a/charts/gateway/charts/grafana-8.0.11.tgz b/charts/gateway/charts/grafana-8.0.11.tgz
diff --git a/charts/gateway/charts/grafana-9.5.2.tgz b/charts/gateway/charts/grafana-9.5.2.tgz
diff --git a/charts/gateway/charts/mysql-9.14.2.tgz b/charts/gateway/charts/mysql-9.14.2.tgz
diff --git a/charts/gateway/charts/mysql-9.2.6.tgz b/charts/gateway/charts/mysql-9.2.6.tgz
diff --git a/charts/gateway/charts/redis-18.2.1.tgz b/charts/gateway/charts/redis-18.2.1.tgz