Skip to content

Commit

Permalink
upgrade to talos 1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rgl committed Dec 18, 2024
1 parent e474fba commit a260af8
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 48 deletions.
34 changes: 17 additions & 17 deletions .terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Install talosctl:
```bash
# see https://github.com/siderolabs/talos/releases
# renovate: datasource=github-releases depName=siderolabs/talos
talos_version='1.8.4'
talos_version='1.9.0'
wget https://github.com/siderolabs/talos/releases/download/v$talos_version/talosctl-linux-amd64
sudo install talosctl-linux-amd64 /usr/local/bin/talosctl
rm talosctl-linux-amd64
Expand Down Expand Up @@ -506,7 +506,7 @@ Update the talos extensions to match the talos version:
Talos:

```bash
# see https://www.talos.dev/v1.8/advanced/troubleshooting-control-plane/
# see https://www.talos.dev/v1.9/advanced/troubleshooting-control-plane/
talosctl -n $all support && rm -rf support && 7z x -osupport support.zip && code support
talosctl -n $c0 service ext-qemu-guest-agent status
talosctl -n $c0 service etcd status
Expand All @@ -519,8 +519,10 @@ talosctl -n $c0 inspect dependencies | dot -Tsvg >c0.svg && xdg-open c0.svg
talosctl -n $c0 dashboard
talosctl -n $c0 logs controller-runtime
talosctl -n $c0 logs kubelet
talosctl -n $c0 disks
talosctl -n $c0 mounts | sort
talosctl -n $c0 get blockdevices
talosctl -n $c0 get disks
talosctl -n $c0 get systemdisk
talosctl -n $c0 get resourcedefinitions
talosctl -n $c0 get machineconfigs -o yaml
talosctl -n $c0 get staticpods -o yaml
Expand Down
2 changes: 1 addition & 1 deletion cilium.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ locals {
cilium_external_lb_manifest = join("---\n", [for d in local.cilium_external_lb_manifests : yamlencode(d)])
}

// see https://www.talos.dev/v1.8/kubernetes-guides/network/deploying-cilium/#method-4-helm-manifests-inline-install
// see https://www.talos.dev/v1.9/kubernetes-guides/network/deploying-cilium/#method-4-helm-manifests-inline-install
// see https://docs.cilium.io/en/stable/network/servicemesh/ingress/
// see https://docs.cilium.io/en/stable/gettingstarted/hubble_setup/
// see https://docs.cilium.io/en/stable/gettingstarted/hubble/
Expand Down
18 changes: 9 additions & 9 deletions do
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ talos_image_builder="$(perl -e 'print ((`uname -r` =~ /^(\d+\.\d+)/ && $1 >= 6.1

# see https://github.com/siderolabs/talos/releases
# renovate: datasource=github-releases depName=siderolabs/talos
talos_version="1.8.4"
talos_version="1.9.0"

# see https://github.com/siderolabs/extensions/pkgs/container/qemu-guest-agent
# see https://github.com/siderolabs/extensions/tree/main/guest-agents/qemu-guest-agent
talos_qemu_guest_agent_extension_tag="9.1.0@sha256:423ca224cae8fba1e278996e83d40317dbd8863e0bbb0e6bcf5bb04bdc416717"
talos_qemu_guest_agent_extension_tag="9.1.2@sha256:a849e55254f1cd8669ab742cdcfee200aada3dfe320841af3c338dc7cec956e9"

# see https://github.com/siderolabs/extensions/pkgs/container/drbd
# see https://github.com/siderolabs/extensions/tree/main/storage/drbd
# see https://github.com/LINBIT/drbd
talos_drbd_extension_tag="9.2.11-v1.8.4@sha256:bfb643094b7578c3eabb35224daad091179dc78ce5cb96fdde6fe08327ae0629"
talos_drbd_extension_tag="9.2.12-v1.9.0@sha256:209feb3c3bb5ae3a1f43b5ec9dd55be77f958dccecc3ec39d361b4f35fde3f6c"

