Skip to content

Commit

Permalink
upgrade to talos 1.8.0-alpha.2
Browse files Browse the repository at this point in the history
  • Loading branch information
rgl committed Sep 7, 2024
1 parent 7a475f6 commit 4f34d93
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 46 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.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Install talosctl:
```bash
# see https://github.com/siderolabs/talos/releases
# renovate: datasource=github-releases depName=siderolabs/talos
talos_version='1.7.6'
talos_version='1.8.0-alpha.2'
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 @@ -439,7 +439,7 @@ Update the talos extensions to match the talos version:
Talos:

```bash
# see https://www.talos.dev/v1.7/advanced/troubleshooting-control-plane/
# see https://www.talos.dev/v1.8/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 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.7/kubernetes-guides/network/deploying-cilium/#method-4-helm-manifests-inline-install
// see https://www.talos.dev/v1.8/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
16 changes: 8 additions & 8 deletions do
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ set -euo pipefail

# see https://github.com/siderolabs/talos/releases
# renovate: datasource=github-releases depName=siderolabs/talos
talos_version="1.7.6"
talos_version="1.8.0-alpha.2"

# 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="8.2.2@sha256:e8020f513f891896fd3bb506c7af8a763a3c70b063e4901caaad073b5e6e0815"
talos_qemu_guest_agent_extension_tag="9.0.2@sha256:f54ef0bf911e6ed0f01982f620ce6d32f6bc16a1220020345696a562d59346e2"

# 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.8-v1.7.6@sha256:acd871c1367ce94121689d069fd563c54ca0edac8698325f34a41dd3456eceea"
talos_drbd_extension_tag="9.2.11-v1.8.0-alpha.2@sha256:90b09ab323bbb0294ca6596826f22f59fa76d29f9dc9539187d0e1e2f3907f0b"

# 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.0@sha256:0ec7613913960c95413699a46745a788d4c22776942c2d24ebd0457f11e6be33"
talos_spin_extension_tag="v0.15.1@sha256:87c9f352e5763440df7fc27f76ea4045ca6e049023496db01a2d17ac627e0e0e"

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

function build_talos_image {
# see https://www.talos.dev/v1.7/talos-guides/install/boot-assets/
# see https://www.talos.dev/v1.7/advanced/metal-network-configuration/
# see Profile type at https://github.com/siderolabs/talos/blob/v1.7.6/pkg/imager/profile/profile.go#L22-L45
# 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.0-alpha.2/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 @@ -158,7 +158,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.7/kubernetes-guides/configuration/storage/#piraeus--linstor
# see https://www.talos.dev/v1.8/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.5.0"
version = "0.6.0-alpha.2"
}
# see https://registry.terraform.io/providers/hashicorp/helm
# see https://github.com/hashicorp/terraform-provider-helm
Expand Down
2 changes: 1 addition & 1 deletion renovate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ gitea_version='1.22.1'

# see https://hub.docker.com/r/renovate/renovate/tags
# renovate: datasource=docker depName=renovate/renovate
renovate_version='38.25.0'
renovate_version='38.55.4'

# clean.
echo 'Deleting existing Gitea...'
Expand Down
24 changes: 12 additions & 12 deletions talos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ locals {
# talos image, which is created in the installed state.
#install = {}
features = {
# see https://www.talos.dev/v1.7/kubernetes-guides/configuration/kubeprism/
# see https://www.talos.dev/v1.8/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.
Expand All @@ -43,8 +43,8 @@ locals {
}
}
cluster = {
# see https://www.talos.dev/v1.7/talos-guides/discovery/
# see https://www.talos.dev/v1.7/reference/configuration/#clusterdiscoveryconfig
# see https://www.talos.dev/v1.8/talos-guides/discovery/
# see https://www.talos.dev/v1.8/reference/configuration/#clusterdiscoveryconfig
discovery = {
enabled = true
registries = {
Expand All @@ -68,12 +68,12 @@ locals {
}
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.5.0/docs/resources/machine_secrets
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/docs/resources/machine_secrets
resource "talos_machine_secrets" "talos" {
talos_version = "v${var.talos_version}"
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.5.0/docs/data-sources/machine_configuration
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/docs/data-sources/machine_configuration
data "talos_machine_configuration" "controller" {
cluster_name = var.cluster_name
cluster_endpoint = var.cluster_endpoint
Expand All @@ -89,7 +89,7 @@ data "talos_machine_configuration" "controller" {
machine = {
network = {
interfaces = [
# see https://www.talos.dev/v1.7/talos-guides/network/vip/
# see https://www.talos.dev/v1.8/talos-guides/network/vip/
{
interface = "eth0"
dhcp = true
Expand Down Expand Up @@ -167,7 +167,7 @@ data "talos_machine_configuration" "controller" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.5.0/docs/data-sources/machine_configuration
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/docs/data-sources/machine_configuration
data "talos_machine_configuration" "worker" {
cluster_name = var.cluster_name
cluster_endpoint = var.cluster_endpoint
Expand All @@ -182,14 +182,14 @@ data "talos_machine_configuration" "worker" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.5.0/docs/data-sources/client_configuration
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/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.5.0/docs/data-sources/cluster_kubeconfig
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/docs/data-sources/cluster_kubeconfig
data "talos_cluster_kubeconfig" "talos" {
client_configuration = talos_machine_secrets.talos.client_configuration
endpoint = local.controller_nodes[0].address
Expand All @@ -199,7 +199,7 @@ data "talos_cluster_kubeconfig" "talos" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.5.0/docs/resources/machine_configuration_apply
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/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 @@ -220,7 +220,7 @@ resource "talos_machine_configuration_apply" "controller" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.5.0/docs/resources/machine_configuration_apply
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/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 @@ -241,7 +241,7 @@ resource "talos_machine_configuration_apply" "worker" {
]
}

// see https://registry.terraform.io/providers/siderolabs/talos/0.5.0/docs/resources/machine_bootstrap
// see https://registry.terraform.io/providers/siderolabs/talos/0.6.0-alpha.2/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.7/introduction/support-matrix/
# see https://www.talos.dev/v1.8/introduction/support-matrix/
variable "talos_version" {
type = string
# renovate: datasource=github-releases depName=siderolabs/talos
default = "1.7.6"
default = "1.8.0-alpha.2"
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.7/introduction/support-matrix/
# see https://www.talos.dev/v1.8/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.7.6.qcow2"
default = "talos-1.8.0-alpha.2.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 4f34d93

Please # to comment.