Skip to content

Commit 7101ee5

Browse files
EamonZhangEamonZhang
committed
megre(addons): megre upstream
2 parents d5c8be9 + 91f8c99 commit 7101ee5

121 files changed

Lines changed: 825 additions & 271 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎addons/flink/1.17/chart/flink/README.md‎

Lines changed: 234 additions & 0 deletions
Large diffs are not rendered by default.

‎addons/flink/1.17/chart/flink/templates/taskmanager/headless-service.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{{- /*
2+
Copyright VMware, Inc.
3+
SPDX-License-Identifier: APACHE-2.0
4+
*/}}
5+
6+
apiVersion: v1
7+
kind: Service
8+
metadata:
9+
name: {{ printf "%s-headless" (include "flink.taskmanager.fullname" .) | trunc 63 | trimSuffix "-" }}
10+
namespace: {{ include "common.names.namespace" . | quote }}
11+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
12+
app.kubernetes.io/part-of: flink
13+
app.kubernetes.io/component: taskmanager
14+
{{- if or .Values.taskmanager.service.annotations .Values.commonAnnotations }}
15+
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.taskmanager.service.annotations .Values.commonAnnotations ) "context" . ) }}
16+
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
17+
{{- end }}
18+
spec:
19+
type: ClusterIP
20+
clusterIP: None
21+
ports:
22+
- name: data
23+
port: {{ .Values.taskmanager.service.ports.data }}
24+
targetPort: {{ .Values.taskmanager.containerPorts.data }}
25+
{{- if and (or (eq .Values.taskmanager.service.type "NodePort") (eq .Values.taskmanager.service.type "LoadBalancer")) (not (empty .Values.taskmanager.service.nodePorts.data)) }}
26+
nodePort: {{ .Values.taskmanager.service.nodePorts.data }}
27+
{{- else if eq .Values.taskmanager.service.type "ClusterIP" }}
28+
nodePort: null
29+
{{- end }}
30+
- name: tcp-rpc
31+
port: {{ .Values.taskmanager.service.ports.rpc }}
32+
targetPort: {{ .Values.taskmanager.containerPorts.rpc }}
33+
{{- if and (or (eq .Values.taskmanager.service.type "NodePort") (eq .Values.taskmanager.service.type "LoadBalancer")) (not (empty .Values.taskmanager.service.nodePorts.rpc)) }}
34+
nodePort: {{ .Values.taskmanager.service.nodePorts.rpc }}
35+
{{- else if eq .Values.taskmanager.service.type "ClusterIP" }}
36+
nodePort: null
37+
{{- end }}
38+
{{- if .Values.taskmanager.service.extraPorts }}
39+
{{- include "common.tplvalues.render" (dict "value" .Values.taskmanager.service.extraPorts "context" $) | nindent 4 }}
40+
{{- end }}
41+
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.taskmanager.podLabels .Values.commonLabels ) "context" . ) }}
42+
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
43+
app.kubernetes.io/part-of: flink
44+
app.kubernetes.io/component: taskmanager

addons/flink/1.17/chart/flink/templates/taskmanager/deployment.yaml renamed to addons/flink/1.17/chart/flink/templates/taskmanager/statefulset.yaml

Lines changed: 64 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{{- /*
2-
Copyright Drycc Community.
2+
Copyright VMware, Inc.
33
SPDX-License-Identifier: APACHE-2.0
44
*/}}
55

