Skip to content

Commit 634ce06

Browse files
nickcaballeronickcaballero
authored
Update Helm chart with latest from config/default (#500)
1 parent 8f1a784 commit 634ce06

File tree

8 files changed

+391
-339
lines changed

8 files changed

+391
-339
lines changed

‎helm-chart/flink-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
name: flink-operator
33
appVersion: "1.0"
44
description: A Helm chart for flink on Kubernetes operator
5-
version: "0.2.3"
5+
version: "0.2.4"
66
keywords:
77
- flink
88
home: https://github.com/spotify/flink-on-k8s-operator

‎helm-chart/flink-operator/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ The instructions to install the Flink operator chart:
99
1. Prepare a Flink operator image. You can either use a released image e.g., `ghcr.io/spotify/flink-operator:latest` or follow the instructions [here](https://github.com/spotify/flink-on-k8s-operator/blob/master/docs/developer_guide.md#build-and-push-the-operator-image) to build and push an image from the source code.
1010

1111
2. Run the bash script `update_template.sh` to update the manifest files in templates from the Flink operator source repo (This step is only required if you want to install from the local chart repo).
12-
You can set the following env vars to customize the script's behaviour -
13-
* `export IMG=<image-name>` - Operator image, defaults to `flink-operator:latest`
14-
* `export NS=<namespace-name>` - Namespace to install the operator in, defaults to `flink-operator-system`
1512

1613
3. Register CRD - Don't manually register CRD unless helm install below fails (You can skip this step if your helm version is v3).
1714

‎helm-chart/flink-operator/templates/flink-cluster-crd.yaml

Lines changed: 120 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
api-approved.kubernetes.io: unapproved
6+
cert-manager.io/inject-ca-from: {{ .Values.flinkOperatorNamespace.name }}/flink-operator-serving-cert
67
controller-gen.kubebuilder.io/version: v0.6.2
78
name: flinkclusters.flinkoperator.k8s.io
89
spec:
@@ -165,13 +166,15 @@ spec:
165166
configMapName:
166167
type: string
167168
mountPath:
169+
default: /etc/hadoop/conf
168170
type: string
169171
type: object
170172
image:
171173
properties:
172174
name:
173175
type: string
174176
pullPolicy:
177+
default: Always
175178
type: string
176179
pullSecrets:
177180
items:
@@ -186,6 +189,7 @@ spec:
186189
job:
187190
properties:
188191
allowNonRestoredState:
192+
default: false
189193
type: boolean
190194
args:
191195
items:
@@ -198,7 +202,15 @@ spec:
198202
type: boolean
199203
className:
200204
type: string
205+
classPath:
206+
items:
207+
type: string
208+
type: array
201209
cleanupPolicy:
210+
default:
211+
afterJobCancelled: DeleteCluster
212+
afterJobFails: KeepCluster
213+
afterJobSucceeds: DeleteCluster
202214
properties:
203215
afterJobCancelled:
204216
type: string
@@ -209,6 +221,17 @@ spec:
209221
type: object
210222
fromSavepoint:
211223
type: string
224+
hostAliases:
225+
items:
226+
properties:
227+
hostnames:
228+
items:
229+
type: string
230+
type: array
231+
ip:
232+
type: string
233+
type: object
234+
type: array
212235
initContainers:
213236
items:
214237
properties:
@@ -803,14 +826,21 @@ spec:
803826
minimum: 0
804827
type: integer
805828
mode:
829+
default: Detached
830+
enum:
831+
- Detached
832+
- Blocking
833+
- Application
806834
type: string
807835
noLoggingToStdout:
836+
default: false
808837
type: boolean
809838
nodeSelector:
810839
additionalProperties:
811840
type: string
812841
type: object
813842
parallelism:
843+
default: 1
814844
format: int32
815845
type: integer
816846
podAnnotations:
@@ -828,6 +858,13 @@ spec:
828858
pyModule:
829859
type: string
830860
resources:
861+
default:
862+
limits:
863+
cpu: 2
864+
memory: 2Gi
865+
requests:
866+
cpu: 200m
867+
memory: 512Mi
831868
properties:
832869
limits:
833870
additionalProperties:
@@ -847,6 +884,7 @@ spec:
847884
type: object
848885
type: object
849886
restartPolicy:
887+
default: Never
850888
type: string
851889
savepointGeneration:
852890
format: int32
@@ -935,17 +973,6 @@ spec:
935973
type: string
936974
type: object
937975
type: array
938-
hostAliases:
939-
items:
940-
properties:
941-
ip:
942-
type: string
943-
hostnames:
944-
items:
945-
type: string
946-
type: array
947-
type: object
948-
type: array
949976
volumeMounts:
950977
items:
951978
properties:
@@ -1663,13 +1690,11 @@ spec:
16631690
- name
16641691
type: object
16651692
type: array
1666-
required:
1667-
- restartPolicy
16681693
type: object
16691694
jobManager:
1695+
default:
1696+
replicas: 1
16701697
properties:
1671-
accessScope:
1672-
type: string
16731698
ServiceAnnotations:
16741699
additionalProperties:
16751700
type: string
@@ -1678,6 +1703,9 @@ spec:
16781703
additionalProperties:
16791704
type: string
16801705
type: object
1706+
accessScope:
1707+
default: Cluster
1708+
type: string
16811709
extraPorts:
16821710
items:
16831711
properties:
@@ -1698,6 +1726,17 @@ spec:
16981726
- containerPort
16991727
type: object
17001728
type: array
1729+
hostAliases:
1730+
items:
1731+
properties:
1732+
hostnames:
1733+
items:
1734+
type: string
1735+
type: array
1736+
ip:
1737+
type: string
1738+
type: object
1739+
type: array
17011740
ingress:
17021741
properties:
17031742
annotations:
@@ -1709,6 +1748,7 @@ spec:
17091748
tlsSecretName:
17101749
type: string
17111750
useTls:
1751+
default: false
17121752
type: boolean
17131753
type: object
17141754
initContainers:
@@ -2401,18 +2441,35 @@ spec:
24012441
type: string
24022442
type: object
24032443
ports:
2444+
default:
2445+
blob: 6124
2446+
query: 6125
2447+
rpc: 6123
2448+
ui: 8081
24042449
properties:
24052450
blob:
2451+
default: 6124
24062452
format: int32
2453+
maximum: 65535
2454+
minimum: 1
24072455
type: integer
24082456
query:
2457+
default: 6125
24092458
format: int32
2459+
maximum: 65535
2460+
minimum: 1
24102461
type: integer
24112462
rpc:
2463+
default: 6123
24122464
format: int32
2465+
maximum: 65535
2466+
minimum: 1
24132467
type: integer
24142468
ui:
2469+
default: 8081
24152470
format: int32
2471+
maximum: 65535
2472+
minimum: 1
24162473
type: integer
24172474
type: object
24182475
readinessProbe:
@@ -2494,9 +2551,17 @@ spec:
24942551
type: integer
24952552
type: object
24962553
replicas:
2554+
default: 1
24972555
format: int32
24982556
type: integer
24992557
resources:
2558+
default:
2559+
limits:
2560+
cpu: 2
2561+
memory: 2Gi
2562+
requests:
2563+
cpu: 200m
2564+
memory: 512Mi
25002565
properties:
25012566
limits:
25022567
additionalProperties:
@@ -3182,17 +3247,6 @@ spec:
31823247
type: string
31833248
type: object
31843249
type: array
3185-
hostAliases:
3186-
items:
3187-
properties:
3188-
ip:
3189-
type: string
3190-
hostnames:
3191-
items:
3192-
type: string
3193-
type: array
3194-
type: object
3195-
type: array
31963250
volumeClaimTemplates:
31973251
items:
31983252
properties:
@@ -4072,16 +4126,20 @@ spec:
40724126
type: string
40734127
type: object
40744128
recreateOnUpdate:
4129+
default: true
40754130
type: boolean
40764131
revisionHistoryLimit:
40774132
format: int32
40784133
type: integer
40794134
serviceAccountName:
40804135
type: string
40814136
taskManager:
4137+
default:
4138+
replicas: 3
40824139
properties:
40834140
deploymentType:
4084-
type: string
4141+
default: StatefulSet
4142+
type: string
40854143
extraPorts:
40864144
items:
40874145
properties:
@@ -4102,6 +4160,17 @@ spec:
41024160
- containerPort
41034161
type: object
41044162
type: array
4163+
hostAliases:
4164+
items:
4165+
properties:
4166+
hostnames:
4167+
items:
4168+
type: string
4169+
type: array
4170+
ip:
4171+
type: string
4172+
type: object
4173+
type: array
41054174
initContainers:
41064175
items:
41074176
properties:
@@ -4792,15 +4861,28 @@ spec:
47924861
type: string
47934862
type: object
47944863
ports:
4864+
default:
4865+
data: 6121
4866+
query: 6125
4867+
rpc: 6122
47954868
properties:
47964869
data:
4870+
default: 6121
47974871
format: int32
4872+
maximum: 65535
4873+
minimum: 1
47984874
type: integer
47994875
query:
4876+
default: 6125
48004877
format: int32
4878+
maximum: 65535
4879+
minimum: 1
48014880
type: integer
48024881
rpc:
4882+
default: 6122
48034883
format: int32
4884+
maximum: 65535
4885+
minimum: 1
48044886
type: integer
48054887
type: object
48064888
readinessProbe:
@@ -4882,9 +4964,17 @@ spec:
48824964
type: integer
48834965
type: object
48844966
replicas:
4967+
default: 3
48854968
format: int32
48864969
type: integer
48874970
resources:
4971+
default:
4972+
limits:
4973+
cpu: 2
4974+
memory: 2Gi
4975+
requests:
4976+
cpu: 200m
4977+
memory: 512Mi
48884978
properties:
48894979
limits:
48904980
additionalProperties:
@@ -5570,17 +5660,6 @@ spec:
55705660
type: string
55715661
type: object
55725662
type: array
5573-
hostAliases:
5574-
items:
5575-
properties:
5576-
ip:
5577-
type: string
5578-
hostnames:
5579-
items:
5580-
type: string
5581-
type: array
5582-
type: object
5583-
type: array
55845663
volumeClaimTemplates:
55855664
items:
55865665
properties:
@@ -6506,6 +6585,9 @@ spec:
65066585
type: string
65076586
state:
65086587
type: string
6588+
submitterExitCode:
6589+
format: int32
6590+
type: integer
65096591
submitterName:
65106592
type: string
65116593
required:

0 commit comments

Comments
 (0)