Upgrade chart

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

images/singleuser/Dockerfile

@@ -44,7 +44,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.0.2 \
+    jupyterhub==4.1.1 \
     jupyterlab==4.1.5
 
 ## End minimal setup ##

paws/Chart.yaml

@@ -3,8 +3,8 @@
 apiVersion: v2
 description: A Helm chart for PAWS
 name: paws
-version: "2.10"
+version: "2.12"
 dependencies:
   - name: jupyterhub
-    version: "3.2.1"
+    version: "3.3.3"
     repository: "https://jupyterhub.github.io/helm-chart"

paws/values.yaml

@@ -254,7 +254,7 @@ jupyterhub:
       fsGroup: 52771
     image:
       name: quay.io/wikimedia-paws-prod/paws-hub
-      tag: pr-342 # paws-hub tag managed by github actions
+      tag: pr-392 # paws-hub tag managed by github actions
     containerSecurityContext:
       runAsUser: 52771
     resources:
@@ -280,7 +280,7 @@ jupyterhub:
     fsGid: 52771
     image:
       name: quay.io/wikimedia-paws-prod/singleuser
-      tag: pr-394 # singleuser tag managed by github actions
+      tag: pr-392 # singleuser tag managed by github actions
       pullPolicy: Always
     memory:
       guarantee: 0.70G

tofu/123_12.tf

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

tofu/123_13.tf

@@ -0,0 +1,33 @@
+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 "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"
+  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"
+  }
+}