[bitnami/spring-cloud-data-flow] Fixes and improvements (#2945)

* Ignore .DS_Store

* Spring Cloud Data Flow chart fixes and improvements:
1) added ability to configure Hibernate dialect
2) fixed issue with locating application.yaml in kubernetes cluster
3) added JDWP support
4) removed MariaDB from database comments, because external database can be PostgreSQL as well
5) fixed some wrong properties (externalDatabase.server -> externalDatabase.dataflow)

* Added changes to values-production.yaml.

* Bumped spring-cloud-dataflow to 0.1.3 version.

* Added hibernateDialect and jdwp variables to README.md.

* Fixed "missing starting space in comment"

* Fixed "java.sql.SQLInvalidAuthorizationSpecException: Access denied for user 'dataflow'@'10.244.0.5' (using password: YES)".

* Bump version to 0.2.0.

* Added support for external RabbitMQ.

* Added externalRabbitmq config to README.
Fixed typo: rabbitmq.rabbitmq -> rabbitmq.auth.

* Fixed config location, use /opt/bitnami/**/conf.
This commit is contained in:
Alexey Zhokhov
2020-07-06 20:52:47 +08:00
committed by GitHub
parent 73fbb1c676
commit f49b5a1ade
13 changed files with 229 additions and 32 deletions

View File

@@ -56,16 +56,20 @@ data:
port: {{ $rsocketPort }}
{{- end }}
{{- end }}
{{- $hibernateDialect := include "scdf.database.hibernate.dialect" . }}
{{- if $hibernateDialect }}
jpa:
properties:
hibernate:
dialect: org.hibernate.dialect.MariaDB102Dialect
dialect: {{ $hibernateDialect }}
{{- end }}
datasource:
{{- $databaseScheme := include "scdf.database.scheme" . }}
{{- $databaseHost := include "scdf.database.host" . }}
{{- $databasePort := include "scdf.database.port" . }}
{{- $databaseName := include "scdf.database.server.name" . }}
url: 'jdbc:{{ $databaseScheme }}://{{ $databaseHost }}:{{ $databasePort }}/{{ $databaseName }}?useMysqlMetadata=true'
{{- $jdbcParameters := include "scdf.database.jdbc.parameters" . }}
url: 'jdbc:{{ $databaseScheme }}://{{ $databaseHost }}:{{ $databasePort }}/{{ $databaseName }}{{ $jdbcParameters }}'
driverClassName: {{ include "scdf.database.driver" . }}
username: {{ include "scdf.database.server.user" . }}
password: ${mariadb-password}

View File

@@ -84,12 +84,12 @@ spec:
value: "8080"
- name: SPRING_CLOUD_CONFIG_ENABLED
value: "false"
- name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API
value: "false"
- name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API
value: "true"
value: "false"
- name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS
value: "/etc/secrets"
- name: SPRING_CLOUD_KUBERNETES_CONFIG_NAME
value: {{ (include "scdf.server.configmapName" .) | quote }}
- name: SPRING_CLOUD_DATAFLOW_SERVER_URI
{{- if ne $serverServicePort 80 }}
value: {{ printf "http://%s-server.%s.svc.%s:%d" $fullname $releaseNamespace $clusterDomain $serverServicePort | quote }}
@@ -122,6 +122,10 @@ spec:
fieldPath: metadata.namespace
- name: KUBERNETES_TRUST_CERTIFICATES
value: {{ ternary "true" "false" .Values.server.configuration.trustK8sCerts | quote }}
{{- if .Values.server.jdwp.enabled }}
- name: JAVA_TOOL_OPTIONS
value: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address={{ .Values.server.jdwp.port }}"
{{- end }}
{{- range $key, $value := .Values.server.extraEnvVars }}
- name: {{ $key }}
value: "{{ $value }}"
@@ -141,6 +145,11 @@ spec:
- name: http
containerPort: 8080
protocol: TCP
{{- if .Values.server.jdwp.enabled }}
- name: jdwp
containerPort: {{ .Values.server.jdwp.port }}
protocol: TCP
{{- end }}
{{- if .Values.server.livenessProbe.enabled }}
livenessProbe:
httpGet:
@@ -174,6 +183,9 @@ spec:
- name: database
mountPath: /etc/secrets/database
readOnly: true
- name: config
mountPath: /opt/bitnami/spring-cloud-dataflow/conf
readOnly: true
{{- if .Values.server.sidecars }}
{{- include "common.tplvalues.render" ( dict "value" .Values.server.sidecars "context" $) | nindent 8 }}
{{- end }}
@@ -181,10 +193,15 @@ spec:
- name: database
secret:
secretName: {{ include "scdf.database.secretName" . }}
- name: config
configMap:
name: {{ include "scdf.server.configmapName" . }}
items:
- key: application.yaml
path: application.yml
{{- if .Values.waitForBackends.enabled }}
- name: scripts
configMap:
name: {{ include "scdf.fullname" . }}-scripts
defaultMode: 0755
{{- end }}