mass update
All checks were successful
continuous-integration/drone/push Build is passing

- Upgrading to Terraform from 1.1.8 to 1.3.5
- Upgrading to Kubernetes from 1.23.5 to 1.25.4
- Using Q35 machine for workers
- Using UEFI for boot
- Refactored XSLT
This commit is contained in:
2022-11-28 01:25:23 +01:00
parent 2b02f2a46f
commit ad5f8a40fb
6 changed files with 116 additions and 70 deletions

View File

@@ -39,7 +39,7 @@ data "template_cloudinit_config" "worker" {
}
]
mounts = [
["datastore", "/mnt/datastore", "9p", "trans=virtio"]
["datastore", "/mnt/datastore", "9p", "trans=virtio,version=9p2000.L,rw,dirsync,cache=mmap"]
]
})
}
@@ -48,7 +48,9 @@ data "template_cloudinit_config" "worker" {
module "worker" {
source = "git@git.thomasklein.me:thomasklein/terraform-modules//lawndale-vm"
count = local.worker_count
count = local.worker_count
uefi = true
machine = "q35"
name = "k8s-worker-${count.index}"
id = local.worker_id_start + count.index
@@ -64,7 +66,7 @@ module "worker" {
root_storage_volume_size_gb = 16
base_image_pool = "base-images"
base_image_volume = "ubuntu-jammy-20220516-k8s-v1.23.5-20220517"
base_image_volume = "ubuntu-jammy-20221127-k8s-v1.25.4-20221127"
filesystems = [
{
@@ -79,23 +81,6 @@ module "worker" {
user_data = data.template_cloudinit_config.worker[count.index].rendered
### Make the workers headless
xslt = <<EOM
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" indent="yes"/>
<xsl:strip-space elements="*" />
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>
<xsl:template match="graphics" />
<xsl:template match="video" />
<xsl:template match="audio" />
<xsl:template match="input[@type='mouse']|input[@type='keyboard']" />
</xsl:stylesheet>
EOM
xslt = file("${path.module}/fixing-worker-domaindefs.xsl")
}