Merge pull request #3608 from alizademhdi/feature/add-scheduler-name

Add schedulerName to helm chart values.
telepresenceio · Jun 13, 2024 · 19617db · 19617db
2 parents f54635a + 42328ff
commit 19617db
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.yml b/CHANGELOG.yml
@@ -34,13 +34,21 @@ items:
     date: (TBD)
     notes:
       - type: feature
+<<<<<<< feature/add-scheduler-name
+        title: Add scheduler name to PODs templates.
+        body: >-
+          A new Helm chart value <code>schedulerName</code> has been added. With this feature, we are 
+          able to define some particular schedulers from Kubernetes to apply some different strategies to allocate telepresence resources, 
+          including the Traffic Manager and hooks pods.
+=======
         title: Warn when an Open Source Client connects to an Enterprise Traffic Manager.
         body: >-
           The difference between the OSS and the Enterprise offering is not well understood, and OSS users often install
           a traffic-manager using the Helm chart published at getambassador.io. This Helm chart installs an enterprise
           traffic-manager, which is probably not what the user would expect. Telepresence will now warn when an OSS client
           connects to an enterprise traffic-manager and suggest switching to an enterprise client, or use
           <code>telepresence helm install</code> to install an OSS traffic-manager.
+>>>>>>> release/v2
       - type: bugfix
         title: Kubeconfig exec authentication failure when connecting with --docker from a WSL linux host
         body: >-

diff --git a/charts/telepresence/README.md b/charts/telepresence/README.md
@@ -34,6 +34,7 @@ The following tables lists the configurable parameters of the Telepresence chart
 | podCIDRStrategy                                      | Define the strategy that the traffic-manager uses to discover what CIDRs the cluster uses for pods                          | `auto`                                                                      |
 | podSecurityContext                                   | The Kubernetes SecurityContext for the `Pod`                                                                                | `{}`                                                                        |
 | securityContext                                      | The Kubernetes SecurityContext for the `Deployment`                                                                         | `{"readOnlyRootFilesystem": true, "runAsNonRoot": true, "runAsUser": 1000}` |
+| schedulerName                                             | Specify a scheduler for Traffic Manager `Pod` and hooks `Pod`.                                                       |       
 | nodeSelector                                         | Define which `Node`s you want to the Traffic Manager to be deployed to.                                                     | `{}`                                                                        |
 | tolerations                                          | Define tolerations for the Traffic Manager to ignore `Node` taints.                                                         | `[]`                                                                        |
 | affinity                                             | Define the `Node` Affinity and Anti-Affinity for the Traffic Manager.                                                       | `{}`                                                                        |

diff --git a/charts/telepresence/templates/deployment.yaml b/charts/telepresence/templates/deployment.yaml
@@ -286,6 +286,9 @@ spec:
           {{- template "traffic-manager-mounts" . }}
         {{- end }}
       {{- end }}
+      {{- with .schedulerName }}
+      schedulerName: {{ . }}
+      {{- end }}
       {{- with .nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/telepresence/templates/pre-delete-hook.yaml b/charts/telepresence/templates/pre-delete-hook.yaml
@@ -58,6 +58,9 @@ spec:
         - name: secret-volume
           secret:
             secretName: {{ .Values.agentInjector.secret.name }}
+      {{- with .Values.schedulerName }}
+      schedulerName: {{ . }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/telepresence/values.yaml b/charts/telepresence/values.yaml
@@ -66,6 +66,8 @@ tolerations: []
 
 affinity: {}
 
+schedulerName: ~
+
 ## @param priorityClassName Name of the existing priority class to be used
 ## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 ##