Skip to content

Commit

Permalink
Added taint tolerations to core deployments in k3s
Browse files Browse the repository at this point in the history
k3s defaults.yaml gets the value of k3s_worker_taint from worker_taint
which is defined under kolla/defaults.yml which subsequently defines
defaults for the option and takes in site values from the
k8s_worker_taint option that can be specified through the site config.

Added worker node taint toleration to smarter devices manager
daemonsets.

Furthermore, templated the nvidia device plugin daemonset and added the
toleration there as well.
  • Loading branch information
Soufiane Jounaid authored and Soufiane Jounaid committed Jun 26, 2024
1 parent 6e99e7e commit 93cfd5d
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 0 deletions.
1 change: 1 addition & 0 deletions roles/k3s/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ k3s_server_location: /var/lib/rancher/k3s
k3s_conf_location: /etc/rancher/k3s
k3s_systemd_dir: /etc/systemd/system
k3s_server_ip: "{{ kolla_external_vip_address }}"
k3s_worker_taint: "{{ worker_taint }}"
k3s_extra_server_args: ""

k3s_dry_run: no
Expand Down
1 change: 1 addition & 0 deletions roles/k3s/tasks/config-device-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
kubernetes.core.k8s:
state: present
src: nvidia-device-plugin.yaml
template: "nvidia-device-plugin.yaml.j2"
apply: yes
when:
- not (k3s_dry_run | bool)
Expand Down
74 changes: 74 additions & 0 deletions roles/k3s/templates/nvidia-device-plugin.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: apps/v1
kind: DaemonSet
metadata:
name: nvidia-device-plugin-daemonset
namespace: kube-system
spec:
selector:
matchLabels:
name: nvidia-device-plugin-ds
updateStrategy:
type: RollingUpdate
template:
metadata:
# This annotation is deprecated. Kept here for backward compatibility
# See https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ""
labels:
name: nvidia-device-plugin-ds
spec:
nodeSelector:
"nvidia-device-plugin/enabled": "true"
tolerations:
# This toleration is deprecated. Kept here for backward compatibility
# See https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
- key: CriticalAddonsOnly
operator: Exists
- key: nvidia.com/gpu
operator: Exists
effect: NoSchedule
- key: "{{ k3s_worker_taint.key }}"
operator: "Equal"
value: "{{ k3s_worker_taint.value }}"
effect: "{{ k3s_worker_taint.effect }}"
# Mark this pod as a critical add-on; when enabled, the critical add-on
# scheduler reserves resources for critical add-on pods so that they can
# be rescheduled after a failure.
# See https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
priorityClassName: "system-node-critical"
containers:
- image: nvcr.io/nvidia/k8s-device-plugin:v0.14.1
name: nvidia-device-plugin-ctr
env:
- name: FAIL_ON_INIT_ERROR
value: "false"
- name: NVIDIA_VISIBLE_DEVICES
value: all
- name: NVIDIA_DRIVER_CAPABILITIES
value: all
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop: ["ALL"]
volumeMounts:
- name: device-plugin
mountPath: /var/lib/kubelet/device-plugins
volumes:
- name: device-plugin
hostPath:
path: /var/lib/kubelet/device-plugins
5 changes: 5 additions & 0 deletions roles/k3s/templates/smarter-device-manager-ds-jetson.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ spec:
nodeSelector:
smarter-device-manager: enabled
smarter-device-manager/configmap: jetson
tolerations:
- key: "{{ k3s_worker_taint.key }}"
operator: "Equal"
value: "{{ k3s_worker_taint.value }}"
effect: "{{ k3s_worker_taint.effect }}"
priorityClassName: "system-node-critical"
hostname: smarter-device-management
hostNetwork: true
Expand Down
5 changes: 5 additions & 0 deletions roles/k3s/templates/smarter-device-manager-ds-rpi.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ spec:
nodeSelector:
smarter-device-manager: enabled
smarter-device-manager/configmap: rpi
tolerations:
- key: "{{ k3s_worker_taint.key }}"
operator: "Equal"
value: "{{ k3s_worker_taint.value }}"
effect: "{{ k3s_worker_taint.effect }}"
priorityClassName: "system-node-critical"
hostname: smarter-device-management
hostNetwork: true
Expand Down

0 comments on commit 93cfd5d

Please sign in to comment.