Move Staging to run on OVH with k3s

config/staging.yaml

@@ -1,36 +1,33 @@
-projectName: binderhub-288415
+projectName: staging
 
 # binderhubEnabled: false
 
 binderhub:
   config:
     BinderHub:
       pod_quota: 20
-      hub_url: https://hub.gke2.staging.mybinder.org
-      badge_base_url: https://staging.mybinder.org
-      image_prefix: us-central1-docker.pkg.dev/binderhub-288415/staging/r2d-2023-04-
+      hub_url: https://hub.ovh.staging.mybinder.2i2c.cloud
+      badge_base_url: https://staging.mybinder.2i2c.cloud
+      image_prefix: 985ed7pp.c1.va1.container-registry.ovh.us/mybinder-builds/
       sticky_builds: true
-    DockerRegistry:
-      token_url: "https://us-central1-docker.pkg.dev/v2/token"
-
-  registry:
-    url: "https://us-central1-docker.pkg.dev"
-    username: "_json_key"
 
+  extraVolumes:
+    - name: secrets
+      secret:
+        secretName: events-archiver-secrets
+  extraVolumeMounts:
+    - name: secrets
+      mountPath: /secrets
+      readOnly: true
   extraEnv:
+    GOOGLE_APPLICATION_CREDENTIALS: /secrets/service-account.json
     EVENT_LOG_NAME: "binderhub-staging-events-text"
 
   resources:
     requests:
       cpu: 0.1
       memory: 512Mi
 
-  hpa:
-    enabled: true
-    maxReplicas: 3
-    minReplicas: 1
-    targetCPU: 90 # 90% of cpu request, so 90m CPU
-
   dind:
     resources:
       requests:
@@ -42,8 +39,7 @@ binderhub:
 
   ingress:
     hosts:
-      - gke.staging.mybinder.org
-      - gke2.staging.mybinder.org
+      - ovh.staging.mybinder.2i2c.cloud
 
   jupyterhub:
     hub:
@@ -60,13 +56,11 @@ binderhub:
         limit: 0.5
     ingress:
       hosts:
-        - hub.gke.staging.mybinder.org
-        - hub.gke2.staging.mybinder.org
+        - hub.ovh.staging.mybinder.2i2c.cloud
       tls:
         - secretName: kubelego-tls-jupyterhub-staging
           hosts:
-            - hub.gke.staging.mybinder.org
-            - hub.gke2.staging.mybinder.org
+            - hub.ovh.staging.mybinder.2i2c.cloud
     scheduling:
       userPlaceholder:
         replicas: 1
@@ -87,12 +81,10 @@ minesweeper:
 grafana:
   ingress:
     hosts:
-      - grafana.staging.mybinder.org
-      - grafana.gke2.staging.mybinder.org
+      - grafana.ovh.staging.mybinder.2i2c.cloud
     tls:
       - hosts:
-          - grafana.staging.mybinder.org
-          - grafana.gke2.staging.mybinder.org
+          - grafana.ovh.staging.mybinder.2i2c.cloud
         secretName: kubelego-tls-grafana
   datasources:
     datasources.yaml:
@@ -101,22 +93,18 @@ grafana:
         - name: prometheus
           orgId: 1
           type: prometheus
-          url: https://prometheus.staging.mybinder.org
+          url: https://prometheus.ovh.staging.mybinder.2i2c.cloud
           isDefault: true
           editable: false
-  persistence:
-    storageClassName: standard
 
 prometheus:
   server:
     ingress:
       hosts:
-        - prometheus.staging.mybinder.org
-        - prometheus.gke2.staging.mybinder.org
+        - prometheus.ovh.staging.mybinder.2i2c.cloud
       tls:
         - hosts:
-            - prometheus.staging.mybinder.org
-            - prometheus.gke2.staging.mybinder.org
+            - prometheus.ovh.staging.mybinder.2i2c.cloud
           secretName: kubelego-tls-prometheus
     persistentVolume:
       size: 12G
@@ -126,8 +114,8 @@ prometheus:
 ingress-nginx:
   controller:
     replicaCount: 2
-    service:
-      loadBalancerIP: 35.222.35.25
+    # service:
+    #   loadBalancerIP: 35.222.35.25
     resources:
       requests:
         cpu: 10m
@@ -139,31 +127,22 @@ ingress-nginx:
 static:
   ingress:
     hosts:
-      - static.staging.mybinder.org
-      - static.gke2.staging.mybinder.org
+      - static.ovh.staging.mybinder.2i2c.cloud
 
 redirector:
   enabled: true
   redirects:
     - type: host
       host:
-        from: docs.staging.mybinder.org
+        from: docs.staging.mybinder.2i2c.cloud
         to: mybinder.readthedocs.io
 
 matomo:
-  enabled: true
-  db:
-    instanceName: binderhub-288415:us-central1:matomo-staging
-  trustedHosts:
-    - staging.mybinder.org
-    - gke2.staging.mybinder.org
-  ingress:
-    hosts:
-      - staging.mybinder.org
-      - gke2.staging.mybinder.org
+  enabled: false
 
 analyticsPublisher:
-  enabled: true
+  # FIXME: Enable this
+  enabled: false
   project: binderhub-288415
   destinationBucket: binder-staging-events-archive
   events:
@@ -177,15 +156,16 @@ analyticsPublisher:
     sourceBucket: binder-billing-archive
 
 gcsProxy:
-  enabled: true
+  # FIXME: Enable this
+  enabled: false
   buckets:
     - name: binder-staging-events-archive
-      host: archive.analytics.gke2.staging.mybinder.org
+      host: archive.analytics.gke2.staging.mybinder.2i2c.cloud
     - name: binder-staging-events-archive
-      host: archive.analytics.staging.mybinder.org
+      host: archive.analytics.staging.mybinder.2i2c.cloud
 
 federationRedirect:
-  host: staging.mybinder.org
+  host: staging.mybinder.2i2c.cloud
   enabled: true
   resources:
     requests:
@@ -197,12 +177,7 @@ federationRedirect:
   hosts:
     gke:
       prime: true
-      url: https://gke2.staging.mybinder.org
-      weight: 4
-      health: https://gke2.staging.mybinder.org/health
-      versions: https://gke2.staging.mybinder.org/versions
-    gesis:
-      url: https://notebooks.gesis.org/binder
+      url: https://ovh.staging.mybinder.2i2c.cloud
       weight: 100
-      health: https://notebooks.gesis.org/binder/health
-      versions: https://notebooks.gesis.org/binder/versions
+      health: https://ovh.staging.mybinder.2i2c.cloud/health
+      versions: https://ovh.staging.mybinder.2i2c.cloud/versions

deploy.py

@@ -21,7 +21,6 @@
 ABSOLUTE_HERE = os.path.dirname(os.path.realpath(__file__))
 
 GCP_PROJECTS = {
-    "staging": "binderhub-288415",
     "prod": "binderhub-288415",
 }
 
@@ -31,12 +30,7 @@
 }
 
 # Projects using raw KUBECONFIG files
-KUBECONFIG_CLUSTERS = {
-    "localhost",
-    "ovh2",
-    "hetzner-2i2c",
-    "hetzner-gesis",
-}
+KUBECONFIG_CLUSTERS = {"localhost", "ovh2", "hetzner-2i2c", "hetzner-gesis", "staging"}
 
 # Mapping of config name to cluster name for AWS EKS deployments
 AWS_DEPLOYMENTS = {"curvenote": "binderhub"}