From 3eefa9d206e4c958ad3ef41cb8634fb27b8530cf Mon Sep 17 00:00:00 2001 From: Vivian Rook <91909295+vivian-rook@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:53:34 -0400 Subject: [PATCH 1/3] Upgrade pywikibot (#405) * Upgrade pywikibot Bug: T363131 * auto update of tag --------- Co-authored-by: Github Action --- images/singleuser/Dockerfile | 2 +- paws/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile index bf0dc727..8b46987d 100644 --- a/images/singleuser/Dockerfile +++ b/images/singleuser/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 -ENV PYWIKIBOT_VERSION=9.0.0 +ENV PYWIKIBOT_VERSION=9.1.1 ENV EDITOR=/bin/nano ENV PYWIKIBOT_DIR=/srv/paws ENV DEBIAN_FRONTEND=noninteractive diff --git a/paws/values.yaml b/paws/values.yaml index 80a2daee..1b673696 100644 --- a/paws/values.yaml +++ b/paws/values.yaml @@ -280,7 +280,7 @@ jupyterhub: fsGid: 52771 image: name: quay.io/wikimedia-paws-prod/singleuser - tag: pr-402 # singleuser tag managed by github actions + tag: pr-405 # singleuser tag managed by github actions pullPolicy: Always memory: guarantee: 0.70G From 584e8caada8b602871ec0ded035be34680ee41bc Mon Sep 17 00:00:00 2001 From: Vivian Rook <91909295+vivian-rook@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:24:49 -0400 Subject: [PATCH 2/3] upgrade openrefine (#406) * upgrade openrefine Bug: T363732 * auto update of tag --------- Co-authored-by: Github Action --- images/singleuser/Dockerfile | 2 +- paws/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile index 8b46987d..2e64207a 100644 --- a/images/singleuser/Dockerfile +++ b/images/singleuser/Dockerfile @@ -157,7 +157,7 @@ USER root ENV OPENREFINE_DIR /srv/openrefine ENV PATH=$PATH:$OPENREFINE_DIR RUN mkdir -p ${OPENREFINE_DIR} && cd ${OPENREFINE_DIR} && \ - curl -L 'https://github.com/OpenRefine/OpenRefine/releases/download/3.7.9/openrefine-linux-3.7.9.tar.gz' | tar xzf - --strip=1 + curl -L 'https://github.com/OpenRefine/OpenRefine/releases/download/3.8.0/openrefine-linux-3.8.0.tar.gz' | tar xzf - --strip=1 USER root RUN apt-get install --yes unzip diff --git a/paws/values.yaml b/paws/values.yaml index 1b673696..03bbd852 100644 --- a/paws/values.yaml +++ b/paws/values.yaml @@ -280,7 +280,7 @@ jupyterhub: fsGid: 52771 image: name: quay.io/wikimedia-paws-prod/singleuser - tag: pr-405 # singleuser tag managed by github actions + tag: pr-406 # singleuser tag managed by github actions pullPolicy: Always memory: guarantee: 0.70G From 08fb7a35eaa537dc1f74cc701dd3a9ca7cadf4c4 Mon Sep 17 00:00:00 2001 From: Vivian Rook <91909295+vivian-rook@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:00:42 -0400 Subject: [PATCH 3/3] remove 123-13 cluster (#407) Bug: T363827 --- tofu/123_13.tf | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 tofu/123_13.tf diff --git a/tofu/123_13.tf b/tofu/123_13.tf deleted file mode 100644 index f275a037..00000000 --- a/tofu/123_13.tf +++ /dev/null @@ -1,28 +0,0 @@ -resource "openstack_containerinfra_cluster_v1" "k8s_123_13" { - name = "paws${var.name[var.datacenter]}-123-13" - cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_123_13.id - master_count = 1 - node_count = var.workers[var.datacenter] -} - -resource "openstack_containerinfra_clustertemplate_v1" "template_123_13" { - name = "paws${var.name[var.datacenter]}-123-13" - coe = "kubernetes" - dns_nameserver = "8.8.8.8" - docker_storage_driver = "overlay2" - docker_volume_size = var.volume_size[var.datacenter] - external_network_id = var.external_network_id[var.datacenter] - fixed_subnet = var.fixed_subnet[var.datacenter] - fixed_network = var.fixed_network[var.datacenter] - flavor = var.worker_flavor[var.datacenter] - floating_ip_enabled = "false" - image = "Fedora-CoreOS-38" - master_flavor = var.control_flavor[var.datacenter] - network_driver = "flannel" - - labels = { - kube_tag = "v1.23.15-rancher1-linux-amd64" - hyperkube_prefix = "docker.io/rancher/" - cloud_provider_enabled = "true" - } -}