Merge branch 'main' into move

.github/workflows/cd.yml

@@ -99,7 +99,7 @@ jobs:
           fetch-depth: 0
 
       - name: "Stage 0: Setup Python"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         id: setup-python
         with:
           python-version-file: ".python-version"
@@ -138,7 +138,7 @@ jobs:
 
       # Action Repo: https://github.com/google-github-actions/setup-gcloud
       - name: "Stage 1: Install gcloud ${{ env.GCLOUD_SDK_VERION }}"
-        uses: google-github-actions/setup-gcloud@v1
+        uses: google-github-actions/setup-gcloud@v2
         with:
           version: ${{ env.GCLOUD_SDK_VERION }}
 
@@ -250,7 +250,7 @@ jobs:
           fetch-depth: 0
 
       - name: "Stage 0: Setup Python"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         id: setup-python
         with:
           python-version-file: ".python-version"
@@ -290,7 +290,7 @@ jobs:
 
       - name: "Stage 1: Install gcloud ${{ env.GCLOUD_SDK_VERION }}"
         if: matrix.federation_member == 'prod'
-        uses: google-github-actions/setup-gcloud@v1
+        uses: google-github-actions/setup-gcloud@v2
         with:
           version: ${{ env.GCLOUD_SDK_VERION }}
 

.github/workflows/prune-harbor.yaml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 

.github/workflows/terraform-deploy-aws-curvenote.yml

@@ -89,7 +89,7 @@ jobs:
 
       - name: Upload plan
         if: steps.terraform-plan.outputs.apply == 'true'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.TFPLAN }}
           path: ${{ env.WORKDIR }}/${{ env.TFPLAN }}.enc
@@ -122,7 +122,7 @@ jobs:
           role-session-name: terraform-apply
 
       - name: Download plan
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.TFPLAN }}
           path: ${{ env.WORKDIR }}

.github/workflows/terraform.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version-file: ".python-version"
 

.github/workflows/test-helm-template.yaml

@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version-file: ".python-version"
 

.github/workflows/test-yamllint.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version-file: ".python-version"
 

.github/workflows/watch-dependencies.yaml

@@ -44,7 +44,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -174,7 +174,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 23.12.1
     hooks:
       - id: black
         args:
@@ -34,15 +34,15 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         args:
           - --profile=black
 
   # Autoformat: js, html, markdown, yaml, json
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         exclude_types:

images/analytics-publisher/requirements.txt

@@ -12,6 +12,7 @@ charset-normalizer==2.1.1
     # via requests
 google-api-core[grpc]==2.10.2
     # via
+    #   google-api-core
     #   google-cloud-appengine-logging
     #   google-cloud-core
     #   google-cloud-logging
@@ -55,7 +56,7 @@ grpcio-status==1.50.0
     # via google-api-core
 idna==3.4
     # via requests
-jinja2==3.1.2
+jinja2==3.1.3
     # via -r requirements.in
 markupsafe==2.1.1
     # via jinja2

mybinder/Chart.yaml

@@ -17,7 +17,7 @@ dependencies:
   # Source code:   https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx
   # App changelog: https://github.com/kubernetes/ingress-nginx/blob/main/Changelog.md
   - name: ingress-nginx
-    version: "4.8.4"
+    version: "4.9.0"
     repository: https://kubernetes.github.io/ingress-nginx
     condition: ingress-nginx.enabled
 
@@ -33,14 +33,14 @@ dependencies:
   # Source code:   https://github.com/grafana/helm-charts/tree/main/charts/grafana
   # App changelog: https://github.com/grafana/grafana/blob/main/CHANGELOG.md
   - name: grafana
-    version: "7.0.17"
+    version: "7.1.0"
     repository: https://grafana.github.io/helm-charts
     condition: grafana.enabled
 
   # cryptnono, counters crypto mining
   # Source code: https://github.com/cryptnono/cryptnono/
   - name: cryptnono
-    version: "0.3.1-0.dev.git.103.h8646c67"
+    version: "0.3.1-0.dev.git.124.ha9d46de"
     repository: https://cryptnono.github.io/cryptnono/
     condition: cryptnono.enabled
 

mybinder/values.yaml

@@ -5,6 +5,10 @@ cryptnono:
     execwhacker:
       metrics:
         enabled: true
+      # execwhacker needs access to containerd, and docker on build hosts, to lookup the container.
+      # Override if K8s uses a different path for containerd
+      containerdHostPath: /run/containerd/containerd.sock
+      dockerHostPath: /run/dind/docker.sock
 
 imagePullSecrets:
 

requirements.txt

@@ -46,7 +46,7 @@ pyasn1-modules==0.2.8
     # via google-auth
 pyparsing==3.0.9
     # via packaging
-pytest==7.4.3
+pytest==7.4.4
     # via
     #   -r requirements.in
     #   pytest-rerunfailures