From f3400eecb2f39db9aec724fdd61cb279b4c9e6d3 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Tue, 29 Apr 2025 15:57:28 +0200 Subject: [PATCH] [bitnami/spring-cloud-dataflow] Major 37.0.0: Upgrade MariaDB to 11.4.x (#33243) * [bitnami/spring-cloud-dataflow] Major 37.0.0: Upgrade MariaDB to 11.4.x Signed-off-by: Miguel Ruiz * Update CHANGELOG.md Signed-off-by: Bitnami Bot * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Bot * Set database dialect to support MariaDB 11 Signed-off-by: Miguel Ruiz * Update server config Signed-off-by: Miguel Ruiz --------- Signed-off-by: Miguel Ruiz Signed-off-by: Bitnami Bot Co-authored-by: Bitnami Bot --- bitnami/spring-cloud-dataflow/CHANGELOG.md | 8 ++- bitnami/spring-cloud-dataflow/Chart.yaml | 4 +- bitnami/spring-cloud-dataflow/README.md | 71 ++++++++++--------- .../spring-cloud-dataflow/templates/NOTES.txt | 4 +- .../templates/_helpers.tpl | 11 +++ .../templates/server/configmap.yaml | 4 +- .../templates/skipper/configmap.yaml | 4 +- bitnami/spring-cloud-dataflow/values.yaml | 11 --- 8 files changed, 58 insertions(+), 59 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/CHANGELOG.md b/bitnami/spring-cloud-dataflow/CHANGELOG.md index 2be449484d..06e63d1b8a 100644 --- a/bitnami/spring-cloud-dataflow/CHANGELOG.md +++ b/bitnami/spring-cloud-dataflow/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 36.0.1 (2025-04-28) +## 37.0.0 (2025-04-29) -* [bitnami/spring-cloud-dataflow] Release 36.0.1 ([#33218](https://github.com/bitnami/charts/pull/33218)) +* [bitnami/spring-cloud-dataflow] Major 37.0.0: Upgrade MariaDB to 11.4.x ([#33243](https://github.com/bitnami/charts/pull/33243)) + +## 36.0.1 (2025-04-28) + +* [bitnami/spring-cloud-dataflow] Release 36.0.1 (#33218) ([d265ecd](https://github.com/bitnami/charts/commit/d265ecdbb29ca6418a4c54e144ba9870eac1a4c1)), closes [#33218](https://github.com/bitnami/charts/issues/33218) ## 36.0.0 (2025-04-24) diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml index fe880fca26..50e78454ae 100644 --- a/bitnami/spring-cloud-dataflow/Chart.yaml +++ b/bitnami/spring-cloud-dataflow/Chart.yaml @@ -8,8 +8,6 @@ annotations: images: | - name: kubectl image: docker.io/bitnami/kubectl:1.33.0-debian-12-r0 - - name: mariadb - image: docker.io/bitnami/mariadb:10.11.11-debian-12-r11 - name: prometheus-rsocket-proxy image: docker.io/bitnami/prometheus-rsocket-proxy:1.5.3-debian-12-r43 - name: spring-cloud-dataflow @@ -54,4 +52,4 @@ maintainers: name: spring-cloud-dataflow sources: - https://github.com/bitnami/charts/tree/main/bitnami/spring-cloud-dataflow -version: 36.0.1 +version: 37.0.0 diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md index a9fcd88df1..dafa76a87d 100644 --- a/bitnami/spring-cloud-dataflow/README.md +++ b/bitnami/spring-cloud-dataflow/README.md @@ -699,40 +699,37 @@ As an alternative, you can use the preset configurations for pod affinity, pod a ### Database parameters -| Name | Description | Value | -| ----------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- | -| `mariadb.enabled` | Enable/disable MariaDB chart installation | `true` | -| `mariadb.jdbcParameter.useMysqlMetadata` | Use MariaDB useMysqlMetadata parameter. | `true` | -| `mariadb.image.registry` | MariaDB image registry | `REGISTRY_NAME` | -| `mariadb.image.repository` | MariaDB image repository | `REPOSITORY_NAME/mariadb` | -| `mariadb.image.digest` | MariaDB image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `mariadb.architecture` | MariaDB architecture. Allowed values: `standalone` or `replication` | `standalone` | -| `mariadb.auth.rootPassword` | Password for the MariaDB `root` user | `""` | -| `mariadb.auth.username` | Username of new user to create | `dataflow` | -| `mariadb.auth.password` | Password for the new user | `change-me` | -| `mariadb.auth.database` | Database name to create | `dataflow` | -| `mariadb.auth.forcePassword` | Force users to specify required passwords in the database | `false` | -| `mariadb.initdbScripts` | Specify dictionary of scripts to be run at first boot | `{}` | -| `mariadb.primary.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if primary.resources is set (primary.resources is recommended for production). | `micro` | -| `mariadb.primary.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` | -| `flyway.enabled` | Enable/disable flyway running Dataflow and Skipper Database creation scripts on startup | `true` | -| `externalDatabase.host` | Host of the external database | `localhost` | -| `externalDatabase.port` | External database port number | `3306` | -| `externalDatabase.driver` | The fully qualified name of the JDBC Driver class | `""` | -| `externalDatabase.scheme` | The scheme is a vendor-specific or shared protocol string that follows the "jdbc:" of the URL | `""` | -| `externalDatabase.hibernateDialect` | Hibernate Dialect used by Dataflow/Skipper servers | `""` | -| `externalDatabase.dataflow.url` | JDBC URL for dataflow server. Overrides external scheme, host, port, password, and dataflow.database parameters. | `""` | -| `externalDatabase.dataflow.database` | Name of the existing database to be used by Dataflow server. Ignored if url is provided | `dataflow` | -| `externalDatabase.dataflow.username` | Existing username in the external db to be used by Dataflow server | `dataflow` | -| `externalDatabase.dataflow.password` | Password for the above username. Ignored if existing secret is provided | `""` | -| `externalDatabase.dataflow.existingSecret` | Name of the existing secret containing database credentials for Dataflow server | `""` | -| `externalDatabase.dataflow.existingSecretPasswordKey` | Key of the above existing secret with database password, defaults to `datasource-password` | `""` | -| `externalDatabase.skipper.url` | JDBC URL for skipper. Overrides external scheme, host, port, database, and skipper.database parameters. | `""` | -| `externalDatabase.skipper.database` | Name of the existing database to be used by Skipper server. Ignored if url is provided | `skipper` | -| `externalDatabase.skipper.username` | Existing username in the external db to be used by Skipper server | `skipper` | -| `externalDatabase.skipper.password` | Password for the above username. Ignored if existing secret is provided | `""` | -| `externalDatabase.skipper.existingSecret` | Name of the existing secret containing database credentials for Skipper server | `""` | -| `externalDatabase.skipper.existingSecretPasswordKey` | Key of the above existing secret with database password, defaults to `datasource-password` | `""` | +| Name | Description | Value | +| ----------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | +| `mariadb.enabled` | Enable/disable MariaDB chart installation | `true` | +| `mariadb.jdbcParameter.useMysqlMetadata` | Use MariaDB useMysqlMetadata parameter. | `true` | +| `mariadb.architecture` | MariaDB architecture. Allowed values: `standalone` or `replication` | `standalone` | +| `mariadb.auth.rootPassword` | Password for the MariaDB `root` user | `""` | +| `mariadb.auth.username` | Username of new user to create | `dataflow` | +| `mariadb.auth.password` | Password for the new user | `change-me` | +| `mariadb.auth.database` | Database name to create | `dataflow` | +| `mariadb.auth.forcePassword` | Force users to specify required passwords in the database | `false` | +| `mariadb.initdbScripts` | Specify dictionary of scripts to be run at first boot | `{}` | +| `mariadb.primary.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if primary.resources is set (primary.resources is recommended for production). | `micro` | +| `mariadb.primary.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` | +| `flyway.enabled` | Enable/disable flyway running Dataflow and Skipper Database creation scripts on startup | `true` | +| `externalDatabase.host` | Host of the external database | `localhost` | +| `externalDatabase.port` | External database port number | `3306` | +| `externalDatabase.driver` | The fully qualified name of the JDBC Driver class | `""` | +| `externalDatabase.scheme` | The scheme is a vendor-specific or shared protocol string that follows the "jdbc:" of the URL | `""` | +| `externalDatabase.hibernateDialect` | Hibernate Dialect used by Dataflow/Skipper servers | `""` | +| `externalDatabase.dataflow.url` | JDBC URL for dataflow server. Overrides external scheme, host, port, password, and dataflow.database parameters. | `""` | +| `externalDatabase.dataflow.database` | Name of the existing database to be used by Dataflow server. Ignored if url is provided | `dataflow` | +| `externalDatabase.dataflow.username` | Existing username in the external db to be used by Dataflow server | `dataflow` | +| `externalDatabase.dataflow.password` | Password for the above username. Ignored if existing secret is provided | `""` | +| `externalDatabase.dataflow.existingSecret` | Name of the existing secret containing database credentials for Dataflow server | `""` | +| `externalDatabase.dataflow.existingSecretPasswordKey` | Key of the above existing secret with database password, defaults to `datasource-password` | `""` | +| `externalDatabase.skipper.url` | JDBC URL for skipper. Overrides external scheme, host, port, database, and skipper.database parameters. | `""` | +| `externalDatabase.skipper.database` | Name of the existing database to be used by Skipper server. Ignored if url is provided | `skipper` | +| `externalDatabase.skipper.username` | Existing username in the external db to be used by Skipper server | `skipper` | +| `externalDatabase.skipper.password` | Password for the above username. Ignored if existing secret is provided | `""` | +| `externalDatabase.skipper.existingSecret` | Name of the existing secret containing database credentials for Skipper server | `""` | +| `externalDatabase.skipper.existingSecretPasswordKey` | Key of the above existing secret with database password, defaults to `datasource-password` | `""` | ### RabbitMQ chart parameters @@ -789,6 +786,10 @@ Find more information about how to deal with common errors related to Bitnami He ## Upgrading +### To 37.0.0 + +This version uses the MariaDB version provided by the bitnami/mariadb subchart, PostgreSQL 11.4.x, instead of overriding it with version 10.11.x. + ### To 36.0.0 This major updates the RabbitMQ subchart to its newest major, 16.0.0. For more information on this subchart's major, please refer to [RabbitMQ upgrade notes](https://www.rabbitmq.com/docs/4.1/upgrade). @@ -1071,4 +1072,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff --git a/bitnami/spring-cloud-dataflow/templates/NOTES.txt b/bitnami/spring-cloud-dataflow/templates/NOTES.txt index 9076579393..6b2c920b8c 100644 --- a/bitnami/spring-cloud-dataflow/templates/NOTES.txt +++ b/bitnami/spring-cloud-dataflow/templates/NOTES.txt @@ -119,5 +119,5 @@ WARNING: Review values for the following password in the command, if they are co {{- end -}} {{- end -}} {{- include "common.warnings.resources" (dict "sections" (list "deployer" "metrics" "server" "skipper" "waitForBackends") "context" $) }} -{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.server.image .Values.server.composedTaskRunner.image .Values.skipper.image .Values.metrics.image .Values.waitForBackends.image .Values.mariadb.image) "context" $) }} -{{- include "common.errors.insecureImages" (dict "images" (list .Values.server.image .Values.server.composedTaskRunner.image .Values.skipper.image .Values.metrics.image .Values.waitForBackends.image .Values.mariadb.image) "context" $) }} +{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.server.image .Values.server.composedTaskRunner.image .Values.skipper.image .Values.metrics.image .Values.waitForBackends.image) "context" $) }} +{{- include "common.errors.insecureImages" (dict "images" (list .Values.server.image .Values.server.composedTaskRunner.image .Values.skipper.image .Values.metrics.image .Values.waitForBackends.image) "context" $) }} diff --git a/bitnami/spring-cloud-dataflow/templates/_helpers.tpl b/bitnami/spring-cloud-dataflow/templates/_helpers.tpl index 118741376c..031783e4ef 100644 --- a/bitnami/spring-cloud-dataflow/templates/_helpers.tpl +++ b/bitnami/spring-cloud-dataflow/templates/_helpers.tpl @@ -193,6 +193,17 @@ Return the database driver {{- end -}} {{- end -}} +{{/* +Return the database dialect +*/}} +{{- define "scdf.database.dialect" -}} + {{- if .Values.mariadb.enabled -}} + {{- printf "org.hibernate.dialect.MariaDB106Dialect" -}} + {{- else -}} + {{- .Values.externalDatabase.hibernateDialect -}} + {{- end -}} +{{- end -}} + {{/* Return the database scheme */}} diff --git a/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml b/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml index cc0bd667d1..9bf744b466 100644 --- a/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml +++ b/bitnami/spring-cloud-dataflow/templates/server/configmap.yaml @@ -103,12 +103,10 @@ data: {{- end }} task: closecontextEnabled: true - {{- if .Values.externalDatabase.hibernateDialect }} jpa: properties: hibernate: - dialect: {{- printf "%s" .Values.externalDatabase.hibernateDialect -}} - {{- end }} + dialect: {{ include "scdf.database.dialect" . }} datasource: url: '{{ include "scdf.database.dataflow.url" . }}' driverClassName: {{ include "scdf.database.driver" . }} diff --git a/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml b/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml index cbe7b3e19a..9a0635413f 100644 --- a/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml +++ b/bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml @@ -117,12 +117,10 @@ data: {{- if .Values.deployer.imagePullPolicy }} imagePullPolicy: {{ .Values.deployer.imagePullPolicy }} {{- end }} - {{- if .Values.externalDatabase.hibernateDialect }} jpa: properties: hibernate: - dialect: {{- printf "%s" .Values.externalDatabase.hibernateDialect -}} - {{- end }} + dialect: {{ include "scdf.database.dialect" . }} datasource: url: '{{ include "scdf.database.skipper.url" . }}' driverClassName: {{ include "scdf.database.driver" . }} diff --git a/bitnami/spring-cloud-dataflow/values.yaml b/bitnami/spring-cloud-dataflow/values.yaml index f1a0a7fd28..07fc5a14e8 100644 --- a/bitnami/spring-cloud-dataflow/values.yaml +++ b/bitnami/spring-cloud-dataflow/values.yaml @@ -1816,17 +1816,6 @@ mariadb: jdbcParameter: ## @param mariadb.jdbcParameter.useMysqlMetadata Use MariaDB useMysqlMetadata parameter. useMysqlMetadata: true - ## ref: https://github.com/bitnami/containers/tree/main/bitnami/mariadb - ## @param mariadb.image.registry [default: REGISTRY_NAME] MariaDB image registry - ## @param mariadb.image.repository [default: REPOSITORY_NAME/mariadb] MariaDB image repository - ## @skip mariadb.image.tag MariaDB image tag (immutable tags are recommended) - ## @param mariadb.image.digest MariaDB image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag - ## - image: - registry: docker.io - repository: bitnami/mariadb - tag: 10.11.11-debian-12-r11 - digest: "" ## @param mariadb.architecture MariaDB architecture. Allowed values: `standalone` or `replication` ## architecture: standalone