From 9f87a2b8ae10e3b3cf80ba1b4e002db0d96515aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taavi=20V=C3=A4=C3=A4n=C3=A4nen?= Date: Tue, 3 Feb 2026 17:14:18 +0200 Subject: [PATCH 1/3] tofu: Remove 127b cluster --- tofu/127b.tf | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 tofu/127b.tf diff --git a/tofu/127b.tf b/tofu/127b.tf deleted file mode 100644 index f571bfaa..00000000 --- a/tofu/127b.tf +++ /dev/null @@ -1,35 +0,0 @@ -resource "openstack_containerinfra_cluster_v1" "k8s_127b" { - name = "paws${var.name[var.datacenter]}-127b" - cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_127b.id - master_count = 1 - node_count = var.workers[var.datacenter] -} - -resource "openstack_containerinfra_clustertemplate_v1" "template_127b" { - name = "paws${var.name[var.datacenter]}-127b" - 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 = "calico" - - labels = { - kube_tag = "v1.27.8-rancher2" - container_runtime = "containerd" - containerd_version = "1.6.28" - containerd_tarball_sha256 = "f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b" - cloud_provider_tag = "v1.27.3" - cinder_csi_plugin_tag = "v1.27.3" - k8s_keystone_auth_tag = "v1.27.3" - magnum_auto_healer_tag = "v1.27.3" - octavia_ingress_controller_tag = "v1.27.3" - calico_tag = "v3.26.4" - } -} From 8808473ec95ef8454948d48e2d420131dbe84d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taavi=20V=C3=A4=C3=A4n=C3=A4nen?= Date: Tue, 3 Feb 2026 17:16:24 +0200 Subject: [PATCH 2/3] ansible: Bump ingress-nginx to latest version --- ansible/paws.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/paws.yaml b/ansible/paws.yaml index 38596614..d694eee8 100644 --- a/ansible/paws.yaml +++ b/ansible/paws.yaml @@ -55,7 +55,7 @@ name: ingress-nginx chart_ref: ingress-nginx chart_repo_url: https://kubernetes.github.io/ingress-nginx - chart_version: 4.12.1 + chart_version: 4.14.3 release_namespace: ingress-nginx create_namespace: true set_values: From c9c2f7fe01c33379f8247e3aa957373b9f6b964e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taavi=20V=C3=A4=C3=A4n=C3=A4nen?= Date: Tue, 3 Feb 2026 17:15:53 +0200 Subject: [PATCH 3/3] ansible: Disable ingress-nginx snippet annotations Not used AFAICS? --- ansible/paws.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible/paws.yaml b/ansible/paws.yaml index d694eee8..eaf584f6 100644 --- a/ansible/paws.yaml +++ b/ansible/paws.yaml @@ -67,8 +67,6 @@ value_type: string - value: controller.config.proxy-body-size=4m value_type: string - - value: controller.config.allow-snippet-annotations=true - value_type: string - name: Add jupyterhub chart repo kubernetes.core.helm_repository: