From 930a824e7b92f8f53266b8c36e791f53852b7015 Mon Sep 17 00:00:00 2001 From: as673366 Date: Fri, 5 Jul 2024 12:54:05 +0530 Subject: [PATCH 1/4] fixing issue to provide backward compatibility to install 4.6 from newer chart versions --- charts/gateway/README.md | 1 + charts/gateway/templates/otk-install-configmap.yaml | 2 +- charts/gateway/values.yaml | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/gateway/README.md b/charts/gateway/README.md index eb866936..e5665251 100644 --- a/charts/gateway/README.md +++ b/charts/gateway/README.md @@ -659,6 +659,7 @@ OTK Deployment examples can be found [here](/examples/otk) | `otk.job.resources` | OTK Job resources | {} | `otk.job.scheduledTasksSuccessfulJobsHistoryLimit`| OTK db maintenance scheduled job success history limit | `1` | | `otk.job.scheduledTasksFailedJobsHistoryLimit`| OTK db maintenance scheduled job failed history limit | `1` | +| `otk.job.bootstrapDir`| The location of OTK artifacts in the image | `/opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK` | | `otk.database.type` | OTK database type - mysql/oracle/cassandra | `mysql` | `otk.database.waitTimeout` | OTK database connection wait timeout in seconds | `60`| | `otk.database.dbUpgrade` | Enable/Disable OTK DB Upgrade| `true` | diff --git a/charts/gateway/templates/otk-install-configmap.yaml b/charts/gateway/templates/otk-install-configmap.yaml index a9006e95..43fef76f 100644 --- a/charts/gateway/templates/otk-install-configmap.yaml +++ b/charts/gateway/templates/otk-install-configmap.yaml @@ -24,7 +24,7 @@ data: {{- else }} OTK_INSTALL_MODE: "initContainer" {{- end }} - BOOTSTRAP_DIR: "/opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK" + BOOTSTRAP_DIR: {{default "." .Values.otk.bootstrapDir | quote }} OTK_SK_UPGRADE: "true" OTK_DATABASE_UPGRADE: "false" OTK_SKIP_INTERNAL_SERVER_TOOLS: {{default false .Values.otk.skipInternalServerTools | quote }} diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index 6f4089d5..b97e83d6 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -667,7 +667,8 @@ otk: pullPolicy: IfNotPresent imagePullSecret: enabled: false - + # The default value set below is for OTK 4.6.2. For the older versions, this value should be set as "." indicating current directory + bootstrapDir : /opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK # Valid only for ephemeral gateway. Creates cronJobs for each OTK DB maintenance schedule tasks. scheduledTasks: - name: client From a6ebecece21271ccdcd8d4a40e099ef170717908 Mon Sep 17 00:00:00 2001 From: as673366 Date: Fri, 5 Jul 2024 15:49:16 +0530 Subject: [PATCH 2/4] addressing code review comments --- charts/gateway/README.md | 1 + charts/gateway/production-values.yaml | 2 ++ charts/gateway/templates/otk-install-configmap.yaml | 2 +- charts/gateway/values.yaml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/gateway/README.md b/charts/gateway/README.md index e5665251..92ff156c 100644 --- a/charts/gateway/README.md +++ b/charts/gateway/README.md @@ -100,6 +100,7 @@ Things to note and be aware of are the deprecation of TLSv1.0/TLSv1.1 and the JA - otk.job.image.tag: 4.6.3 - Liquibase version has been upgraded to 4.12.0 to enable offline Liquibase schema support for OTK Helm charts. - UTFMB4 Character Set Support for MySQL. +- Fixed backward compatibility issue for pre 4.6.2 OTK versions ## 3.0.28 General Updates - Added a [Startup probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) for the Gateway Container. diff --git a/charts/gateway/production-values.yaml b/charts/gateway/production-values.yaml index 28b7acbf..f00cf94d 100644 --- a/charts/gateway/production-values.yaml +++ b/charts/gateway/production-values.yaml @@ -667,6 +667,8 @@ otk: pullPolicy: IfNotPresent imagePullSecret: enabled: false + # The default value set below is for OTK 4.6.2. For the older versions, this value should be set as "." indicating current directory + bootstrapDir : /opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK # Valid only for ephemeral gateway. Creates cronJobs for each OTK DB maintenance schedule tasks. scheduledTasks: diff --git a/charts/gateway/templates/otk-install-configmap.yaml b/charts/gateway/templates/otk-install-configmap.yaml index 43fef76f..b8833b58 100644 --- a/charts/gateway/templates/otk-install-configmap.yaml +++ b/charts/gateway/templates/otk-install-configmap.yaml @@ -24,7 +24,7 @@ data: {{- else }} OTK_INSTALL_MODE: "initContainer" {{- end }} - BOOTSTRAP_DIR: {{default "." .Values.otk.bootstrapDir | quote }} + BOOTSTRAP_DIR: {{default "/opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK" .Values.otk.bootstrapDir | quote }} OTK_SK_UPGRADE: "true" OTK_DATABASE_UPGRADE: "false" OTK_SKIP_INTERNAL_SERVER_TOOLS: {{default false .Values.otk.skipInternalServerTools | quote }} diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index b97e83d6..ffb2a7d6 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -669,6 +669,7 @@ otk: enabled: false # The default value set below is for OTK 4.6.2. For the older versions, this value should be set as "." indicating current directory bootstrapDir : /opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK + # Valid only for ephemeral gateway. Creates cronJobs for each OTK DB maintenance schedule tasks. scheduledTasks: - name: client From 911e20f74090425999991c02903afcb0ddf35b9d Mon Sep 17 00:00:00 2001 From: as673366 Date: Tue, 9 Jul 2024 11:30:10 +0530 Subject: [PATCH 3/4] addressing code review comments --- charts/gateway/README.md | 4 +++- charts/gateway/production-values.yaml | 3 --- charts/gateway/values.yaml | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/charts/gateway/README.md b/charts/gateway/README.md index 92ff156c..efad0e5b 100644 --- a/charts/gateway/README.md +++ b/charts/gateway/README.md @@ -100,7 +100,9 @@ Things to note and be aware of are the deprecation of TLSv1.0/TLSv1.1 and the JA - otk.job.image.tag: 4.6.3 - Liquibase version has been upgraded to 4.12.0 to enable offline Liquibase schema support for OTK Helm charts. - UTFMB4 Character Set Support for MySQL. -- Fixed backward compatibility issue for pre 4.6.2 OTK versions +- Fixed backward compatibility issue related to bootstrap director location for pre 4.6.2 OTK versions + - The default value for versions OTK 4.6.2 & higher is /opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK + - For versions older than OTK 4.6.2, in values.yaml manually add a new parameter otk.bootstrapDir with value "." indicating current directory ## 3.0.28 General Updates - Added a [Startup probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) for the Gateway Container. diff --git a/charts/gateway/production-values.yaml b/charts/gateway/production-values.yaml index f00cf94d..0bd40969 100644 --- a/charts/gateway/production-values.yaml +++ b/charts/gateway/production-values.yaml @@ -667,9 +667,6 @@ otk: pullPolicy: IfNotPresent imagePullSecret: enabled: false - # The default value set below is for OTK 4.6.2. For the older versions, this value should be set as "." indicating current directory - bootstrapDir : /opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK - # Valid only for ephemeral gateway. Creates cronJobs for each OTK DB maintenance schedule tasks. scheduledTasks: - name: client diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index ffb2a7d6..895331f9 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -667,9 +667,6 @@ otk: pullPolicy: IfNotPresent imagePullSecret: enabled: false - # The default value set below is for OTK 4.6.2. For the older versions, this value should be set as "." indicating current directory - bootstrapDir : /opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK - # Valid only for ephemeral gateway. Creates cronJobs for each OTK DB maintenance schedule tasks. scheduledTasks: - name: client From 32cbd06e1598e42d0c55720362f6ffad486c4438 Mon Sep 17 00:00:00 2001 From: as673366 Date: Tue, 9 Jul 2024 11:42:36 +0530 Subject: [PATCH 4/4] updating readme --- charts/gateway/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/gateway/README.md b/charts/gateway/README.md index efad0e5b..cf912afd 100644 --- a/charts/gateway/README.md +++ b/charts/gateway/README.md @@ -101,7 +101,6 @@ Things to note and be aware of are the deprecation of TLSv1.0/TLSv1.1 and the JA - Liquibase version has been upgraded to 4.12.0 to enable offline Liquibase schema support for OTK Helm charts. - UTFMB4 Character Set Support for MySQL. - Fixed backward compatibility issue related to bootstrap director location for pre 4.6.2 OTK versions - - The default value for versions OTK 4.6.2 & higher is /opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK - For versions older than OTK 4.6.2, in values.yaml manually add a new parameter otk.bootstrapDir with value "." indicating current directory ## 3.0.28 General Updates @@ -662,7 +661,7 @@ OTK Deployment examples can be found [here](/examples/otk) | `otk.job.resources` | OTK Job resources | {} | `otk.job.scheduledTasksSuccessfulJobsHistoryLimit`| OTK db maintenance scheduled job success history limit | `1` | | `otk.job.scheduledTasksFailedJobsHistoryLimit`| OTK db maintenance scheduled job failed history limit | `1` | -| `otk.job.bootstrapDir`| The location of OTK artifacts in the image | `/opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK` | +| `otk.bootstrapDir`| The location of OTK artifacts in the image | `/opt/SecureSpan/Gateway/node/default/etc/bootstrap/bundle/000OTK` | | `otk.database.type` | OTK database type - mysql/oracle/cassandra | `mysql` | `otk.database.waitTimeout` | OTK database connection wait timeout in seconds | `60`| | `otk.database.dbUpgrade` | Enable/Disable OTK DB Upgrade| `true` |