Merge pull request #92 from trifork/fix/safe-to-evict

add safe-to-evict annotation to task-managers

charts/flink-job/Chart.yaml

@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.4
+version: 0.4.5
 
 dependencies:
   - name: image-automation

charts/flink-job/README.md

@@ -1,6 +1,6 @@
 # flink-job
 
-![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.4.5](https://img.shields.io/badge/Version-0.4.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for handling Cheetah Data Platform Flink jobs
 
@@ -165,7 +165,7 @@ Read more about Flink and highly available job-managers [here](https://nightlies
 | taskManager.volumes | list | `[]` | List of additional volumes |
 | taskManager.volumeMounts | list | `[]` | List of additional volume mounts |
 | taskManager.podLabels | object | `{}` | Additional labels attached to the pods |
-| taskManager.podAnnotations | object | `{}` | Additional annotations attached to the pods |
+| taskManager.podAnnotations | object | `{"cluster-autoscaler.kubernetes.io/safe-to-evict":"true"}` | Additional annotations attached to the pods |
 | taskManager.initContainers | list | `[]` | InitContainers for the pods |
 | taskManager.podTemplate | string | (see [values.yaml](values.yaml)) | Pod template. Overrides the main `podTemplate`. The main flink-container must be called "flink-main-container" |
 | jobManager.replicas | int | `1` | Number of replicas |

charts/flink-job/values.yaml

@@ -205,7 +205,9 @@ taskManager:
   # -- Additional labels attached to the pods
   podLabels: {}
   # -- Additional annotations attached to the pods
-  podAnnotations: {}
+  podAnnotations:
+    # As the task-manager is a raw pod with no controller, the cluster-autoscaler is not able to evict it
+    cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
   # -- InitContainers for the pods
   initContainers: []