Turn locals into vars, and add a staging setup

Author: yuvipanda

config/staging.yaml

@@ -1,21 +1,15 @@
-projectName: binderhub-288415
+projectName: staging
 
 # binderhubEnabled: false
 
 binderhub:
   config:
     BinderHub:
       pod_quota: 20
-      hub_url: https://hub.gke2.staging.mybinder.org
+      hub_url: https://hub.ovh.staging.mybinder.org
       badge_base_url: https://staging.mybinder.org
-      image_prefix: us-central1-docker.pkg.dev/binderhub-288415/staging/r2d-2023-04-
+      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"
 
   extraEnv:
     EVENT_LOG_NAME: "binderhub-staging-events-text"
@@ -25,12 +19,6 @@ binderhub:
       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 +30,7 @@ binderhub:
 
   ingress:
     hosts:
-      - gke.staging.mybinder.org
-      - gke2.staging.mybinder.org
+      - ovh.staging.mybinder.org
 
   jupyterhub:
     hub:
@@ -60,13 +47,11 @@ binderhub:
         limit: 0.5
     ingress:
       hosts:
-        - hub.gke.staging.mybinder.org
-        - hub.gke2.staging.mybinder.org
+        - hub.ovh.staging.mybinder.org
       tls:
         - secretName: kubelego-tls-jupyterhub-staging
           hosts:
-            - hub.gke.staging.mybinder.org
-            - hub.gke2.staging.mybinder.org
+            - hub.ovh.staging.mybinder.org
     scheduling:
       userPlaceholder:
         replicas: 1
@@ -87,12 +72,10 @@ minesweeper:
 grafana:
   ingress:
     hosts:
-      - grafana.staging.mybinder.org
-      - grafana.gke2.staging.mybinder.org
+      - grafana.ovh.staging.mybinder.org
     tls:
       - hosts:
-          - grafana.staging.mybinder.org
-          - grafana.gke2.staging.mybinder.org
+          - grafana.ovh.staging.mybinder.org
         secretName: kubelego-tls-grafana
   datasources:
     datasources.yaml:
@@ -101,7 +84,7 @@ grafana:
         - name: prometheus
           orgId: 1
           type: prometheus
-          url: https://prometheus.staging.mybinder.org
+          url: https://prometheus.ovh.staging.mybinder.org
           isDefault: true
           editable: false
   persistence:
@@ -111,12 +94,10 @@ prometheus:
   server:
     ingress:
       hosts:
-        - prometheus.staging.mybinder.org
-        - prometheus.gke2.staging.mybinder.org
+        - prometheus.ovh.staging.mybinder.org
       tls:
         - hosts:
-            - prometheus.staging.mybinder.org
-            - prometheus.gke2.staging.mybinder.org
+            - prometheus.ovh.staging.mybinder.org
           secretName: kubelego-tls-prometheus
     persistentVolume:
       size: 12G
@@ -126,8 +107,8 @@ prometheus:
 ingress-nginx:
   controller:
     replicaCount: 2
-    service:
-      loadBalancerIP: 35.222.35.25
+    # service:
+    #   loadBalancerIP: 35.222.35.25
     resources:
       requests:
         cpu: 10m
@@ -139,8 +120,7 @@ ingress-nginx:
 static:
   ingress:
     hosts:
-      - static.staging.mybinder.org
-      - static.gke2.staging.mybinder.org
+      - static.ovh.staging.mybinder.org
 
 redirector:
   enabled: true
@@ -156,14 +136,13 @@ matomo:
     instanceName: binderhub-288415:us-central1:matomo-staging
   trustedHosts:
     - staging.mybinder.org
-    - gke2.staging.mybinder.org
   ingress:
     hosts:
       - staging.mybinder.org
-      - gke2.staging.mybinder.org
 
 analyticsPublisher:
-  enabled: true
+  # FIXME: Enable this
+  enabled: false
   project: binderhub-288415
   destinationBucket: binder-staging-events-archive
   events:
@@ -177,7 +156,8 @@ 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
@@ -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.org
       weight: 100
-      health: https://notebooks.gesis.org/binder/health
-      versions: https://notebooks.gesis.org/binder/versions
+      health: https://ovh.staging.mybinder.org/health
+      versions: https://ovh.staging.mybinder.org/versions

terraform/ovh/main.tf

@@ -21,14 +21,6 @@ terraform {
 }
 
 provider "ovh" {
-  endpoint = "ovh-us"
+  endpoint = var.endpoint
   # credentials loaded via source ./secrets/ovh-creds.sh
 }
-
-locals {
-  # FIXME: Turn this into variables when we have more than 1
-  service_name = "5e4c805d3c614a1085d7b7bc1fee46d6" # id of the project `mybinder-2i2c`
-  # Locate near our hetzner nodes, just in case we want to do data transfer in the future
-  region = "US-EAST-VA"
-}
-

terraform/ovh/registry.tf

@@ -1,17 +1,14 @@
 data "ovh_cloud_project_capabilities_containerregistry_filter" "registry_plan" {
-  service_name = local.service_name
-  # SMALL is 200GB (too small)
-  # MEDIUM is 600GB
-  # LARGE is 5TiB
-  plan_name = "LARGE"
-  region    = local.region
+  service_name = var.service_name
+  plan_name = var.registry_plan
+  region    = var.region
 }
 
 resource "ovh_cloud_project_containerregistry" "registry" {
-  service_name = local.service_name
+  service_name = var.service_name
   plan_id      = data.ovh_cloud_project_capabilities_containerregistry_filter.registry_plan.id
   region       = data.ovh_cloud_project_capabilities_containerregistry_filter.registry_plan.region
-  name         = "mybinder-ovh"
+  name         = var.registry_name
 }
 
 # admin user (needed for harbor provider)

terraform/ovh/staging.tfvars

@@ -0,0 +1,7 @@
+endpoint = "ovh-us"
+
+service_name = "5e4c805d3c614a1085d7b7bc1fee46d6"
+region = "US-EAST-VA"
+
+registry_plan = "SMALL"
+registry_name = "mybinder-ovh-staging"

terraform/ovh/variables.tf

@@ -0,0 +1,45 @@
+variable "endpoint" {
+  type        = string
+  description = <<-EOT
+  OVH Endpoint to use for making API calls
+
+  One of "ovh-us", "ovh-ca" or "ovh-eu", based on which *kind of OVH account*
+  is being used.
+  EOT
+}
+
+
+variable "region" {
+  type        = string
+  description = <<-EOT
+  OVH Region to put all infrastructure in
+  EOT
+}
+
+
+variable "service_name" {
+  type        = string
+  description = <<-EOT
+  OVH Public Cloud Project ID to create infrastructure in
+  EOT
+}
+
+variable "registry_name" {
+  type        = string
+  description = <<-EOT
+  Name of the managed registry to create
+  EOT
+}
+
+variable "registry_plan" {
+  type        = string
+  description = <<-EOT
+  What registry plan to put this registry on.
+
+  Options are:
+
+    - SMALL is 200GB (too small for production loads)
+    - MEDIUM is 600GB
+    - LARGE is 5TiB
+  EOT
+}