6-
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
7-
kind: Deployment
6+
apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
7+
kind: StatefulSet
88
metadata:
99
name: {{ include "flink.taskmanager.fullname" . }}
1010
namespace: {{ include "common.names.namespace" . | quote }}
@@ -15,15 +15,15 @@ metadata:
1515
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
1616
{{- end }}
1717
spec:
18+
replicas: {{ .Values.taskmanager.replicaCount }}
1819
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.taskmanager.podLabels .Values.commonLabels ) "context" . ) }}
1920
selector:
2021
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
2122
app.kubernetes.io/part-of: flink
2223
app.kubernetes.io/component: taskmanager
23-
replicas: {{ .Values.taskmanager.replicaCount }}
24-
{{- if .Values.taskmanager.updateStrategy }}
25-
strategy: {{- toYaml .Values.taskmanager.updateStrategy | nindent 4 }}
26-
{{- end }}
24+
podManagementPolicy: {{ .Values.taskmanager.podManagementPolicy }}
25+
serviceName: {{ printf "%s-headless" (include "flink.taskmanager.fullname" .) | trunc 63 | trimSuffix "-" }}
26+
updateStrategy: {{- toYaml .Values.taskmanager.updateStrategy | nindent 4 }}
2727
template:
2828
metadata:
2929
labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
@@ -72,7 +72,7 @@ spec:
7272
image: {{ include "flink.image" . }}
7373
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
7474
{{- if .Values.taskmanager.containerSecurityContext.enabled }}
75-
securityContext: {{- omit .Values.taskmanager.containerSecurityContext "enabled" | toYaml | nindent 12 }}
75+
securityContext: {{- omit .Values.taskmanager.podSecurityContext "enabled" | toYaml | nindent 12 }}
7676
{{- end }}
7777
{{- if .Values.diagnosticMode.enabled }}
7878
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
@@ -93,6 +93,10 @@ spec:
9393
- name: tcp-rpc
9494
containerPort: {{ .Values.taskmanager.containerPorts.rpc }}
9595
env:
96+
- name: MY_POD_NAME
97+
valueFrom:
98+
fieldRef:
99+
fieldPath: metadata.name
96100
- name: FLINK_MODE
97101
value: taskmanager
98102
# Hosts and addresses are determined by the service full name, which maps to flink.*§.fullname
@@ -104,8 +108,15 @@ spec:
104108
value: 0.0.0.0
105109
- name: FLINK_CFG_TASKMANAGER_RPC_PORT
106110
value: {{ .Values.taskmanager.containerPorts.rpc | quote }}
111+
{{- $releaseNamespace := include "common.names.namespace" . }}
112+
{{- $headlessServiceName := printf "%s-headless" (include "flink.taskmanager.fullname" .) | trunc 63 | trimSuffix "-" }}
113+
{{- $clusterDomain := .Values.clusterDomain }}
114+
- name: FLINK_CFG_TASKMANAGER_HOST
115+
value: "$(MY_POD_NAME).{{ $headlessServiceName }}.{{ $releaseNamespace }}.svc.{{ $clusterDomain }}"
107116
- name: FLINK_CFG_TASKMANAGER_BIND__HOST
108117
value: 0.0.0.0
118+
- name: FLINK_CFG_PROCESS_TASKMANAGER_WORKING__DIR
119+
value: /data
109120
- name: DRYCC_DEBUG
110121
value: {{ ternary "true" "false" .Values.image.debug | quote }}
111122
{{- if .Values.taskmanager.extraEnvVars }}
@@ -146,13 +157,53 @@ spec:
146157
{{- if .Values.taskmanager.resources }}
147158
resources: {{- toYaml .Values.taskmanager.resources | nindent 12 }}
148159
{{- end }}
149-
{{- if .Values.taskmanager.extraVolumeMounts }}
150-
volumeMounts: {{- include "common.tplvalues.render" ( dict "value" .Values.taskmanager.extraVolumeMounts "context" $) | nindent 12 }}
151-
{{- end }}
160+
volumeMounts:
161+
- name: data
162+
mountPath: /data
163+
{{- if .Values.taskmanager.extraVolumeMounts }}
164+
{{- include "common.tplvalues.render" ( dict "value" .Values.taskmanager.extraVolumeMounts "context" $) | nindent 12 }}
165+
{{- end }}
152166
{{- if .Values.taskmanager.sidecars }}
153167
{{- include "common.tplvalues.render" ( dict "value" .Values.taskmanager.sidecars "context" $) | nindent 8 }}
154168
{{- end }}
155169
volumes:
156-
{{- if .Values.taskmanager.extraVolumes }}
157-
{{- include "common.tplvalues.render" ( dict "value" .Values.taskmanager.extraVolumes "context" $) | nindent 8 }}
170+
{{- if not .Values.taskmanager.persistence.enabled }}
171+
- name: "data"
172+
emptyDir: {}
173+
{{- else if .Values.taskmanager.persistence.existingClaim }}
174+
- name: "data"
175+
persistentVolumeClaim:
176+
claimName: {{ .Values.taskmanager.persistence.existingClaim }}
177+
{{- else }}
178+
{{- if .Values.taskmanager.persistentVolumeClaimRetentionPolicy.enabled }}
179+
persistentVolumeClaimRetentionPolicy:
180+
whenDeleted: {{ .Values.taskmanager.persistentVolumeClaimRetentionPolicy.whenDeleted }}
181+
whenScaled: {{ .Values.taskmanager.persistentVolumeClaimRetentionPolicy.whenScaled }}
182+
{{- end }}
183+
volumeClaimTemplates:
184+
- metadata:
185+
name: "data"
186+
{{- if or .Values.taskmanager.persistence.annotations .Values.commonAnnotations }}
187+
{{- $claimAnnotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.taskmanager.persistence.annotations .Values.commonAnnotations ) "context" . ) }}
188+
annotations: {{- include "common.tplvalues.render" ( dict "value" $claimAnnotations "context" $) | nindent 4 }}
189+
{{- end }}
190+
{{- if .Values.commonLabels }}
191+
labels: {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 10 }}
158192
{{- end }}
193+
spec:
194+
accessModes:
195+
{{- range .Values.taskmanager.persistence.accessModes }}
196+
- {{ . | quote }}
197+
{{- end }}
198+
resources:
199+
requests:
200+
storage: {{ .Values.taskmanager.persistence.size | quote }}
201+
{{- if .Values.taskmanager.persistence.selector }}
202+
selector: {{- include "common.tplvalues.render" (dict "value" .Values.taskmanager.persistence.selector "context" $) | nindent 10 }}
203+
{{- else if .Values.taskmanager.persistence.existingVolume }}
204+
selector:
205+
matchLabels:
206+
volume: {{ .Values.taskmanager.persistence.existingVolume }}
207+
{{- end }}
208+
{{- include "common.storage.class" (dict "persistence" .Values.taskmanager.persistence "global" .Values.global) | nindent 8 }}
209+
{{- end }}

