Replace usages of critical-pod annotation with priorityClassName

scheduler.alpha.kubernetes.io/critical-pod deprecated since kubernetes v1.16
ROCm · Oct 19, 2022 · 6d4133b · 6d4133b
1 parent 4aa0e0f
commit 6d4133b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/helm/amd-gpu/Chart.yaml b/helm/amd-gpu/Chart.yaml
@@ -15,7 +15,7 @@ keywords:
   - gpu
 
 kubeVersion: ">= 1.18.0-0"
-version: 0.3.0
+version: 0.4.0
 appVersion: "1.18.0"
 
 dependencies:

diff --git a/helm/amd-gpu/templates/deviceplugin-daemonset.yaml b/helm/amd-gpu/templates/deviceplugin-daemonset.yaml
@@ -9,8 +9,6 @@ spec:
       name: {{ .Chart.Name }}-dp-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: {{ .Chart.Name }}-dp-ds
     spec:
@@ -24,6 +22,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- end }}
+      priorityClassName: system-node-critical
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

diff --git a/helm/amd-gpu/templates/labeller.yaml b/helm/amd-gpu/templates/labeller.yaml
@@ -36,8 +36,6 @@ spec:
       name: amdgpu-lr-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-lr-ds
     spec:
@@ -47,6 +45,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- end }}
+      priorityClassName: system-node-critical
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

diff --git a/k8s-ds-amdgpu-dp-health.yaml b/k8s-ds-amdgpu-dp-health.yaml
@@ -15,11 +15,10 @@ spec:
       name: amdgpu-dp-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-dp-ds
     spec:
+      priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists

diff --git a/k8s-ds-amdgpu-dp.yaml b/k8s-ds-amdgpu-dp.yaml
@@ -9,11 +9,10 @@ spec:
       name: amdgpu-dp-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-dp-ds
     spec:
+      priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists

diff --git a/k8s-ds-amdgpu-labeller.yaml b/k8s-ds-amdgpu-labeller.yaml
@@ -38,11 +38,10 @@ spec:
       name: amdgpu-lr-ds
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: amdgpu-lr-ds
     spec:
+      priorityClassName: system-node-critical
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists