Merge pull request #5840 from shaneknapp/yaml-lint-fixes

[DH-227] i ran yamllint and fixed all of the pertinent errors
berkeley-dsep-infra · Jul 8, 2024 · 88212af · 88212af
2 parents 98e69a9 + db6983b
commit 88212af
Show file tree

Hide file tree

Showing 26 changed files with 40 additions and 58 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -170,7 +170,7 @@ jobs:
             export PULL_REQUEST_ID=$(git log -1 --pretty=%B | head -n1 | sed 's/^.*#\([0-9]*\).*/\1/')
             export AUTHOR_NAME="$(git log  -1 --pretty=%aN)"
             export PULL_REQUEST_TITLE="$(git log --pretty=%B -1 | tail -n+3)"
-            
+
             # added by sknapp 2023-12-19 to unblock builds
             # python3 scripts/post-grafana-annotation.py  \
             #   --grafana-url http://grafana.datahub.berkeley.edu\
@@ -252,7 +252,7 @@ jobs:
           command: |
             hubploy deploy --timeout 30m edx hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
-      
+
       - run:
           name: Deploy eecs
           command: |

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,15 +1,15 @@
 name: Bug Report
 description: Raise issues here
 labels: "bug"
-assignees: 
+assignees:
 - felder
 - balajialg
 - shaneknapp
 body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to help us improve Datahub! Please follow the sections in the template and provide as much information as possible 	
+        Thanks for taking the time to help us improve Datahub! Please follow the sections in the template and provide as much information as possible
   - type: textarea
     attributes:
       label: Bug description

diff --git a/.github/ISSUE_TEMPLATE/cpu_template.yml b/.github/ISSUE_TEMPLATE/cpu_template.yml
@@ -1,14 +1,14 @@
 name: CPU Request
 description: Raise more CPU for students in your class
 labels: "support"
-assignees: 
+assignees:
 - felder
 - shaneknapp
 body:
   - type: markdown
     attributes:
       value: |
-        Please provide details for your CPU request! 
+        Please provide details for your CPU request!
   - type: textarea
     attributes:
       label: Reason for the request
@@ -24,7 +24,7 @@ body:
   - type: input
     attributes:
       label: Duration for this request
-      description: Share the specific date(s)(MM/DD) & time (if applicable) when you require additional CPU resources. 
+      description: Share the specific date(s)(MM/DD) & time (if applicable) when you require additional CPU resources.
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/data_archival_request.yml b/.github/ISSUE_TEMPLATE/data_archival_request.yml
@@ -9,7 +9,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please follow the sections in the template and provide us the information required to retrieve your files! 	
+        Please follow the sections in the template and provide us the information required to retrieve your files!
   - type: textarea
     attributes:
       label: Your UC Berkeley Email Address

diff --git a/.github/ISSUE_TEMPLATE/package_request.yml b/.github/ISSUE_TEMPLATE/package_request.yml
@@ -67,4 +67,4 @@ body:
       value: |
         <!-- Any specific date(s) (MM/DD) that we should know about to prioritize this request at our end? -->
     validations:
-      required: true 
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/performance_issue.yml b/.github/ISSUE_TEMPLATE/performance_issue.yml
@@ -106,6 +106,6 @@ body:
   - type: textarea
     attributes:
       label: Additional comments
-      description: Anything else you want to share with us? (Deadline to fix these issues, information about students who are having these issues etc..) 
+      description: Anything else you want to share with us? (Deadline to fix these issues, information about students who are having these issues etc..)
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/resourcescheduler.yml b/.github/ISSUE_TEMPLATE/resourcescheduler.yml
@@ -1,7 +1,7 @@
 name: Request to schedule events to increase compute
 description: Schedule specific dates/times when your coursework requires higher computing resources
 labels: "support"
-title: Increase compute resources for Course XXX between specific date(s)/time(s) 
+title: Increase compute resources for Course XXX between specific date(s)/time(s)
 assignees:
   - felder
   - balajialg
@@ -39,7 +39,7 @@ body:
       required: true
   - type: textarea
     attributes:
-      label: Request Deadline 
+      label: Request Deadline
       description: Sepcify the time duration for which you are expecting this increase in compute
       value: |
         <!-- Specify the start date/time and end date/time -->

diff --git a/.github/workflows/prevent-prod-merges.yml b/.github/workflows/prevent-prod-merges.yml
@@ -2,7 +2,7 @@ name: Only allow staging -> prod & !prod -> staging merges
 
 on:
   pull_request:
-    branches: 
+    branches:
     - staging
     - prod
 
@@ -15,4 +15,4 @@ jobs:
         # All branches *except* prod can be merged into staging
         # *Only* staging can be merged into prod
         echo "Merging ${GITHUB_HEAD_REF} into ${GITHUB_BASE_REF}"