‎addons/flink/1.17/chart/flink/values.yaml‎

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ commonLabels: {}
3838
## @param commonAnnotations Annotations to add to all deployed objects
3939
##
4040
commonAnnotations: {}
41+
## @param clusterDomain Default Kubernetes cluster domain
42+
##
43+
clusterDomain: cluster.local
4144
## @param extraDeploy Array of extra objects to deploy with the release
4245
##
4346
extraDeploy: []
@@ -821,9 +824,13 @@ taskmanager:
821824
## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
822825
##
823826
schedulerName: ""
824-
## @param taskmanager.updateStrategy.type Apache Flink taskmanager deployment strategy type
825-
## @param taskmanager.updateStrategy.rollingUpdate Apache Flink taskmanager deployment rolling update configuration parameters
826-
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
827+
## @param taskmanager.podManagementPolicy Pod management policy for the Apache Flink taskmanager statefulset
828+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies
829+
##
830+
podManagementPolicy: Parallel
831+
## @param taskmanager.updateStrategy.type Apache Flink taskmanager statefulset strategy type
832+
## @param taskmanager.updateStrategy.rollingUpdate [object,nullable] Apache Flink taskmanager statefulset rolling update configuration parameters
833+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
827834
##
828835
updateStrategy:
829836
type: RollingUpdate
@@ -837,3 +844,52 @@ taskmanager:
837844
## @param taskmanager.sidecars Add additional sidecar containers to the flink pods
838845
##
839846
sidecars: []
847+
## Enable persistence using Persistent Volume Claims
848+
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
849+
##
850+
persistence:
851+
## @param taskmanager.persistence.enabled Enable persistence using a `PersistentVolumeClaim`
852+
##
853+
enabled: false
854+
## @param taskmanager.persistence.storageClass Persistent Volume Storage Class
855+
## If defined, storageClassName: <storageClass>
856+
## If set to "-", storageClassName: "", which disables dynamic provisioning
857+
## If undefined (the default) or set to null, no storageClassName spec is
858+
## set, choosing the default provisioner. (gp2 on AWS, standard on
859+
## GKE, AWS & OpenStack)
860+
##
861+
storageClass: ""
862+
## @param taskmanager.persistence.existingClaim Existing Persistent Volume Claim
863+
## then accept the value as an existing Persistent Volume Claim to which
864+
## the container should be bound
865+
##
866+
existingClaim: ""
867+
## @param taskmanager.persistence.existingVolume Existing Persistent Volume for use as volume match label selector to the `volumeClaimTemplate`. Ignored when `taskmanager.persistence.selector` is set.
868+
##
869+
existingVolume: ""
870+
## @param taskmanager.persistence.selector Configure custom selector for existing Persistent Volume. Overwrites `taskmanager.persistence.existingVolume`
871+
## selector:
872+
## matchLabels:
873+
## volume:
874+
##
875+
selector: {}
876+
## @param taskmanager.persistence.annotations Persistent Volume Claim annotations
877+
##
878+
annotations: {}
879+
## @param taskmanager.persistence.accessModes Persistent Volume Access Modes
880+
##
881+
accessModes:
882+
- ReadWriteOnce
883+
## @param taskmanager.persistence.size Persistent Volume Size
884+
##
885+
size: 8Gi
886+
## persistentVolumeClaimRetentionPolicy
887+
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention
888+
## @param taskmanager.persistentVolumeClaimRetentionPolicy.enabled Controls if and how PVCs are deleted during the lifecycle of a StatefulSet
889+
## @param taskmanager.persistentVolumeClaimRetentionPolicy.whenScaled Volume retention behavior when the replica count of the StatefulSet is reduced
890+
## @param taskmanager.persistentVolumeClaimRetentionPolicy.whenDeleted Volume retention behavior that applies when the StatefulSet is deleted
891+
##
892+
persistentVolumeClaimRetentionPolicy:
893+
enabled: true
894+
whenScaled: Delete
895+
whenDeleted: Delete

