Merge pull request #92 from Quansight/lineformatting

Lineformatting
nebari-dev · Sep 28, 2020 · 502661a · 502661a
2 parents 8c13b3d + ddd7c5e
commit 502661a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/qhub/VERSION b/qhub/VERSION
@@ -1 +1 @@
-0.1.15
+0.1.16
diff --git a/qhub/template/{{ cookiecutter.repo_directory }}/.github/workflows/jupyterhub-pr.yaml b/qhub/template/{{ cookiecutter.repo_directory }}/.github/workflows/jupyterhub-pr.yaml
@@ -68,8 +68,8 @@ jobs:
           tf_actions_subcommand: 'plan'
           tf_actions_working_dir: 'infrastructure'
           tf_actions_comment: true
-          {% if cookiecutter.prefect is defined %}
+          {%- if cookiecutter.prefect is defined %}
           {% raw %}
           args: '-var="prefect_token=${{ secrets.PREFECT_TOKEN }}"'
           {% endraw %}
-          {% endif %}
+          {%- endif %}
diff --git a/qhub/template/{{ cookiecutter.repo_directory }}/.github/workflows/jupyterhub.yaml b/qhub/template/{{ cookiecutter.repo_directory }}/.github/workflows/jupyterhub.yaml
@@ -69,20 +69,20 @@ jobs:
           tf_actions_subcommand: 'plan'
           tf_actions_working_dir: 'infrastructure'
           tf_actions_comment: true
-          {% if cookiecutter.prefect is defined %}
+          {%- if cookiecutter.prefect is defined %}
           {% raw %}
           args: '-var="prefect_token=${{ secrets.PREFECT_TOKEN }}"'
           {% endraw %}
-          {% endif %}
+          {%- endif %}
       - name: 'Terraform Apply'
         uses: hashicorp/terraform-github-actions@master
         with:
           tf_actions_version: 0.12.24
           tf_actions_subcommand: 'apply'
           tf_actions_working_dir: 'infrastructure'
           tf_actions_comment: true
-          {% if cookiecutter.prefect is defined %}
+          {%- if cookiecutter.prefect is defined %}
           {% raw %}
           args: '-var="prefect_token=${{ secrets.PREFECT_TOKEN }}"'
-          {% endraw %}
+          {%- endraw %}
           {% endif %}
diff --git a/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/gcp.tf b/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/gcp.tf
@@ -19,11 +19,12 @@ module "kubernetes" {
   availability_zones = var.availability_zones
 
   additional_node_group_roles = [
-    "roles/storage.objectViewer"
+    "roles/storage.objectViewer",
+    "roles/storage.admin"
   ]
 
   additional_node_group_oauth_scopes = [
-    "https://www.googleapis.com/auth/devstorage.read_only"
+    "https://www.googleapis.com/auth/cloud-platform"
   ]
 
   node_groups = [
@@ -33,19 +34,19 @@ module "kubernetes" {
       instance_type = "{{ nodegroup_config.instance }}"
       min_size      = {{ nodegroup_config.min_nodes }}
       max_size      = {{ nodegroup_config.max_nodes }}
-      {% if "preemptible" in nodegroup_config %}
+      {%- if "preemptible" in nodegroup_config %}
       preemptible   = {{ "true" if nodegroup_config.preemptible else "false" }}
-      {% endif %}
-      {% if nodegroup.guest_accelerators is defined %}
+      {%- endif %}
+      {%- if nodegroup.guest_accelerators is defined %}
       guest_accelerators = [
         {% for accelerator in nodegroup_config.guest_accelerators %}
-          {
-            type  = "{{ accelerator.name }}"
-            count = {{ accelerator.count }}
-          }
+        {
+          type  = "{{ accelerator.name }}"
+          count = {{ accelerator.count }}
+        }
         {% endfor %}
       ]
-      {% endif %}
+      {%- endif %}
     },
 {% endfor %}
   ]

diff --git a/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/variables.tf b/qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/variables.tf
@@ -86,8 +86,8 @@ variable "dask-worker-image" {
   }
 }
 
-{% if cookiecutter.prefect is defined %}
+{%- if cookiecutter.prefect is defined %}
 variable "prefect_token" {
   type = string
 }
-{% endif %}
+{%- endif %}