Skip to content

Commit

Permalink
Update Helm chart with latest from config/default (#500)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickcaballero
nickcaballero authored Oct 26, 2022
1 parent 8f1a784 commit 634ce06
Show file tree
Hide file tree
Showing 8 changed files with 391 additions and 339 deletions.
2 changes: 1 addition & 1 deletion helm-chart/flink-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
name: flink-operator
appVersion: "1.0"
description: A Helm chart for flink on Kubernetes operator
version: "0.2.3"
version: "0.2.4"
keywords:
- flink
home: https://github.com/spotify/flink-on-k8s-operator
3 changes: 0 additions & 3 deletions helm-chart/flink-operator/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ The instructions to install the Flink operator chart:
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.

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).
You can set the following env vars to customize the script's behaviour -
* `export IMG=<image-name>` - Operator image, defaults to `flink-operator:latest`
* `export NS=<namespace-name>` - Namespace to install the operator in, defaults to `flink-operator-system`

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

Expand Down
158 changes: 120 additions & 38 deletions helm-chart/flink-operator/templates/flink-cluster-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: unapproved
cert-manager.io/inject-ca-from: {{ .Values.flinkOperatorNamespace.name }}/flink-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.6.2
name: flinkclusters.flinkoperator.k8s.io
spec:
Expand Down Expand Up @@ -165,13 +166,15 @@ spec:
configMapName:
type: string
mountPath:
default: /etc/hadoop/conf
type: string
type: object
image:
properties:
name:
type: string
pullPolicy:
default: Always
type: string
pullSecrets:
items:
Expand All @@ -186,6 +189,7 @@ spec:
job:
properties:
allowNonRestoredState:
default: false
type: boolean
args:
items:
Expand All @@ -198,7 +202,15 @@ spec:
type: boolean
className:
type: string
classPath:
items:
type: string
type: array
cleanupPolicy:
default:
afterJobCancelled: DeleteCluster
afterJobFails: KeepCluster
afterJobSucceeds: DeleteCluster
properties:
afterJobCancelled:
type: string
Expand All @@ -209,6 +221,17 @@ spec:
type: object
fromSavepoint:
type: string
hostAliases:
items:
properties:
hostnames:
items:
type: string
type: array
ip:
type: string
type: object
type: array
initContainers:
items:
properties:
Expand Down Expand Up @@ -803,14 +826,21 @@ spec:
minimum: 0
type: integer
mode:
default: Detached
enum:
- Detached
- Blocking
- Application
type: string
noLoggingToStdout:
default: false
type: boolean
nodeSelector:
additionalProperties:
type: string
type: object
parallelism:
default: 1
format: int32
type: integer
podAnnotations:
Expand All @@ -828,6 +858,13 @@ spec:
pyModule:
type: string
resources:
default:
limits:
cpu: 2
memory: 2Gi
requests:
cpu: 200m
memory: 512Mi
properties:
limits:
additionalProperties:
Expand All @@ -847,6 +884,7 @@ spec:
type: object
type: object
restartPolicy:
default: Never
type: string
savepointGeneration:
format: int32
Expand Down Expand Up @@ -935,17 +973,6 @@ spec:
type: string
type: object
type: array
hostAliases:
items:
properties:
ip:
type: string
hostnames:
items:
type: string
type: array
type: object
type: array
volumeMounts:
items:
properties:
Expand Down Expand Up @@ -1663,13 +1690,11 @@ spec:
- name
type: object
type: array
required:
- restartPolicy
type: object
jobManager:
default:
replicas: 1
properties:
accessScope:
type: string
ServiceAnnotations:
additionalProperties:
type: string
Expand All @@ -1678,6 +1703,9 @@ spec:
additionalProperties:
type: string
type: object
accessScope:
default: Cluster
type: string
extraPorts:
items:
properties:
Expand All @@ -1698,6 +1726,17 @@ spec:
- containerPort
type: object
type: array
hostAliases:
items:
properties:
hostnames:
items:
type: string
type: array
ip:
type: string
type: object
type: array
ingress:
properties:
annotations:
Expand All @@ -1709,6 +1748,7 @@ spec:
tlsSecretName:
type: string
useTls:
default: false
type: boolean
type: object
initContainers:
Expand Down Expand Up @@ -2401,18 +2441,35 @@ spec:
type: string
type: object
ports:
default:
blob: 6124
query: 6125
rpc: 6123
ui: 8081
properties:
blob:
default: 6124
format: int32
maximum: 65535
minimum: 1
type: integer
query:
default: 6125
format: int32
maximum: 65535
minimum: 1
type: integer
rpc:
default: 6123
format: int32
maximum: 65535
minimum: 1
type: integer
ui:
default: 8081
format: int32
maximum: 65535
minimum: 1
type: integer
type: object
readinessProbe:
Expand Down Expand Up @@ -2494,9 +2551,17 @@ spec:
type: integer
type: object
replicas:
default: 1
format: int32
type: integer
resources:
default:
limits:
cpu: 2
memory: 2Gi
requests:
cpu: 200m
memory: 512Mi
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -3182,17 +3247,6 @@ spec:
type: string
type: object
type: array
hostAliases:
items:
properties:
ip:
type: string
hostnames:
items:
type: string
type: array
type: object
type: array
volumeClaimTemplates:
items:
properties:
Expand Down Expand Up @@ -4072,16 +4126,20 @@ spec:
type: string
type: object
recreateOnUpdate:
default: true
type: boolean
revisionHistoryLimit:
format: int32
type: integer
serviceAccountName:
type: string
taskManager:
default:
replicas: 3
properties:
deploymentType:
type: string
default: StatefulSet
type: string
extraPorts:
items:
properties:
Expand All @@ -4102,6 +4160,17 @@ spec:
- containerPort
type: object
type: array
hostAliases:
items:
properties:
hostnames:
items:
type: string
type: array
ip:
type: string
type: object
type: array
initContainers:
items:
properties:
Expand Down Expand Up @@ -4792,15 +4861,28 @@ spec:
type: string
type: object
ports:
default:
data: 6121
query: 6125
rpc: 6122
properties:
data:
default: 6121
format: int32
maximum: 65535
minimum: 1
type: integer
query:
default: 6125
format: int32
maximum: 65535
minimum: 1
type: integer
rpc:
default: 6122
format: int32
maximum: 65535
minimum: 1
type: integer
type: object
readinessProbe:
Expand Down Expand Up @@ -4882,9 +4964,17 @@ spec:
type: integer
type: object
replicas:
default: 3
format: int32
type: integer
resources:
default:
limits:
cpu: 2
memory: 2Gi
requests:
cpu: 200m
memory: 512Mi
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -5570,17 +5660,6 @@ spec:
type: string
type: object
type: array
hostAliases:
items:
properties:
ip:
type: string
hostnames:
items:
type: string
type: array
type: object
type: array
volumeClaimTemplates:
items:
properties:
Expand Down Expand Up @@ -6506,6 +6585,9 @@ spec:
type: string
state:
type: string
submitterExitCode:
format: int32
type: integer
submitterName:
type: string
required:
Expand Down
Loading

0 comments on commit 634ce06

Please sign in to comment.