Skip to content

Commit 802e833

Browse files
committed
Add new chart for managing kube-system charts
1 parent 991b26d commit 802e833

File tree

7 files changed

+49
-3
lines changed

7 files changed

+49
-3
lines changed

.github/workflows/cd.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ jobs:
152152
run: |
153153
curl -sf https://raw.githubusercontent.com/helm/helm/HEAD/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
154154
helm dependency update ./mybinder
155+
helm dependency update ./mybinder-kube-system
155156
156157
# Action Repo: https://github.com/sliteteam/github-action-git-crypt-unlock
157158
- name: "Stage 2: Unlock git-crypt secrets"
@@ -290,6 +291,7 @@ jobs:
290291
run: |
291292
curl -sf https://raw.githubusercontent.com/helm/helm/HEAD/scripts/get-helm-3 | DESIRED_VERSION=${HELM_VERSION} bash
292293
helm dependency update ./mybinder
294+
helm dependency update ./mybinder-kube-system
293295
294296
- name: "Stage 2: Unlock git-crypt secrets"
295297
uses: sliteteam/github-action-git-crypt-unlock@8b1fa3ccc81e322c5c45fbab261eee46513fd3f8

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ __pycache__
88
config/common/datacenter-*.yaml
99
secrets/banned_hosts.txt
1010
secrets/config/common/bans.yaml
11-
mybinder/charts
12-
mybinder/requirements.lock
13-
mybinder/Chart.lock
11+
mybinder*/charts
12+
mybinder*/requirements.lock
13+
mybinder*/Chart.lock
1414

1515
.ipynb_checkpoints
1616

chartpress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ charts:
1010
valuesPath: minesweeper.image
1111
tc-init:
1212
valuesPath: binderhub.jupyterhub.singleuser.initContainers.0.image
13+
- name: mybinder-kube-system
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Install the more modern load-balancer controller:
2+
# https://docs.aws.amazon.com/eks/latest/userguide/aws-load-balancer-controller.html
3+
aws-load-balancer-controller:
4+
enabled: true
5+
clusterName: binderhub
6+
# Must match the IRSA service account name
7+
name: aws-load-balancer-controller
8+
serviceAccount:
9+
annotations:
10+
eks.amazonaws.com/role-arn: "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/IRSA-aws-load-balancer-controller"
11+
12+
aws-ebs-csi-driver:
13+
enabled: true
14+
controller:
15+
serviceAccount:
16+
# Must match the IRSA service account name
17+
name: ebs-csi-controller-sa
18+
annotations:
19+
eks.amazonaws.com/role-arn: "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/IRSA-aws-ebs-csi-driver"

config/aws-curvenote.yaml

Whitespace-only changes.

mybinder-kube-system/Chart.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: v2
2+
description: A meta-chart for the kube-system charts on some mybinder.org hosts
3+
name: mybinder-kube-system
4+
version: "0.0.1-set.by.chartpress"
5+
kubeVersion: ">= 1.26.0-0"
6+
dependencies:
7+
# https://artifacthub.io/packages/helm/aws/aws-load-balancer-controller
8+
- name: aws-load-balancer-controller
9+
version: 1.5.3
10+
repository: https://aws.github.io/eks-charts
11+
condition: aws-load-balancer-controller.enabled
12+
13+
# https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/docs/install.md
14+
- name: aws-ebs-csi-driver
15+
version: 2.17.2
16+
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
17+
condition: aws-ebs-csi-driver.enabled

mybinder-kube-system/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# AWS EKS load-balancer controller
2+
aws-load-balancer-controller:
3+
enabled: false
4+
5+
# AWS EKS storage (EBS) controller
6+
aws-ebs-csi-driver:
7+
enabled: false

0 commit comments

Comments
 (0)