-        python3 -c 'import os, sys; sys.exit(not(os.environ["GITHUB_HEAD_REF"] == "staging" if os.environ["GITHUB_BASE_REF"] == "prod" else os.environ["GITHUB_HEAD_REF"] != "prod"))'
+        python3 -c 'import os, sys; sys.exit(not(os.environ["GITHUB_HEAD_REF"] == "staging" if os.environ["GITHUB_BASE_REF"] == "prod" else os.environ["GITHUB_HEAD_REF"] != "prod"))'
diff --git a/.sops.yaml b/.sops.yaml
@@ -4,4 +4,4 @@ creation_rules:
   - path_regex: support/secrets.yaml
     gcp_kms: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops
   - path_regex: node-placeholder/secrets.yaml
-    gcp_kms: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops
+    gcp_kms: projects/ucb-datahub-2018/locations/global/keyRings/datahub/cryptoKeys/sops
diff --git a/.yamllint.yaml b/.yamllint.yaml
@@ -15,6 +15,7 @@ extends: default
 
 ignore: |
   **/template/**
+  **/templates/**
 
 rules:
   braces:

diff --git a/chartpress.yaml b/chartpress.yaml
@@ -13,4 +13,4 @@ charts:
     imagePrefix: us-central1-docker.pkg.dev/ucb-datahub-2018/core/
     images:
       node-placeholder-scaler:
-        valuesPath: image
+        valuesPath: image
diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml
@@ -24,7 +24,7 @@ dependencies:
 - websockify==0.11.0
 - pip==23.0.1
 - jupyterthemes==0.20.0
-- jupyterlab-accessible-themes==0.1.1  
+- jupyterlab-accessible-themes==0.1.1
 - jupyterlab_pygments==0.2.2
 - pip:
   #- -r infra-requirements.txt

diff --git a/deployments/cee/image/environment.yml b/deployments/cee/image/environment.yml
@@ -6,7 +6,7 @@ channels:
 dependencies:
 - python=3.11.*
 - jupyter-server-proxy==4.2.0
-#adding math functionality 
+#adding math functionality
 - matplotlib=3.7.*
 - scipy=1.10.*
 - mpld3=0.5.*
@@ -24,7 +24,7 @@ dependencies:
 # For desktop environment
   - jupyter-desktop-server==0.1.3
   - -r infra-requirements.txt
-  - otter-grader==3.1.4  
+  - otter-grader==3.1.4
   # for notebook exporting
   - nbconvert==7.6.0
   - nb2pdf==0.6.2

diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
@@ -111,7 +111,6 @@ jupyterhub:
       #course::1531798::group::Admins: # Spring 2024, Data 100 Admins, ensured 4G RAM
       #  mem_limit: 4G
       #  mem_guarantee: 4G
-
     admin:
       mem_guarantee: 2G
       extraVolumeMounts:

diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml
@@ -91,21 +91,6 @@ jupyterhub:
         c.Spawner.pre_spawn_hook = ensure_db_pvc
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2024-05-08
-    config:
-    loadRoles:
-      # Data 101, SP 2024, #5508
-      #course-staff-1532753:
-      #  description: Enable course staff to view and access servers.
-        # this role provides permissions to...
-      #  scopes:
-      #    - admin-ui
-      #    - list:users!group=course::1532753
-      #    - admin:servers!group=course::1532753
-      #    - access:servers!group=course::1532753
-        # this role will be assigned to...
-      #  groups:
-      #    - course::1532753::enrollment_type::teacher
-      #    - course::1532753::enrollment_type::ta
 
   singleuser:
     extraContainers:

diff --git a/deployments/data102/config/common.yaml b/deployments/data102/config/common.yaml
@@ -80,4 +80,3 @@ jupyterhub:
       guarantee: 1G
       limit: 2G
     image: {}
-    defaultUrl: "/lab"
diff --git a/deployments/data102/hubploy.yaml b/deployments/data102/hubploy.yaml
@@ -3,7 +3,7 @@ images:
     - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image
       path: image/
       repo2docker:
-        base_image: docker.io/library/buildpack-deps:jammy	
+        base_image: docker.io/library/buildpack-deps:jammy
 
   registry:
     provider: gcloud

diff --git a/deployments/data102/image/environment.yml b/deployments/data102/image/environment.yml
@@ -30,7 +30,7 @@ dependencies:
 - pandoc==3.1.3
 # data102, Fall 2023, https://github.com/berkeley-dsep-infra/datahub/issues/5037
 - pymc==5.8.1
-- python-graphviz==0.20.1 
+- python-graphviz==0.20.1
 - scikit-learn==1.2.2
 - scipy==1.10.1
 - seaborn==0.12.2

diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml
@@ -5,6 +5,11 @@ nfsPVC:
 
 jupyterhub:
   custom:
+    group_profiles:
+      # DataHub Infrastructure staff
+      # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
+      course::1524699::group::all-admins:
+        admin: true
     admin:
       extraVolumeMounts:
         - name: home
@@ -97,10 +102,3 @@ jupyterhub:
     memory:
       guarantee: 1G
       limit: 1G
-
-  custom:
-    group_profiles:
-      # DataHub Infrastructure staff
-      # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
-      course::1524699::group::all-admins:
-        admin: true
diff --git a/deployments/data8/hubploy.yaml b/deployments/data8/hubploy.yaml
@@ -3,7 +3,7 @@ images:
     - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data8-user-image
       path: image/
       repo2docker:
-        base_image: docker.io/library/buildpack-deps:jammy 
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:

diff --git a/deployments/dev/config/common.yaml b/deployments/dev/config/common.yaml
@@ -117,7 +117,7 @@ jupyterhub:
   #      admin: true
   #      mem_limit: 2096M
   #      mem_guarantee: 2048M
- 
+
       ## Datahub Discovery Program, Summer 2024, #DH-303
       course::1524699::group::datahub-discovery-su24-interns:
         mem_limit: 12288M #12 GB RAM should be enough for parsing data and generating dashboards

diff --git a/deployments/stat159/image/environment.yml b/deployments/stat159/image/environment.yml
@@ -38,7 +38,7 @@ dependencies:
   - ipywidgets==8.0.7
   - jupyter-resource-usage==0.7.1
   # commented out by sknapp 2024.01.11 due to JL4 incompatibility
-  # 
+  #
   # we can revisit once this class is taught again
   #
   # - jupyter_bokeh==3.0.5
@@ -56,7 +56,7 @@ dependencies:
   # LSP for JupyterLab/Python - enhanced completions/language support
   - jupyterlab-lsp==5.0.0
   - python-lsp-server==1.7.0
-  
+
   - jupyterlab-variableinspector==3.0.9
   - jupyterlab-myst==2.1.0
   - jupyterlab_pygments==0.2.2
@@ -68,13 +68,13 @@ dependencies:
   - matplotlib==3.8.*
   - matplotlib-inline==0.1.6
   - mock==5.0.1
-  
+
   # nbdime 3.1.1 is incompatible with jupyter server 2.0
   # See https://github.com/jupyter/nbdime/pull/649.
   # Use manual pip install from git (see below), revert once
   # official compatible release is available.
   #- nbdime==3.1.1
-  
+
   - nbgitpuller==1.2.1
   - networkx==3.0
   - numba==0.59.1
@@ -130,10 +130,10 @@ dependencies:
   # ----------------- Hub-only section ----------------------------
 
   # Packages needed only on the hub (mostly linux)
-  # If installing this environment on a personal machine, 
+  # If installing this environment on a personal machine,
   # comment these out (but not the pip section below)
   - micro==2.0.8
-  - python-pdfkit==1.0.0 
+  - python-pdfkit==1.0.0
   - syncthing==1.23.0
   - websockify==0.11.0
 
@@ -157,7 +157,7 @@ dependencies:
     # ----------------- Hub-only section ----------------------------
 
     # Packages needed only on the hub (mostly linux)
-    # If installing this environment on a personal machine, 
+    # If installing this environment on a personal machine,
     # comment these out
     - jupyter-remote-desktop-proxy==2.0.0
     # syncthing for dropbox-like functionality

diff --git a/deployments/stat20/image/environment.yml b/deployments/stat20/image/environment.yml
@@ -10,7 +10,7 @@ dependencies:
 # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048
 - traitlets=5.9.*
 # for usage analysis dashboard (to be removed during sp 24 maintenance window)
-- pandas==2.2.1 
+- pandas==2.2.1
 - matplotlib==3.8.3
 - pip:
   - -r /tmp/infra-requirements.txt

diff --git a/deployments/workshop/hubploy.yaml b/deployments/workshop/hubploy.yaml
@@ -14,4 +14,4 @@ cluster:
     project: ucb-datahub-2018
     service_key: gke-key.json
     cluster: spring-2024
-    zone: us-central1
+    zone: us-central1
diff --git a/support/templates/pd-ssd.yaml b/support/templates/pd-ssd.yaml
@@ -6,4 +6,4 @@ metadata:
   name: ssd
 provisioner: kubernetes.io/gce-pd
 parameters:
-  type: pd-ssd
+  type: pd-ssd
diff --git a/vendor/google/gke/node-pool/config/core-pool-sysctl.yaml b/vendor/google/gke/node-pool/config/core-pool-sysctl.yaml
@@ -13,7 +13,7 @@ linuxConfig:
    # man page:
    # https://man7.org/linux/man-pages/man7/tcp.7.html
    #
-   # figures below are measured in units of system page size (4096B), 
+   # figures below are measured in units of system page size (4096B),
    # and gleaned from the following articles:
    # https://cromwell-intl.com/open-source/performance-tuning/tcp.html
    # https://www.ibm.com/docs/en/linux-on-systems?topic=tuning-tcpip-ipv4-settings
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ extends: default @@
     ignore: |
       **/template/**
+      **/templates/**
     rules:
       braces:
@@ Expand Down @@