Merge pull request #2814 from manics/priorityClassName

Curvenote: set priorityClassName for awsEcrRegistryCleaner binderhub-container-registry-helper
jupyterhub · Nov 3, 2023 · 9f6f673 · 9f6f673
2 parents f461f9e + 85bf8b8
commit 9f6f673
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/config/curvenote.yaml b/config/curvenote.yaml
@@ -1,6 +1,7 @@
 projectName: curvenote
 
 binderhub:
+  # TODO: priorityClassName: binderhub-core
   replicas: 1
   config:
     BinderHub:
@@ -245,13 +246,15 @@ binderhub:
       maxAge: 3600
 
   imageCleaner:
+    # TODO: priorityClassName: binderhub-core
     enabled: true
     # Use 40GB as upper limit, size is given in bytes
     imageGCThresholdHigh: 40e9
     imageGCThresholdLow: 30e9
     imageGCThresholdType: "absolute"
 
 cryptnono:
+  # TODO: priorityClassName: binderhub-core
   enabled: true
 
 grafana:
@@ -308,6 +311,7 @@ analyticsPublisher:
   enabled: false
 
 minesweeper:
+  # TODO: priorityClassName: binderhub-core
   enabled: true
 
 priorityClasses:
@@ -316,6 +320,7 @@ priorityClasses:
 binderhub-container-registry-helper:
   enabled: true
   # auth_token: Autogenerated
+  priorityClassName: binderhub-core
   replicaCount: 1
   serviceAccount:
     name: binderhub-container-registry-helper
@@ -324,6 +329,7 @@ binderhub-container-registry-helper:
 
 awsEcrRegistryCleaner:
   enabled: true
+  priorityClassName: binderhub-core
   serviceAccount:
     annotations:
       eks.amazonaws.com/role-arn: "arn:aws:iam::166088433508:role/binderhub-IRSA-aws-binderhub-ecr-registry-cleaner"
diff --git a/mybinder/Chart.yaml b/mybinder/Chart.yaml
@@ -54,6 +54,6 @@ dependencies:
   # Registry helper, used to create container repositories before pushing and to
   # fetch dynamic registry credentials
   - name: binderhub-container-registry-helper
-    version: 0.2.3
+    version: 0.2.4
     repository: https://www.manicstreetpreacher.co.uk/binderhub-container-registry-helper/
     condition: binderhub-container-registry-helper.enabled
diff --git a/mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml b/mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml
@@ -42,3 +42,6 @@ spec:
           value: user
       serviceAccountName: binderhub-ecr-registry-cleaner
 {{- end }}
+      {{- with .Values.awsEcrRegistryCleaner.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
@@ -609,3 +609,4 @@ awsEcrRegistryCleaner:
   serviceAccount:
     name: binderhub-ecr-registry-cleaner
     annotations: {}
+  priorityClassName: ""