Merge branch 'main' into patch-1

ansible/paws.yaml

@@ -75,7 +75,6 @@
         name: metrics
         kind: Namespace
         state: present
-      register: prometheus
 
     - name: Prometheus
       kubernetes.core.helm:
@@ -95,10 +94,6 @@
         template: "templates/prometheus-ingress.yaml.j2"
         namespace: metrics
 
-    - name: Pull in previous prometheus data
-      ansible.builtin.script: files/prometheus-data.sh
-      when: prometheus.changed
-
     - name: Add jupyterhub chart repo
       kubernetes.core.helm_repository:
         name: jupyterhub
@@ -115,8 +110,3 @@
           - ../paws/{{ env_file }}.yaml
         timeout: '50m'
         dependency_update: true
-
-    - name: and psp.yaml
-      kubernetes.core.k8s:
-        state: present
-        definition: "{{ lookup('template', 'files/psp.yaml.j2') }}"

deploy.sh

@@ -42,9 +42,6 @@ fi
 
 source secrets-${datacenter}.sh
 
-# save current kube.config in case we need to transfer prometheus data
-cp $(pwd)/tofu/kube.config /tmp/kube.config.previous || true # if it isn't there just keep going
-
 python3 -m venv .venv/deploy
 source .venv/deploy/bin/activate
 pip install ansible==8.1.0 kubernetes==26.1.0
@@ -54,7 +51,6 @@ cd tofu
 AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu init -backend-config=${datacenter}-backend.conf
 AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu apply -var datacenter=${datacenter}
 export KUBECONFIG=$(pwd)/kube.config
-cp $(pwd)/kube.config /tmp/kube.config.current
 
 if [ "${tofuonly}" = '1' ]
 then

images/minesweeper/requirements.txt

@@ -14,7 +14,7 @@ charset-normalizer==3.2.0
     # via requests
 google-auth==2.22.0
     # via kubernetes
-idna==3.4
+idna==3.7
     # via requests
 kubernetes==27.2.0
     # via -r requirements.in

images/singleuser/Dockerfile

@@ -45,7 +45,7 @@ RUN pip --no-cache-dir install -U pip setuptools wheel
 # Install base notebook packages
 RUN pip install --prefix=/srv/paws --no-cache-dir \
     jupyterhub==4.1.1 \
-    jupyterlab==4.1.6
+    jupyterlab==4.1.8
 
 ## End minimal setup ##
 
@@ -137,7 +137,6 @@ RUN sed -i -e '/^R_LIBS_USER=/s/^/#/' /etc/R/Renviron && \
 USER ${NB_USER}
 RUN pip install --no-cache-dir \
     jupyter-server-proxy \
-    rpy2 \
     jupyter-rsession-proxy
 
 # Set CRAN mirror to rspm before we install anything

paws/values.yaml

@@ -309,7 +309,7 @@ minesweeper:
   enabled: false  # most local-dev testers won't have the key to configs
   image:
     name: quay.io/wikimedia-paws-prod/minesweeper
-    tag: pr-340 # minesweeper tag managed by github actions
+    tag: pr-400 # minesweeper tag managed by github actions
     template: "{{ .Values.minesweeper.image.name }}:{{ .Values.minesweeper.image.tag }}"
 # If not deployed for prod use, we use the some hacks for testing
 localdev:

tofu/123_13.tf

@@ -5,11 +5,6 @@ resource "openstack_containerinfra_cluster_v1" "k8s_123_13" {
   node_count          = var.workers[var.datacenter]
 }
 
-resource "local_file" "kube_config" {
-  content  = resource.openstack_containerinfra_cluster_v1.k8s_123_13.kubeconfig.raw_config
-  filename = "kube.config"
-}
-
 resource "openstack_containerinfra_clustertemplate_v1" "template_123_13" {
   name                  = "paws${var.name[var.datacenter]}-123-13"
   coe                   = "kubernetes"