Skip to content

Commit fa19883

Browse files
committed
Run staging off a k3s cluster
- Use 2i2c.cloud as domain because I don't have access to mybinder.org domain yet
1 parent 032ca95 commit fa19883

File tree

5 files changed

+30
-21
lines changed

5 files changed

+30
-21
lines changed

config/staging.yaml

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,21 @@ binderhub:
66
config:
77
BinderHub:
88
pod_quota: 20
9-
hub_url: https://hub.ovh.staging.mybinder.org
10-
badge_base_url: https://staging.mybinder.org
9+
hub_url: https://hub.ovh.staging.mybinder.2i2c.cloud
10+
badge_base_url: https://staging.mybinder.2i2c.cloud
1111
image_prefix: 985ed7pp.c1.va1.container-registry.ovh.us/mybinder-builds/
1212
sticky_builds: true
1313

14+
extraVolumes:
15+
- name: secrets
16+
secret:
17+
secretName: events-archiver-secrets
18+
extraVolumeMounts:
19+
- name: secrets
20+
mountPath: /secrets
21+
readOnly: true
1422
extraEnv:
23+
GOOGLE_APPLICATION_CREDENTIALS: /secrets/service-account.json
1524
EVENT_LOG_NAME: "binderhub-staging-events-text"
1625

1726
resources:
@@ -30,7 +39,7 @@ binderhub:
3039

3140
ingress:
3241
hosts:
33-
- ovh.staging.mybinder.org
42+
- ovh.staging.mybinder.2i2c.cloud
3443

3544
jupyterhub:
3645
hub:
@@ -47,11 +56,11 @@ binderhub:
4756
limit: 0.5
4857
ingress:
4958
hosts:
50-
- hub.ovh.staging.mybinder.org
59+
- hub.ovh.staging.mybinder.2i2c.cloud
5160
tls:
5261
- secretName: kubelego-tls-jupyterhub-staging
5362
hosts:
54-
- hub.ovh.staging.mybinder.org
63+
- hub.ovh.staging.mybinder.2i2c.cloud
5564
scheduling:
5665
userPlaceholder:
5766
replicas: 1
@@ -72,10 +81,10 @@ minesweeper:
7281
grafana:
7382
ingress:
7483
hosts:
75-
- grafana.ovh.staging.mybinder.org
84+
- grafana.ovh.staging.mybinder.2i2c.cloud
7685
tls:
7786
- hosts:
78-
- grafana.ovh.staging.mybinder.org
87+
- grafana.ovh.staging.mybinder.2i2c.cloud
7988
secretName: kubelego-tls-grafana
8089
datasources:
8190
datasources.yaml:
@@ -84,7 +93,7 @@ grafana:
8493
- name: prometheus
8594
orgId: 1
8695
type: prometheus
87-
url: https://prometheus.ovh.staging.mybinder.org
96+
url: https://prometheus.ovh.staging.mybinder.2i2c.cloud
8897
isDefault: true
8998
editable: false
9099
persistence:
@@ -94,10 +103,10 @@ prometheus:
94103
server:
95104
ingress:
96105
hosts:
97-
- prometheus.ovh.staging.mybinder.org
106+
- prometheus.ovh.staging.mybinder.2i2c.cloud
98107
tls:
99108
- hosts:
100-
- prometheus.ovh.staging.mybinder.org
109+
- prometheus.ovh.staging.mybinder.2i2c.cloud
101110
secretName: kubelego-tls-prometheus
102111
persistentVolume:
103112
size: 12G
@@ -120,25 +129,25 @@ ingress-nginx:
120129
static:
121130
ingress:
122131
hosts:
123-
- static.ovh.staging.mybinder.org
132+
- static.ovh.staging.mybinder.2i2c.cloud
124133

125134
redirector:
126135
enabled: true
127136
redirects:
128137
- type: host
129138
host:
130-
from: docs.staging.mybinder.org
139+
from: docs.staging.mybinder.2i2c.cloud
131140
to: mybinder.readthedocs.io
132141

133142
matomo:
134143
enabled: true
135144
db:
136145
instanceName: binderhub-288415:us-central1:matomo-staging
137146
trustedHosts:
138-
- staging.mybinder.org
147+
- staging.mybinder.2i2c.cloud
139148
ingress:
140149
hosts:
141-
- staging.mybinder.org
150+
- staging.mybinder.2i2c.cloud
142151

143152
analyticsPublisher:
144153
# FIXME: Enable this
@@ -160,12 +169,12 @@ gcsProxy:
160169
enabled: false
161170
buckets:
162171
- name: binder-staging-events-archive
163-
host: archive.analytics.gke2.staging.mybinder.org
172+
host: archive.analytics.gke2.staging.mybinder.2i2c.cloud
164173
- name: binder-staging-events-archive
165-
host: archive.analytics.staging.mybinder.org
174+
host: archive.analytics.staging.mybinder.2i2c.cloud
166175

167176
federationRedirect:
168-
host: staging.mybinder.org
177+
host: staging.mybinder.2i2c.cloud
169178
enabled: true
170179
resources:
171180
requests:
@@ -177,7 +186,7 @@ federationRedirect:
177186
hosts:
178187
gke:
179188
prime: true
180-
url: https://ovh.staging.mybinder.org
189+
url: https://ovh.staging.mybinder.2i2c.cloud
181190
weight: 100
182-
health: https://ovh.staging.mybinder.org/health
183-
versions: https://ovh.staging.mybinder.org/versions
191+
health: https://ovh.staging.mybinder.2i2c.cloud/health
192+
versions: https://ovh.staging.mybinder.2i2c.cloud/versions

deploy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
ABSOLUTE_HERE = os.path.dirname(os.path.realpath(__file__))
2222

2323
GCP_PROJECTS = {
24-
"staging": "binderhub-288415",
2524
"prod": "binderhub-288415",
2625
}
2726

@@ -36,6 +35,7 @@
3635
"ovh2",
3736
"hetzner-2i2c",
3837
"hetzner-gesis",
38+
"staging"
3939
}
4040

4141
# Mapping of config name to cluster name for AWS EKS deployments

secrets/staging-kubeconfig.yml

2.92 KB
Binary file not shown.

secrets/staging.key

466 Bytes
Binary file not shown.

secrets/staging.key.pub

146 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)