From 5b03ad0a47abde1c34cc8cf57d52e61fa96c2782 Mon Sep 17 00:00:00 2001 From: davidrbiderman Date: Thu, 14 Sep 2023 16:00:56 +0300 Subject: [PATCH 1/4] add new DOP params --- charts/datastore/templates/deployment.yaml | 2 ++ charts/datastore/values.yaml | 1 + charts/rookout-hybrid/templates/datastore-deployment.yaml | 2 ++ charts/rookout-hybrid/values.yaml | 3 +++ 4 files changed, 8 insertions(+) diff --git a/charts/datastore/templates/deployment.yaml b/charts/datastore/templates/deployment.yaml index 3d70134..85df0eb 100644 --- a/charts/datastore/templates/deployment.yaml +++ b/charts/datastore/templates/deployment.yaml @@ -82,6 +82,8 @@ spec: value: {{ default 8080 .Values.datastore.dopContainerPort | quote }} - name: ROOKOUT_DOP_AUTO_TLS_DOMAIN value: {{ .Values.datastore.autoTlsDomain | quote }} + - name: ROOKOUT_DOP_DAO_ACTIVE + value: {{ .Values.datastore.enableNewDao }} {{ if (eq (required "datastore.serverMode is required" .Values.datastore.serverMode) "AUTOTLS") }} - name: ROOKOUT_DOP_ENABLE_FILE_LOGGER value: "False" diff --git a/charts/datastore/values.yaml b/charts/datastore/values.yaml index ece311c..9494ab6 100644 --- a/charts/datastore/values.yaml +++ b/charts/datastore/values.yaml @@ -14,6 +14,7 @@ datastore: servicePortTLS: '' logging: enabled: false + enableNewDao: false service: type: LoadBalancer diff --git a/charts/rookout-hybrid/templates/datastore-deployment.yaml b/charts/rookout-hybrid/templates/datastore-deployment.yaml index f8beff9..912b158 100644 --- a/charts/rookout-hybrid/templates/datastore-deployment.yaml +++ b/charts/rookout-hybrid/templates/datastore-deployment.yaml @@ -73,6 +73,8 @@ spec: value: {{ required "rookout.serverMode is required" .Values.rookout.serverMode | quote }} - name: ROOKOUT_DOP_PORT value: "8080" + - name: ROOKOUT_DOP_DAO_ACTIVE + value: {{ .Values.datastore.enableNewDao }} {{- with .Values.datastore.extraEnv }} {{- toYaml . | nindent 12 }} {{- end }} diff --git a/charts/rookout-hybrid/values.yaml b/charts/rookout-hybrid/values.yaml index 0ee7389..ff8f658 100644 --- a/charts/rookout-hybrid/values.yaml +++ b/charts/rookout-hybrid/values.yaml @@ -163,6 +163,9 @@ datastore: # -- whether to deploy a Datastore enabled: true + # -- whether to enable the new DAO wrappers for the datastore + enableNewDao: false + image: # -- Rookout's Datastore image name name: data-on-prem From edc4d97be8c4b36d19e2fce31587af9ddab50945 Mon Sep 17 00:00:00 2001 From: davidrbiderman Date: Thu, 14 Sep 2023 16:42:38 +0300 Subject: [PATCH 2/4] update datastore version --- charts/datastore/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datastore/Chart.yaml b/charts/datastore/Chart.yaml index 4b0157a..9cc4c1d 100644 --- a/charts/datastore/Chart.yaml +++ b/charts/datastore/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0.11" description: A Helm chart for Rookout Data-On-Prem component on Kubernetes icon: https://raw.githubusercontent.com/Rookout/helm-charts/master/Rookout-logo.png name: datastore -version: 0.1.48 +version: 0.1.49 home: "http://rookout.com/" maintainers: - name: Rookout From c591ba0de51d86f1bc7c6baf4037d50eb1787c28 Mon Sep 17 00:00:00 2001 From: davidrbiderman Date: Mon, 18 Sep 2023 09:45:41 +0300 Subject: [PATCH 3/4] update README --- charts/rookout-hybrid/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/rookout-hybrid/README.md b/charts/rookout-hybrid/README.md index 1926f95..5b52f4a 100644 --- a/charts/rookout-hybrid/README.md +++ b/charts/rookout-hybrid/README.md @@ -125,6 +125,7 @@ helm upgrade --install rookout rookout/rookout-hybrid \ | datastore.serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | datastore.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | | datastore.tolerations | list | `[]` | [Tolerations] for use with node taints | +| datastore.enableNewDao | bool | `false` | Enable new SQL connector and new DAO schema | imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry. Registry secret names as an array. | | rookout.controllerTLSSecretName | string | `""` | Rookout's controller TLS secert used when rookout.serverMode: "TLS" The components expect to find "tls.key" and "tls.crt" keys in the secert | | rookout.datastoreTLSSecretName | string | `""` | Rookout's datastore TLS secert used when rookout.serverMode: "TLS" The components expect to find "tls.key" and "tls.crt" keys in the secert | From 27e3fcda99c1994720c48c62123d2a8386501639 Mon Sep 17 00:00:00 2001 From: davidrbiderman Date: Mon, 18 Sep 2023 11:12:52 +0300 Subject: [PATCH 4/4] generate new helm-chart --- charts/rookout-hybrid/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rookout-hybrid/README.md b/charts/rookout-hybrid/README.md index 5b52f4a..8f2c9a3 100644 --- a/charts/rookout-hybrid/README.md +++ b/charts/rookout-hybrid/README.md @@ -98,6 +98,7 @@ helm upgrade --install rookout rookout/rookout-hybrid \ | controller.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | | controller.tolerations | list | `[]` | [Tolerations] for use with node taints | | datastore.affinity | object | `{}` | Assign custom [affinity] rules to the deployment | +| datastore.enableNewDao | bool | `false` | whether to enable the new DAO wrappers for the datastore | | datastore.enabled | bool | `true` | whether to deploy a Datastore | | datastore.extraEnv | list | `[]` | Additional environment variables for Rookout's datastore. A list of name/value maps. | | datastore.extraLabels | object | `{}` | Additional Deployment and Pods extra labels | @@ -125,7 +126,6 @@ helm upgrade --install rookout rookout/rookout-hybrid \ | datastore.serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | datastore.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | | datastore.tolerations | list | `[]` | [Tolerations] for use with node taints | -| datastore.enableNewDao | bool | `false` | Enable new SQL connector and new DAO schema | imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry. Registry secret names as an array. | | rookout.controllerTLSSecretName | string | `""` | Rookout's controller TLS secert used when rookout.serverMode: "TLS" The components expect to find "tls.key" and "tls.crt" keys in the secert | | rookout.datastoreTLSSecretName | string | `""` | Rookout's datastore TLS secert used when rookout.serverMode: "TLS" The components expect to find "tls.key" and "tls.crt" keys in the secert |