From 3a636877a18641469c35712cf65bbf0a978158be Mon Sep 17 00:00:00 2001 From: Amy Date: Fri, 7 Jun 2024 18:41:18 +0200 Subject: [PATCH 1/4] Updated default server types --- README.md | 2 +- kube.tf.example | 10 +++++----- packer-template/hcloud-microos-snapshots.pkr.hcl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 71c03b99..690408ea 100644 --- a/README.md +++ b/README.md @@ -366,7 +366,7 @@ Example nodepool configuration: ```tf { name = "egress", - server_type = "cpx11", + server_type = "cx22", location = "fsn1", labels = [ "node.kubernetes.io/role=egress" diff --git a/kube.tf.example b/kube.tf.example index 9f185977..6229ceb1 100644 --- a/kube.tf.example +++ b/kube.tf.example @@ -97,7 +97,7 @@ module "kube-hetzner" { # For instance, one is ok (non-HA), two is not ok, and three is ok (becomes HA). It does not matter if they are in the same nodepool or not! So they can be in different locations and of various types. # Of course, you can choose any number of nodepools you want, with the location you want. The only constraint on the location is that you need to stay in the same network region, Europe, or the US. - # For the server type, the minimum instance supported is cpx11 (just a few cents more than cx11) but the cax11 is even cheaper and more powerful (arm64); see https://www.hetzner.com/cloud. + # For the server type, the minimum instance supported is cx22. The cax11 provides even better value for money if your applications are compatible with arm64; see https://www.hetzner.com/cloud. # IMPORTANT: Before you create your cluster, you can do anything you want with the nodepools, but you need at least one of each, control plane and agent. # Once the cluster is up and running, you can change nodepool count and even set it to 0 (in the case of the first control-plane nodepool, the minimum is 1). @@ -121,7 +121,7 @@ module "kube-hetzner" { control_plane_nodepools = [ { name = "control-plane-fsn1", - server_type = "cpx11", + server_type = "cx22", location = "fsn1", labels = [], taints = [], @@ -138,7 +138,7 @@ module "kube-hetzner" { }, { name = "control-plane-nbg1", - server_type = "cpx11", + server_type = "cx22", location = "nbg1", labels = [], taints = [], @@ -152,7 +152,7 @@ module "kube-hetzner" { }, { name = "control-plane-hel1", - server_type = "cpx11", + server_type = "cx22", location = "hel1", labels = [], taints = [], @@ -169,7 +169,7 @@ module "kube-hetzner" { agent_nodepools = [ { name = "agent-small", - server_type = "cpx11", + server_type = "cx22", location = "fsn1", labels = [], taints = [], diff --git a/packer-template/hcloud-microos-snapshots.pkr.hcl b/packer-template/hcloud-microos-snapshots.pkr.hcl index 0e3a954f..07ff0050 100644 --- a/packer-template/hcloud-microos-snapshots.pkr.hcl +++ b/packer-template/hcloud-microos-snapshots.pkr.hcl @@ -80,7 +80,7 @@ source "hcloud" "microos-x86-snapshot" { image = "ubuntu-22.04" rescue = "linux64" location = "fsn1" - server_type = "cpx11" # disk size of >= 40GiB is needed to install the MicroOS image + server_type = "cx22" # disk size of >= 40GiB is needed to install the MicroOS image snapshot_labels = { microos-snapshot = "yes" creator = "kube-hetzner" From 4cbcb4e7acb0bb77ff0d6465c56415e3bb78cf45 Mon Sep 17 00:00:00 2001 From: Amy Date: Fri, 7 Jun 2024 18:49:51 +0200 Subject: [PATCH 2/4] Missed a few instances of cpx instances --- README.md | 4 ++-- kube.tf.example | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 690408ea..ba681cd4 100644 --- a/README.md +++ b/README.md @@ -947,7 +947,7 @@ easily map between your nodes and your kube.tf file. agent_nodepools = [ { name = "agent-large", - server_type = "cpx21", + server_type = "cx32", location = "nbg1", labels = [], taints = [], @@ -960,7 +960,7 @@ easily map between your nodes and your kube.tf file. }, "1" : { append_index_to_node_name = false, - server_type = "cpx31", + server_type = "cx42", labels = ["my.extra.label=slightlybiggernode"] placement_group = "agent-large-pg-2", }, diff --git a/kube.tf.example b/kube.tf.example index 6229ceb1..176023c7 100644 --- a/kube.tf.example +++ b/kube.tf.example @@ -186,7 +186,7 @@ module "kube-hetzner" { }, { name = "agent-large", - server_type = "cpx21", + server_type = "cx32", location = "nbg1", labels = [], taints = [], @@ -200,7 +200,7 @@ module "kube-hetzner" { }, { name = "storage", - server_type = "cpx21", + server_type = "cx32", location = "fsn1", # Fully optional, just a demo. labels = [ @@ -223,7 +223,7 @@ module "kube-hetzner" { # See the https://github.com/kube-hetzner/terraform-hcloud-kube-hetzner#examples for an example use case. { name = "egress", - server_type = "cx21", + server_type = "cx22", location = "fsn1", labels = [ "node.kubernetes.io/role=egress" @@ -323,7 +323,7 @@ module "kube-hetzner" { # autoscaler_nodepools = [ # { # name = "autoscaled-small" - # server_type = "cpx21" + # server_type = "cx32" # location = "fsn1" # min_nodes = 0 # max_nodes = 5 From af1ba857efe8d939c088f1a346edadc7b5c82496 Mon Sep 17 00:00:00 2001 From: Amy Date: Fri, 7 Jun 2024 19:43:03 +0200 Subject: [PATCH 3/4] Temporarily change url --- scripts/create.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/create.sh b/scripts/create.sh index 633c9076..dc22f007 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -47,13 +47,13 @@ fi # Download the required files only if they don't exist if [ ! -e "${folder_path}/kube.tf" ]; then - curl -sL https://raw.githubusercontent.com/kube-hetzner/terraform-hcloud-kube-hetzner/master/kube.tf.example -o "${folder_path}/kube.tf" + curl -sL https://raw.githubusercontent.com/skyride/terraform-hcloud-kube-hetzner/update-default-server-types/kube.tf.example -o "${folder_path}/kube.tf" else echo "kube.tf already exists. Skipping download." fi if [ ! -e "${folder_path}/hcloud-microos-snapshots.pkr.hcl" ]; then - curl -sL https://raw.githubusercontent.com/kube-hetzner/terraform-hcloud-kube-hetzner/master/packer-template/hcloud-microos-snapshots.pkr.hcl -o "${folder_path}/hcloud-microos-snapshots.pkr.hcl" + curl -sL https://raw.githubusercontent.com/skyride/terraform-hcloud-kube-hetzner/update-default-server-types/packer-template/hcloud-microos-snapshots.pkr.hcl -o "${folder_path}/hcloud-microos-snapshots.pkr.hcl" else echo "hcloud-microos-snapshots.pkr.hcl already exists. Skipping download." fi From 88b508f65156617f2de8000b258f7b9631fd42e2 Mon Sep 17 00:00:00 2001 From: Amy Date: Fri, 7 Jun 2024 20:16:35 +0200 Subject: [PATCH 4/4] Put URLs back --- scripts/create.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/create.sh b/scripts/create.sh index dc22f007..633c9076 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -47,13 +47,13 @@ fi # Download the required files only if they don't exist if [ ! -e "${folder_path}/kube.tf" ]; then - curl -sL https://raw.githubusercontent.com/skyride/terraform-hcloud-kube-hetzner/update-default-server-types/kube.tf.example -o "${folder_path}/kube.tf" + curl -sL https://raw.githubusercontent.com/kube-hetzner/terraform-hcloud-kube-hetzner/master/kube.tf.example -o "${folder_path}/kube.tf" else echo "kube.tf already exists. Skipping download." fi if [ ! -e "${folder_path}/hcloud-microos-snapshots.pkr.hcl" ]; then - curl -sL https://raw.githubusercontent.com/skyride/terraform-hcloud-kube-hetzner/update-default-server-types/packer-template/hcloud-microos-snapshots.pkr.hcl -o "${folder_path}/hcloud-microos-snapshots.pkr.hcl" + curl -sL https://raw.githubusercontent.com/kube-hetzner/terraform-hcloud-kube-hetzner/master/packer-template/hcloud-microos-snapshots.pkr.hcl -o "${folder_path}/hcloud-microos-snapshots.pkr.hcl" else echo "hcloud-microos-snapshots.pkr.hcl already exists. Skipping download." fi