‎addons/flink/1.17/meta.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: flink
2-
version: 1
2+
version: 1.17
33
id: 9ce3c3ba-33b5-4e4e-a5e9-a338a83d5070
44
description: "flink"
55
displayName: "flink"
@@ -18,10 +18,16 @@ allow_parameters:
1818
- name: "jobmanager.service.type"
1919
required: false
2020
description: "jobmanager service type config for values.yaml"
21+
- name: "jobmanager.extraEnvVars"
22+
required: false
23+
description: "jobmanager extraEnvVars config for values.yaml"
2124
- name: "taskmanager.service.type"
2225
required: false
2326
description: "taskmanager service type config for values.yaml"
2427
- name: "taskmanager.extraEnvVars"
2528
required: false
2629
description: "taskmanager extraEnvVars config for values.yaml"
30+
- name: "taskmanager.persistence.size"
31+
required: false
32+
description: "taskmanager persistence size config for values.yaml"
2733
archive: false

‎addons/flink/1.17/plans/standard-2c4g/values.yaml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobmanager:
1818
cpu: 2
1919
memory: 4Gi
2020
requests:
21-
cpu: 200m
21+
cpu: 1
2222
memory: 2Gi
2323
## Apache Flink jobmanager.service parameters
2424
##
2525
service:
2626
## @param jobmanager.service.type Apache Flink service type
2727
##
28-
type: LoadBalancer
28+
type: ClusterIP
2929
## @section TaskManager deployment parameters
3030
##
3131

@@ -43,10 +43,20 @@ taskmanager:
4343
cpu: 2
4444
memory: 4Gi
4545
requests:
46-
cpu: 200m
46+
cpu: 1
4747
memory: 2Gi
4848
## @param taskmanager.extraEnvVars Extra environment variables to be set on flink container
4949
extraEnvVars:
5050
# taskmanager.numberOfTaskSlots
5151
- name: FLINK_TASK_MANAGER_NUMBER_OF_TASK_SLOTS
52-
value: "2"
52+
value: "2"
53+
## Enable persistence using Persistent Volume Claims
54+
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
55+
##
56+
persistence:
57+
## @param taskmanager.persistence.enabled Enable persistence using a `PersistentVolumeClaim`
58+
##
59+
enabled: true
60+
## @param taskmanager.persistence.size Persistent Volume Size
61+
##
62+
size: 8Gi

‎addons/flink/1.17/plans/standard-4c8g/values.yaml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobmanager:
1818
cpu: 4
1919
memory: 8Gi
2020
requests:
21-
cpu: 400m
22-
memory: 8Gi
21+
cpu: 2
22+
memory: 4Gi
2323
## Apache Flink jobmanager.service parameters
2424
##
2525
service:
@@ -43,10 +43,20 @@ taskmanager:
4343
cpu: 4
4444
memory: 8Gi
4545
requests:
46-
cpu: 400m
47-
memory: 8Gi
46+
cpu: 2
47+
memory: 4Gi
4848
## @param taskmanager.extraEnvVars Extra environment variables to be set on flink container
4949
extraEnvVars:
5050
# taskmanager.numberOfTaskSlots
5151
- name: FLINK_TASK_MANAGER_NUMBER_OF_TASK_SLOTS
5252
value: "4"
53+
## Enable persistence using Persistent Volume Claims
54+
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
55+
##
56+
persistence:
57+
## @param taskmanager.persistence.enabled Enable persistence using a `PersistentVolumeClaim`
58+
##
59+
enabled: true
60+
## @param taskmanager.persistence.size Persistent Volume Size
61+
##
62+
size: 8Gi

‎addons/kafka/3.6/chart/kafka/templates/metrics/deployment.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
command: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.kafka.command "context" $) | nindent 12 }}
8484
{{- else }}
8585
command:
86+
- init-stack
8687
- bash
8788
{{- end }}
8889
{{- if .Values.diagnosticMode.enabled }}

‎addons/kafka/3.6/meta.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ allow_parameters:
2121
- name: "service.type"
2222
required: false
2323
description: "service type config for values.yaml"
24-
- name: "metrics.kafka.enable"
24+
- name: "metrics.kafka.enabled"
2525
required: false
26-
description: "metrics kafka enable or not config for values.yaml"
26+
description: "metrics kafka enabled or not config for values.yaml"
2727
archive: false

‎addons/kafka/3.6/plans/standard-1024/meta.yaml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)