Merge branch 'main' into T329210

toolforge · May 6, 2024 · a96b519 · a96b519
2 parents 8d31f4a + a0b4f5e
commit a96b519
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 340 deletions.
diff --git a/ansible/files/csi-secret-cinderplugin.yaml.codfw1dev.crypt b/ansible/files/csi-secret-cinderplugin.yaml.codfw1dev.crypt
diff --git a/ansible/files/csi-secret-cinderplugin.yaml.eqiad1.crypt b/ansible/files/csi-secret-cinderplugin.yaml.eqiad1.crypt
diff --git a/ansible/files/prometheus-data.sh b/ansible/files/prometheus-data.sh
diff --git a/ansible/files/psp.yaml.j2 b/ansible/files/psp.yaml.j2
diff --git a/ansible/paws.yaml b/ansible/paws.yaml
@@ -75,7 +75,6 @@
         name: metrics
         kind: Namespace
         state: present
-      register: prometheus
 
     - name: Prometheus
       kubernetes.core.helm:
@@ -85,17 +84,16 @@
         chart_version: 25.11.0
         release_namespace: metrics
         create_namespace: true
+        set_values:
+          - value: prometheus.retention=30d
+            value_type: string
 
     - name: Ingress for prometheus
       kubernetes.core.k8s:
         state: present
         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
@@ -112,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') }}"
diff --git a/deploy.sh b/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

diff --git a/images/minesweeper/requirements.txt b/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

diff --git a/images/nbserve/Dockerfile b/images/nbserve/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-ARG RESTY_VERSION="1.17.8.2"
+ARG RESTY_VERSION="1.25.3.1"
 ARG RESTY_J="1"
 # ARG RESTY_OPENSSL_VERSION="1.1.1d"
 ARG RESTY_CONFIG_OPTIONS="\

diff --git a/images/nbserve/README.md b/images/nbserve/README.md
@@ -1,3 +1,3 @@
-This container is used for managing the public.paws.wmcloud.org and paws-public.wmflabs.org traffic. So public viewing of notebooks and files.
+This container is used for managing the public-paws.wmcloud.org traffic. So public viewing of notebooks and files.
 
 It also redirects files to the renderer container to be built. Also for public viewing.
diff --git a/images/paws-hub/Dockerfile b/images/paws-hub/Dockerfile
@@ -1,4 +1,4 @@
-FROM jupyterhub/k8s-hub:3.1.0
+FROM jupyterhub/k8s-hub:3.3.3
 ARG NB_USER=tools.paws
 ARG NB_UID=52771
 ARG HOME=/home/paws