Merge 7b5f248 into 61a6bd0

apache · Jun 17, 2024 · 13905ca · 13905ca
2 parents 61a6bd0 + 7b5f248
commit 13905ca
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 562 deletions.
diff --git a/deploy/kubernetes/dolphinscheduler/README.md b/deploy/kubernetes/dolphinscheduler/README.md
@@ -14,6 +14,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 |-----|------|---------|-------------|
 | alert.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | alert.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| alert.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml |
+| alert.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | alert.enabled | bool | `true` | Enable or disable the Alert-Server component |
 | alert.env.JAVA_OPTS | string | `"-Xms512m -Xmx512m -Xmn256m"` | The jvm options for alert server |
 | alert.livenessProbe | object | `{"enabled":true,"failureThreshold":"3","initialDelaySeconds":"30","periodSeconds":"30","successThreshold":"1","timeoutSeconds":"5"}` | Periodic probe of container liveness. Container will be restarted if the probe fails. More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |
@@ -52,6 +54,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | alert.tolerations | list | `[]` | Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission, effectively unioning the set of nodes tolerated by the pod and the RuntimeClass. |
 | api.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | api.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| api.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-api/src/main/resources/application.yaml |
+| api.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | api.enabled | bool | `true` | Enable or disable the API-Server component |
 | api.env.JAVA_OPTS | string | `"-Xms512m -Xmx512m -Xmn256m"` | The jvm options for api server |
 | api.livenessProbe | object | `{"enabled":true,"failureThreshold":"3","initialDelaySeconds":"30","periodSeconds":"30","successThreshold":"1","timeoutSeconds":"5"}` | Periodic probe of container liveness. Container will be restarted if the probe fails. More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |
@@ -191,6 +195,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | initImage.pullPolicy | string | `"IfNotPresent"` | Image pull policy. Options: Always, Never, IfNotPresent |
 | master.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | master.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| master.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-master/src/main/resources/application.yaml |
+| master.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | master.enabled | bool | `true` | Enable or disable the Master component |
 | master.env.JAVA_OPTS | string | `"-Xms1g -Xmx1g -Xmn512m"` | The jvm options for master server |
 | master.env.MASTER_DISPATCH_TASK_NUM | string | `"3"` | Master dispatch task number per batch |
@@ -297,6 +303,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | timezone | string | `"Asia/Shanghai"` | World time and date for cities in all time zones |
 | worker.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | worker.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| worker.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-worker/src/main/resources/application.yaml |
+| worker.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | worker.enabled | bool | `true` | Enable or disable the Worker component |
 | worker.env.DEFAULT_TENANT_ENABLED | bool | `false` | If set true, will use worker bootstrap user as the tenant to execute task when the tenant is `default`; |
 | worker.env.WORKER_EXEC_THREADS | string | `"100"` | Worker execute thread number to limit task instances |
@@ -315,7 +323,6 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | worker.keda.minReplicaCount | int | `0` | Minimum number of workers created by keda |
 | worker.keda.namespaceLabels | object | `{}` | Keda namespace labels |
 | worker.keda.pollingInterval | int | `5` | How often KEDA polls the DolphinScheduler DB to report new scale requests to the HPA |
-| worker.livenessProbe | object | `{"enabled":true,"failureThreshold":"3","initialDelaySeconds":"30","periodSeconds":"30","successThreshold":"1","timeoutSeconds":"5"}` | Periodic probe of container liveness. Container will be restarted if the probe fails. More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |
 | worker.livenessProbe.enabled | bool | `true` | Turn on and off liveness probe |
 | worker.livenessProbe.failureThreshold | string | `"3"` | Minimum consecutive failures for the probe |
 | worker.livenessProbe.initialDelaySeconds | string | `"30"` | Delay before liveness probe is initiated |

diff --git a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-{{- if and .Values.alert.enabled }}
+{{- if .Values.alert.enableCustomizedConfig }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -23,93 +23,8 @@ metadata:
     app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-alert
     {{- include "dolphinscheduler.alert.labels" . | nindent 4 }}
 data:
-  application.yaml: |
-    spring:
-      profiles:
-        active: {{ .Values.datasource.profile }}
-      jackson:
-        time-zone: UTC
-        date-format: "yyyy-MM-dd HH:mm:ss"
-      banner:
-        charset: UTF-8
-      datasource:
-        driver-class-name: org.postgresql.Driver
-        url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
-        username: root
-        password: root
-        hikari:
-          connection-test-query: select 1
-          pool-name: DolphinScheduler
-    
-    # Mybatis-plus configuration, you don't need to change it
-    mybatis-plus:
-      mapper-locations: classpath:org/apache/dolphinscheduler/dao/mapper/*Mapper.xml
-      type-aliases-package: org.apache.dolphinscheduler.dao.entity
-      configuration:
-        cache-enabled: false
-        call-setters-on-nulls: true
-        map-underscore-to-camel-case: true
-        jdbc-type-for-null: NULL
-      global-config:
-        db-config:
-          id-type: auto
-        banner: false
-    
-    server:
-      port: 50053
-    
-    management:
-      endpoints:
-        web:
-          exposure:
-            include: health,metrics,prometheus
-      endpoint:
-        health:
-          enabled: true
-          show-details: always
-      health:
-        db:
-          enabled: true
-        defaults:
-          enabled: false
-      metrics:
-        tags:
-          application: ${spring.application.name}
-    
-    alert:
-      port: 50052
-      # Mark each alert of alert server if late after x milliseconds as failed.
-      # Define value is (0 = infinite), and alert server would be waiting alert result.
-      wait-timeout: 0
-      max-heartbeat-interval: 60s
-      query_alert_threshold: 100
-    
-    registry:
-      type: zookeeper
-      zookeeper:
-        namespace: dolphinscheduler
-        connect-string: localhost:2181
-        retry-policy:
-          base-sleep-time: 60ms
-          max-sleep: 300ms
-          max-retries: 5
-        session-timeout: 30s
-        connection-timeout: 9s
-        block-until-connected: 600ms
-        digest: ~
-    
-    metrics:
-      enabled: true
-    
-    # Override by profile
-    ---
-    spring:
-      config:
-        activate:
-          on-profile: mysql
-      datasource:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
-        username: root
-        password: root
-{{- end }}
+{{- range $path, $config := .Values.alert.customizedConfig }}
+  {{ $path }}: |
+{{ $config | indent 4 -}}
+{{- end -}}
+{{- end -}}