# see https://github.com/siderolabs/extensions/pkgs/container/spin
# see https://github.com/siderolabs/extensions/tree/main/container-runtime/spin
talos_spin_extension_tag="v0.15.1@sha256:a0cee06a768e436d93ac98b2c2e1126a01df11f5c96b87686d38b1049e5bd119"
talos_spin_extension_tag="v0.17.0@sha256:3f4cc5278d3b50b472e25e075688b1eb274e8e3f648bd25f969628bc2d69b1e1"

# see https://github.com/piraeusdatastore/piraeus-operator/releases
# renovate: datasource=github-releases depName=piraeusdatastore/piraeus-operator
Expand Down Expand Up @@ -67,9 +67,9 @@ function update-talos-extensions {
}

function build_talos_image__imager {
# see https://www.talos.dev/v1.8/talos-guides/install/boot-assets/
# see https://www.talos.dev/v1.8/advanced/metal-network-configuration/
# see Profile type at https://github.com/siderolabs/talos/blob/v1.8.3/pkg/imager/profile/profile.go#L24-L47
# see https://www.talos.dev/v1.9/talos-guides/install/boot-assets/
# see https://www.talos.dev/v1.9/advanced/metal-network-configuration/
# see Profile type at https://github.com/siderolabs/talos/blob/v1.9.0/pkg/imager/profile/profile.go#L24-L47
local talos_version_tag="v$talos_version"
rm -rf tmp/talos
mkdir -p tmp/talos
Expand Down Expand Up @@ -110,7 +110,7 @@ EOF
}

