Skip to content

Commit

Permalink
Move pilot-hubs to new cluster
Browse files Browse the repository at this point in the history
- Setup core, user and dask worker pods to match current
  configuration
- User and dask worker pods will switch to e2- instances rather
  than n1- instances - our usage is not constant enough to get
  the esustained use discounts
- It's called 'pilot-hubs' now, rather than the older terminology
  of 'low-touch-hubs'.
- Point to new docker registry - an image has been built and
  pushed there.
  • Loading branch information
yuvipanda committed Jun 8, 2021
1 parent d362b5d commit d447f9a
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 33 deletions.
6 changes: 3 additions & 3 deletions config/hubs/2i2c.cluster.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: 2i2c
image_repo: "us-central1-docker.pkg.dev/two-eye-two-see/low-touch-hubs/base-user"
image_repo: "us-central1-docker.pkg.dev/two-eye-two-see/pilot-hubs-registry/base-user"
provider: gcp
gcp:
key: secrets/2i2c.json
key: secrets/pilot-hubs.json
project: two-eye-two-see
cluster: low-touch-hubs-cluster
cluster: pilot-hubs-cluster
zone: us-central1-b
hubs:
- name: staging
Expand Down
29 changes: 0 additions & 29 deletions secrets/2i2c.json

This file was deleted.

12 changes: 12 additions & 0 deletions secrets/pilot-hubs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "service_account",
"project_id": "two-eye-two-see",
"private_key_id": "d1f4f9fe0e2b825058760b7bc2c197b744316dae",
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCh0Z6I9nind65F\nY4XXHLtFenLm9KerA0qjnKmZYRP3u+jCgeWrOfwJXepxLD5HjnS2ymP4jcD62xOh\ngfqLegtJpz+pv9BlW5QgJ93Uv3BEB0gRQXzSjFovgo6JRUi0T5VNTJ3gjNsf6vWP\nc+x9K8kTcFs1gss4bd+NcUFoY+MprwPolRkIgzc0aFezh1LxvrY0ZmucQ8g3lK1w\nQ1UHmJKCFozbrnfv5g/rDZ89Ig6YTNyyet+fyjuREbbnJaElXwC07BpQqHO+Su+Q\nIO0bzOvq2E9uHKD/E89NzBkzKieEWqhAHXx3iMSZ2HaGh5nLqF3t/bLdwY207H1q\n1G52gpWtAgMBAAECggEAASf6gj+Ckq29+sRwhR4xL1il4AUQ+p2SJ7ObmZsyNZOr\n4NHlRnEqXhXD8k2O31uC9XhiOPkoTxKIJCAF3n+/e2X8xDV443SBTS6DvPymLHJB\n30+wuN9kWJEN/CiY0aL87dm1ihBvk12OJhl9r9JDhEZJ/Iqj8ZIFZiEQRtLp4Vca\nHte6lz95zqQ0EutZh1W2LXtGhVfviYSike3435yjA0U9mXcMSyh3a/VD6poNdN2x\noSWKnTobTnLej8MfjjoIxOkxbnvHPVipLJFC3qQkz5KRuqsQnUbobzlySF2cGxhU\nyFuSbK1GNaQLJALXRik8fzzRcEoqW8kuOAvJOJQVQQKBgQDSOhOv4ukcKgI419W2\nr4xozdAH9nirIORx4KANbvnwlhfE0XL9fImka1nRGIt1GMkpnZrE1YjaURx1O4p/\n9fKLsrr49sv+M7pvoHtkreA1QZe1axKzQLxmi+JAaVbJPu8ZinIivJ/xGbnDjzLW\naN6rHzGl5RegXPF0FVYqoNn/wQKBgQDFDU53PM0Oieor6YpGdbrWhV2qhOCjMjQU\nb37B4MfXagLz8C7DMBwAHDwBm2EgTulBLahValKVS1fL6uyNp2D6b/dDspZ+fnRV\nKt0yGf8OBHueZHeHDBmDv2G15rlHMnTIJfZeprV/N0StvhKXX8Z36dLsyvS/CTto\n4q4X5eTQ7QKBgQC7WjLNX2XsSavtSL0XsF9rz3AEiK2FpSyyKEO7dRmeRcUtDJR0\nQBbSxzEmXb97PfmY8vJJVRw/pGW+PK/z1hawVTq4QgoOo78VWGpfkW3tSGWRsrjZ\ns2mz4hpi2P4VH9cqZe3N81h/IDQjimz+FDvNOWGfvQlPS0WL9K/0EaH2gQKBgGbC\nzrWt9n3rfDxUOTEPelUfDb68Nu3EY5Z4opD26SC0fz+5dJmDwEZqcvyfjCIuJMRB\nzDRnExQaS3njVGN280MHGtqqCoOC7KXxiZL0LaegvNrYJ+E8dR3Ys1sKLHstm+s4\nqOepZqMmLmGw6r8YSkcEoGOuX740UVAcTo/V6uLtAoGBAKAyZFfuaZuaZ838hFAj\n33es5UxusNArTvdDhIvZStLAsXNNipkmqC/lNDemdoQcdKI/wzQpxe8vb1kH3IeL\nIRtvJBoj0IDcNTqTPpEqdiywwMt2cSSYVnOz4JujWk1YNSZFJkfHQsxmiATHUK58\nDwoVRJ8ArGsB09qIJG6VL563\n-----END PRIVATE KEY-----\n",
"client_email": "pilot-hubs-cd-sa@two-eye-two-see.iam.gserviceaccount.com",
"client_id": "112781071152501067533",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/pilot-hubs-cd-sa%40two-eye-two-see.iam.gserviceaccount.com"
}
26 changes: 25 additions & 1 deletion terraform/projects/pilot-hubs.tfvars
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
prefix = "low-touch-hubs"
prefix = "pilot-hubs"
project_id = "two-eye-two-see"

core_node_machine_type = "n1-highmem-4"

enable_network_policy = true
config_connector_enabled = true

notebook_nodes = {
"user" : {
min : 0,
max : 20,
machine_type : "e2-highmem-4"
},
}

dask_nodes = {
"worker" : {
min : 0,
max : 100,
machine_type : "e2-highmem-4"
},
}

user_buckets = [ ]

0 comments on commit d447f9a

Please sign in to comment.