Expose clusterName as flytepropeller config (#2177)

* Expose clusterName as flytepropeller config Signed-off-by: Haytham Abuelfutuh <[email protected]> * Add changelog Signed-off-by: Haytham Abuelfutuh <[email protected]> * Regenerate helm Signed-off-by: Haytham Abuelfutuh <[email protected]>
flyteorg · Feb 16, 2022 · 5cb780d · 5cb780d
1 parent 2311632
commit 5cb780d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG/CHANGELOG-v0.19.3-b2.md b/CHANGELOG/CHANGELOG-v0.19.3-b2.md
@@ -0,0 +1,4 @@
+# 0.19.3-b2 Change Log
+
+## System
+* Allow clusterName to be passed to flytepropeller through the Values.yaml file.
diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md
@@ -164,6 +164,7 @@ helm install gateway bitnami/contour -n flyte
 | flyteconsole.tolerations | list | `[]` | tolerations for Flyteconsole deployment |
 | flytepropeller.affinity | object | `{}` | affinity for Flytepropeller deployment |
 | flytepropeller.cacheSizeMbs | int | `0` |  |
+| flytepropeller.clusterName | string | `""` | Defines the cluster name used in events sent to Admin |
 | flytepropeller.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
 | flytepropeller.enabled | bool | `true` |  |
 | flytepropeller.extraArgs | object | `{}` | Appends extra command line arguments to the main command |

diff --git a/charts/flyte-core/templates/propeller/deployment.yaml b/charts/flyte-core/templates/propeller/deployment.yaml
@@ -46,6 +46,10 @@ spec:
         {{- end }}
         - --config
         - {{ .Values.flytepropeller.configPath }}
+        {{- with .Values.flytepropeller.clusterName }}
+        - --propeller.cluster-id
+        - {{ tpl (toYaml .) $ }}
+        {{- end -}}
         {{- with .Values.flytepropeller.extraArgs }}
         {{- tpl (toYaml $) . | nindent 6 }}
         {{- end }}

diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml
@@ -207,6 +207,8 @@ flytepropeller:
   affinity: {}
   # -- Appends extra command line arguments to the main command
   extraArgs: {}
+  # -- Defines the cluster name used in events sent to Admin
+  clusterName: ""
 
 #
 # FLYTECONSOLE SETTINGS