Skip to content

[WIP] Switch to using new chart #3248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chartpress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ charts:
minesweeper:
valuesPath: minesweeper.image
tc-init:
valuesPath: binderhub.jupyterhub.singleuser.initContainers.0.image
valuesPath: jupyterhub.singleuser.initContainers.0.image
- name: mybinder-kube-system
- name: mybinder-tigera-operator
54 changes: 18 additions & 36 deletions config/hetzner-2i2c-bare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ binderhub:
BinderHub:
hub_url: https://hub.2i2c-bare.mybinder.org
badge_base_url: https://mybinder.org
sticky_builds: true
image_prefix: registry.2i2c-bare.mybinder.org/i-
# image_prefix: quay.io/mybinder-hetzner-2i2c/image-
# build_docker_host: /var/run/dind/docker.sock
Expand All @@ -51,20 +50,7 @@ binderhub:
# DockerRegistry:
# token_url: "https://2lmrrh8f.gra7.container-registry.ovh.net/service/token?service=harbor-registry"

replicas: 2

extraVolumes:
- name: secrets
secret:
secretName: events-archiver-secrets
extraVolumeMounts:
- name: secrets
mountPath: /secrets
readOnly: true
extraEnv:
GOOGLE_APPLICATION_CREDENTIALS: /secrets/service-account.json

dind:
dockerApi:
resources:
requests:
cpu: "4"
Expand All @@ -76,27 +62,23 @@ binderhub:
ingress:
hosts:
- 2i2c-bare.mybinder.org

jupyterhub:
hub:
db:
pvc:
storage: 1Gi
storageClassName: openebs-hostpath
# proxy:
# chp:
# resources:
# requests:
# cpu: "1"
# limits:
# cpu: "1"
ingress:
hosts:
- hub.2i2c-bare.mybinder.org
tls:
- secretName: kubelego-tls-hub
hosts:
- hub.2i2c-bare.mybinder.org
tls:
- hosts: [2i2c-bare.mybinder.org]
secretName: https-auto-tls-binder

jupyterhub:
hub:
db:
pvc:
storage: 1Gi
storageClassName: openebs-hostpath
ingress:
hosts:
- hub.2i2c-bare.mybinder.org
tls:
- secretName: kubelego-tls-hub
hosts:
- hub.2i2c-bare.mybinder.org

grafana:
ingress:
Expand Down
2 changes: 1 addition & 1 deletion images/tc-init/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.21
RUN apk add --no-cache iproute2

ADD tc-init /usr/local/bin/tc-init
Expand Down
29 changes: 13 additions & 16 deletions mybinder/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,41 @@
apiVersion: v2
description: A meta-chart for the binderhub deployment on mybinder.org
name: mybinder
version: "0.0.1-set.by.chartpress"
version: "2020.12.4-0.dev.git.6239.h41940d65"
kubeVersion: ">= 1.15.0-0"
dependencies:
# BinderHub
# Source code: https://github.com/jupyterhub/binderhub/tree/main/helm-chart
# App changelog: https://github.com/jupyterhub/binderhub/blob/main/CHANGES.md
- name: jupyterhub
version: 4.0.0
repository: https://jupyterhub.github.io/helm-chart/

- name: binderhub
version: "1.0.0-0.dev.git.3704.h3883aac1"
repository: https://jupyterhub.github.io/helm-chart
condition: binderhubEnabled
repository: file:///Users/yuvipanda/code/binderhub/helm-chart/binderhub/
# repository: https://2i2c.org/binderhub-service/
condition: binderhub.enabled
version: "1.0.0-0.dev.git.4013.hd0c659e9"

# Ingress-Nginx to route network traffic according to Ingress resources using
# this controller from within k8s.
# Source code: https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx
# App changelog: https://github.com/kubernetes/ingress-nginx/blob/main/Changelog.md
# https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx
- name: ingress-nginx
version: "4.12.0"
repository: https://kubernetes.github.io/ingress-nginx
condition: ingress-nginx.enabled

# Prometheus for collection of metrics.
# Source code: https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus
# App changelog: https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md
# https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus
- name: prometheus
version: "26.1.0"
repository: https://prometheus-community.github.io/helm-charts
condition: prometheus.enabled

# Grafana for dashboarding of metrics.
# Source code: https://github.com/grafana/helm-charts/tree/main/charts/grafana
# App changelog: https://github.com/grafana/grafana/blob/main/CHANGELOG.md
# https://github.com/grafana/helm-charts/tree/main/charts/grafana
- name: grafana
version: "8.8.2"
repository: https://grafana.github.io/helm-charts
condition: grafana.enabled

# cryptnono, counters crypto mining
# Source code: https://github.com/cryptnono/cryptnono/
# https://github.com/cryptnono/cryptnono/
- name: cryptnono
version: "0.3.2-0.dev.git.156.hdab4ec8"
repository: https://cryptnono.github.io/cryptnono/
Expand Down
19 changes: 0 additions & 19 deletions mybinder/templates/hpa.yaml

This file was deleted.

Loading
Loading