Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions terraform/modules/bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ resource "helm_release" "argocd" {
namespace = "argocd"
create_namespace = true

# Resilience: a failed/interrupted upgrade rolls back instead of getting
# stuck in `pending-upgrade` (which blocks the next apply with "another
# operation in progress"). Longer timeout absorbs transient API blips
# (e.g. an in-flight k3s node upgrade briefly bouncing the API server).
timeout = 900
atomic = true
cleanup_on_fail = true

values = [
yamlencode({
server = {
Expand Down Expand Up @@ -85,6 +93,10 @@ resource "helm_release" "argo_workflows" {
namespace = "argo"
create_namespace = true

timeout = 900
atomic = true
cleanup_on_fail = true

values = [
yamlencode({
server = {
Expand All @@ -108,6 +120,10 @@ resource "helm_release" "cnpg" {
version = "0.28.0"
namespace = "cnpg-system"
create_namespace = true

timeout = 900
atomic = true
cleanup_on_fail = true
}

# Let's Encrypt ClusterIssuer (cert-manager ships in the kube-hetzner module)
Expand Down
8 changes: 8 additions & 0 deletions terraform/modules/cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ module "kube-hetzner" {

network_region = "eu-central"

# Don't let the in-cluster system-upgrade-controller auto-upgrade k3s/OS.
# Those upgrades cordon+drain a node and briefly bounce the API server; when
# they fire during a terraform apply the run can be interrupted mid-upgrade
# and leave a node cordoned (as happened on the first rollouts). Pin them so
# node upgrades are a deliberate, supervised action instead.
automatically_upgrade_k3s = false
automatically_upgrade_os = false

# Use existing x86 snapshot, skip ARM
microos_x86_snapshot_id = "374341457"
microos_arm_snapshot_id = "374341457"
Expand Down
Loading