From c18ef480911083397ddf08de092c7dd30b7cd799 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Fri, 3 Nov 2023 23:07:02 +0000 Subject: [PATCH 1/2] binderhub-container-registry-helper 0.2.4 --- mybinder/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mybinder/Chart.yaml b/mybinder/Chart.yaml index 67de9d98a..eda455d27 100644 --- 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 From 85bf8b80dd79f6fb47e6eabcfca87bf9f2fed998 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Fri, 3 Nov 2023 23:11:28 +0000 Subject: [PATCH 2/2] priorityClassName for awsEcrRegistryCleaner and binderhub-container-registry-helper --- config/curvenote.yaml | 6 ++++++ mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml | 3 +++ mybinder/values.yaml | 1 + 3 files changed, 10 insertions(+) diff --git a/config/curvenote.yaml b/config/curvenote.yaml index 2b1aa3d36..773bb890c 100644 --- a/config/curvenote.yaml +++ b/config/curvenote.yaml @@ -1,6 +1,7 @@ projectName: curvenote binderhub: + # TODO: priorityClassName: binderhub-core replicas: 1 config: BinderHub: @@ -245,6 +246,7 @@ binderhub: maxAge: 3600 imageCleaner: + # TODO: priorityClassName: binderhub-core enabled: true # Use 40GB as upper limit, size is given in bytes imageGCThresholdHigh: 40e9 @@ -252,6 +254,7 @@ binderhub: 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/templates/aws-ecr-registry-cleaner/deployment.yaml b/mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml index 7a4ffda39..022f2a0ae 100644 --- 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 index 4952c3280..0cc403969 100644 --- a/mybinder/values.yaml +++ b/mybinder/values.yaml @@ -609,3 +609,4 @@ awsEcrRegistryCleaner: serviceAccount: name: binderhub-ecr-registry-cleaner annotations: {} + priorityClassName: ""