function build_talos_image__image_factory {
# see https://www.talos.dev/v1.8/learn-more/image-factory/
# see https://www.talos.dev/v1.9/learn-more/image-factory/
# see https://github.com/siderolabs/image-factory?tab=readme-ov-file#http-frontend-api
local talos_version_tag="v$talos_version"
rm -rf tmp/talos
Expand Down Expand Up @@ -222,7 +222,7 @@ function piraeus-install {
# see https://linbit.com/drbd-user-guide/linstor-guide-1_0-en/#ch-kubernetes
# see 5.7.1. Available Parameters in a Storage Class at https://linbit.com/drbd-user-guide/linstor-guide-1_0-en/#s-kubernetes-sc-parameters
# see https://linbit.com/drbd-user-guide/drbd-guide-9_0-en/
# see https://www.talos.dev/v1.8/kubernetes-guides/configuration/storage/#piraeus--linstor
# see https://www.talos.dev/v1.9/kubernetes-guides/configuration/storage/#piraeus--linstor
step 'piraeus install'
kubectl apply --server-side -k "https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v$piraeus_operator_version"
step 'piraeus wait'
Expand Down
2 changes: 1 addition & 1 deletion providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
# see https://github.com/siderolabs/terraform-provider-talos
talos = {
source = "siderolabs/talos"
version = "0.6.1"
version = "0.7.0"
}
# see https://registry.terraform.io/providers/hashicorp/helm
# see https://github.com/hashicorp/terraform-provider-helm
Expand Down
27 changes: 14 additions & 13 deletions talos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ locals {
# talos image, which is created in the installed state.
#install = {}
features = {
# see https://www.talos.dev/v1.8/kubernetes-guides/configuration/kubeprism/
# see https://www.talos.dev/v1.9/kubernetes-guides/configuration/kubeprism/
# see talosctl -n $c0 read /etc/kubernetes/kubeconfig-kubelet | yq .clusters[].cluster.server
# NB if you use a non-default CNI, you must configure it to use the
# https://localhost:7445 kube-apiserver endpoint.
kubePrism = {
enabled = true
port = 7445
}
# see https://www.talos.dev/v1.8/talos-guides/network/host-dns/
# see https://www.talos.dev/v1.9/talos-guides/network/host-dns/
hostDNS = {
enabled = true
forwardKubeDNSToHost = true
Expand Down Expand Up @@ -70,13 +70,14 @@ locals {
endpoints = [
local.zot_cluster_url,
]
skipFallback = false
}
}
}
}
cluster = {
# see https://www.talos.dev/v1.8/talos-guides/discovery/
# see https://www.talos.dev/v1.8/reference/configuration/#clusterdiscoveryconfig
# see https://www.talos.dev/v1.9/talos-guides/discovery/
# see https://www.talos.dev/v1.9/reference/configuration/#clusterdiscoveryconfig
discovery = {
enabled = true
registries = {
Expand All @@ -100,12 +101,12 @@ locals {
}
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/resources/machine_secrets
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/resources/machine_secrets
resource "talos_machine_secrets" "talos" {
talos_version = "v${var.talos_version}"
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/data-sources/machine_configuration
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/data-sources/machine_configuration
data "talos_machine_configuration" "controller" {
cluster_name = var.cluster_name
cluster_endpoint = var.cluster_endpoint
Expand All @@ -121,7 +122,7 @@ data "talos_machine_configuration" "controller" {
machine = {
network = {
interfaces = [
# see https://www.talos.dev/v1.8/talos-guides/network/vip/
# see https://www.talos.dev/v1.9/talos-guides/network/vip/
{
interface = "eth0"
dhcp = true
Expand Down Expand Up @@ -203,7 +204,7 @@ data "talos_machine_configuration" "controller" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/data-sources/machine_configuration
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/data-sources/machine_configuration
data "talos_machine_configuration" "worker" {
cluster_name = var.cluster_name
cluster_endpoint = var.cluster_endpoint
Expand All @@ -218,14 +219,14 @@ data "talos_machine_configuration" "worker" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/data-sources/client_configuration
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/data-sources/client_configuration
data "talos_client_configuration" "talos" {
cluster_name = var.cluster_name
client_configuration = talos_machine_secrets.talos.client_configuration
endpoints = [for node in local.controller_nodes : node.address]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/resources/cluster_kubeconfig
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/resources/cluster_kubeconfig
resource "talos_cluster_kubeconfig" "talos" {
client_configuration = talos_machine_secrets.talos.client_configuration
endpoint = local.controller_nodes[0].address
Expand All @@ -235,7 +236,7 @@ resource "talos_cluster_kubeconfig" "talos" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/resources/machine_configuration_apply
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/resources/machine_configuration_apply
resource "talos_machine_configuration_apply" "controller" {
count = var.controller_count
client_configuration = talos_machine_secrets.talos.client_configuration
Expand All @@ -256,7 +257,7 @@ resource "talos_machine_configuration_apply" "controller" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/resources/machine_configuration_apply
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/resources/machine_configuration_apply
resource "talos_machine_configuration_apply" "worker" {
count = var.worker_count
client_configuration = talos_machine_secrets.talos.client_configuration
Expand All @@ -277,7 +278,7 @@ resource "talos_machine_configuration_apply" "worker" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.6.1/docs/resources/machine_bootstrap
// see https://registry.terraform.io/providers/siderolabs/talos/0.7.0/docs/resources/machine_bootstrap
resource "talos_machine_bootstrap" "talos" {
client_configuration = talos_machine_secrets.talos.client_configuration
endpoint = local.controller_nodes[0].address
Expand Down
8 changes: 4 additions & 4 deletions variables.tf
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# see https://github.com/siderolabs/talos/releases
# see https://www.talos.dev/v1.8/introduction/support-matrix/
# see https://www.talos.dev/v1.9/introduction/support-matrix/
variable "talos_version" {
type = string
# renovate: datasource=github-releases depName=siderolabs/talos
default = "1.8.4"
default = "1.9.0"
validation {
condition = can(regex("^\\d+(\\.\\d+)+", var.talos_version))
error_message = "Must be a version number."
}
}

# see https://github.com/siderolabs/kubelet/pkgs/container/kubelet
# see https://www.talos.dev/v1.8/introduction/support-matrix/
# see https://www.talos.dev/v1.9/introduction/support-matrix/
variable "kubernetes_version" {
type = string
# renovate: datasource=github-releases depName=siderolabs/kubelet
Expand Down Expand Up @@ -102,7 +102,7 @@ variable "worker_count" {

variable "talos_libvirt_base_volume_name" {
type = string
default = "talos-1.8.4.qcow2"
default = "talos-1.9.0.qcow2"
validation {
condition = can(regex(".+\\.qcow2+$", var.talos_libvirt_base_volume_name))
error_message = "Must be a name with a .qcow2 extension."
Expand Down

0 comments on commit a260af8

Please sign in to comment.