From 64787fff67a30640f779c4de1bb22ce419b7af1c Mon Sep 17 00:00:00 2001 From: Mauritz Uphoff <39736813+h3adex@users.noreply.github.com> Date: Tue, 26 Aug 2025 15:06:03 +0200 Subject: [PATCH] chore(iaas): remove deprecated machine flavors (#966) --- docs/guides/kubernetes_provider_ske.md | 2 +- .../using_loadbalancer_with_observability.md | 2 +- docs/resources/affinity_group.md | 4 +-- docs/resources/key_pair.md | 4 +-- docs/resources/loadbalancer.md | 2 +- docs/resources/server.md | 30 +++++++++---------- .../stackit_loadbalancer/resource.tf | 2 +- examples/resources/stackit_server/resource.tf | 2 +- .../services/iaas/affinitygroup/const.go | 2 +- .../internal/services/iaas/keypair/const.go | 3 +- .../internal/services/iaas/server/const.go | 14 ++++----- stackit/internal/services/ske/ske_acc_test.go | 4 +-- .../guides/kubernetes_provider_ske.md.tmpl | 2 +- ...ng_loadbalancer_with_observability.md.tmpl | 2 +- 14 files changed, 37 insertions(+), 38 deletions(-) diff --git a/docs/guides/kubernetes_provider_ske.md b/docs/guides/kubernetes_provider_ske.md index fe8b4866..d593b2eb 100644 --- a/docs/guides/kubernetes_provider_ske.md +++ b/docs/guides/kubernetes_provider_ske.md @@ -32,7 +32,7 @@ This guide outlines the process of utilizing the [HashiCorp Kubernetes provider] node_pools = [ { name = "example-node-pool" - machine_type = "g1.3" + machine_type = "g2i.4" minimum = 1 maximum = 2 availability_zones = ["eu01-1"] diff --git a/docs/guides/using_loadbalancer_with_observability.md b/docs/guides/using_loadbalancer_with_observability.md index d22edf5d..a6bc9703 100644 --- a/docs/guides/using_loadbalancer_with_observability.md +++ b/docs/guides/using_loadbalancer_with_observability.md @@ -97,7 +97,7 @@ This guide explains how to configure the STACKIT Loadbalancer product to send me source_id = "59838a89-51b1-4892-b57f-b3caf598ee2f" // Ubuntu 24.04 } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name network_interfaces = [ stackit_network_interface.nic.network_interface_id diff --git a/docs/resources/affinity_group.md b/docs/resources/affinity_group.md index bd4d8bcd..2f1cbae6 100644 --- a/docs/resources/affinity_group.md +++ b/docs/resources/affinity_group.md @@ -22,7 +22,7 @@ description: |- } affinity_group = stackit_affinity_group.affinity-group.affinity_group_id availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" } @@ -61,7 +61,7 @@ resource "stackit_server" "example-server" { } affinity_group = stackit_affinity_group.affinity-group.affinity_group_id availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" } ``` diff --git a/docs/resources/key_pair.md b/docs/resources/key_pair.md index 45925f0f..ff25a7b2 100644 --- a/docs/resources/key_pair.md +++ b/docs/resources/key_pair.md @@ -20,7 +20,7 @@ description: |- source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = "example-key-pair" } --- @@ -47,7 +47,7 @@ resource "stackit_server" "example-server" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = "example-key-pair" } diff --git a/docs/resources/loadbalancer.md b/docs/resources/loadbalancer.md index ab77a41d..3511f2d3 100644 --- a/docs/resources/loadbalancer.md +++ b/docs/resources/loadbalancer.md @@ -59,7 +59,7 @@ resource "stackit_server" "boot-from-image" { source_id = "59838a89-51b1-4892-b57f-b3caf598ee2f" // Ubuntu 24.04 } availability_zone = "xxxx-x" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name network_interfaces = [ stackit_network_interface.nic.network_interface_id diff --git a/docs/resources/server.md b/docs/resources/server.md index 4a0639b0..13486682 100644 --- a/docs/resources/server.md +++ b/docs/resources/server.md @@ -20,7 +20,7 @@ description: |- source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = file("${path.module}/cloud-init.yaml") } @@ -37,7 +37,7 @@ description: |- source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = "example-keypair" } @@ -63,7 +63,7 @@ description: |- source_id = stackit_volume.example-volume.volume_id } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name } @@ -104,7 +104,7 @@ description: |- source_type = "image" source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name network_interfaces = [ stackit_network_interface.nic.network_interface_id @@ -136,7 +136,7 @@ description: |- source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name } @@ -157,7 +157,7 @@ description: |- source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = "#!/bin/bash\n/bin/su" } @@ -170,7 +170,7 @@ description: |- source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = file("${path.module}/cloud-init.yaml") } @@ -198,7 +198,7 @@ resource "stackit_server" "user-data-from-file" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = file("${path.module}/cloud-init.yaml") } @@ -216,7 +216,7 @@ resource "stackit_server" "boot-from-volume" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = "example-keypair" } @@ -243,7 +243,7 @@ resource "stackit_server" "boot-from-volume" { source_id = stackit_volume.example-volume.volume_id } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name } @@ -285,7 +285,7 @@ resource "stackit_server" "server-with-network" { source_type = "image" source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name network_interfaces = [ stackit_network_interface.nic.network_interface_id @@ -318,7 +318,7 @@ resource "stackit_server" "server-with-volume" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name } @@ -340,7 +340,7 @@ resource "stackit_server" "user-data" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = "#!/bin/bash\n/bin/su" } @@ -353,7 +353,7 @@ resource "stackit_server" "user-data-from-file" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = file("${path.module}/cloud-init.yaml") } @@ -372,7 +372,7 @@ resource "stackit_server" "example" { source_id = "59838a89-51b1-4892-b57f-b3caf598ee2f" // Ubuntu 24.04 } availability_zone = "xxxx-x" - machine_type = "g1.1" + machine_type = "g2i.1" network_interfaces = [ stackit_network_interface.example.network_interface_id ] diff --git a/examples/resources/stackit_loadbalancer/resource.tf b/examples/resources/stackit_loadbalancer/resource.tf index fd720c50..5560fe79 100644 --- a/examples/resources/stackit_loadbalancer/resource.tf +++ b/examples/resources/stackit_loadbalancer/resource.tf @@ -40,7 +40,7 @@ resource "stackit_server" "boot-from-image" { source_id = "59838a89-51b1-4892-b57f-b3caf598ee2f" // Ubuntu 24.04 } availability_zone = "xxxx-x" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name network_interfaces = [ stackit_network_interface.nic.network_interface_id diff --git a/examples/resources/stackit_server/resource.tf b/examples/resources/stackit_server/resource.tf index 2f2d172e..bacfb6fe 100644 --- a/examples/resources/stackit_server/resource.tf +++ b/examples/resources/stackit_server/resource.tf @@ -7,7 +7,7 @@ resource "stackit_server" "example" { source_id = "59838a89-51b1-4892-b57f-b3caf598ee2f" // Ubuntu 24.04 } availability_zone = "xxxx-x" - machine_type = "g1.1" + machine_type = "g2i.1" network_interfaces = [ stackit_network_interface.example.network_interface_id ] diff --git a/stackit/internal/services/iaas/affinitygroup/const.go b/stackit/internal/services/iaas/affinitygroup/const.go index e811a233..2d16175f 100644 --- a/stackit/internal/services/iaas/affinitygroup/const.go +++ b/stackit/internal/services/iaas/affinitygroup/const.go @@ -20,7 +20,7 @@ resource "stackit_server" "example-server" { } affinity_group = stackit_affinity_group.affinity-group.affinity_group_id availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" } ` + "\n```" diff --git a/stackit/internal/services/iaas/keypair/const.go b/stackit/internal/services/iaas/keypair/const.go index daae0162..230fd956 100644 --- a/stackit/internal/services/iaas/keypair/const.go +++ b/stackit/internal/services/iaas/keypair/const.go @@ -3,7 +3,6 @@ package keypair const exampleUsageWithServer = ` ### Usage with server` + "\n" + - "```terraform" + ` resource "stackit_key_pair" "keypair" { name = "example-key-pair" @@ -19,7 +18,7 @@ resource "stackit_server" "example-server" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = "example-key-pair" } ` + "\n```" diff --git a/stackit/internal/services/iaas/server/const.go b/stackit/internal/services/iaas/server/const.go index bfc3a1ef..4da17e6a 100644 --- a/stackit/internal/services/iaas/server/const.go +++ b/stackit/internal/services/iaas/server/const.go @@ -19,7 +19,7 @@ resource "stackit_server" "user-data-from-file" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = file("${path.module}/cloud-init.yaml") } @@ -36,7 +36,7 @@ resource "stackit_server" "boot-from-volume" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = "example-keypair" } ` + "\n```" + ` @@ -62,7 +62,7 @@ resource "stackit_server" "boot-from-volume" { source_id = stackit_volume.example-volume.volume_id } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name } ` + "\n```" + ` @@ -103,7 +103,7 @@ resource "stackit_server" "server-with-network" { source_type = "image" source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name network_interfaces = [ stackit_network_interface.nic.network_interface_id @@ -135,7 +135,7 @@ resource "stackit_server" "server-with-volume" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name } @@ -156,7 +156,7 @@ resource "stackit_server" "user-data" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = "#!/bin/bash\n/bin/su" } @@ -169,7 +169,7 @@ resource "stackit_server" "user-data-from-file" { source_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } name = "example-server" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name user_data = file("${path.module}/cloud-init.yaml") } diff --git a/stackit/internal/services/ske/ske_acc_test.go b/stackit/internal/services/ske/ske_acc_test.go index b596f189..8c973820 100644 --- a/stackit/internal/services/ske/ske_acc_test.go +++ b/stackit/internal/services/ske/ske_acc_test.go @@ -39,7 +39,7 @@ var testConfigVarsMin = config.Variables{ "project_id": config.StringVariable(testutil.ProjectId), "name": config.StringVariable(minTestName), "nodepool_availability_zone1": config.StringVariable(fmt.Sprintf("%s-1", testutil.Region)), - "nodepool_machine_type": config.StringVariable("g1.2"), + "nodepool_machine_type": config.StringVariable("g2i.2"), "nodepool_minimum": config.StringVariable("1"), "nodepool_maximum": config.StringVariable("2"), "nodepool_name": config.StringVariable("np-acc-test"), @@ -56,7 +56,7 @@ var testConfigVarsMax = config.Variables{ "organization_id": config.StringVariable(testutil.OrganizationId), "name": config.StringVariable(maxTestName), "nodepool_availability_zone1": config.StringVariable(fmt.Sprintf("%s-1", testutil.Region)), - "nodepool_machine_type": config.StringVariable("g1.2"), + "nodepool_machine_type": config.StringVariable("g2i.2"), "nodepool_minimum": config.StringVariable("1"), "nodepool_maximum": config.StringVariable("2"), "nodepool_name": config.StringVariable("np-acc-test"), diff --git a/templates/guides/kubernetes_provider_ske.md.tmpl b/templates/guides/kubernetes_provider_ske.md.tmpl index fe8b4866..d593b2eb 100644 --- a/templates/guides/kubernetes_provider_ske.md.tmpl +++ b/templates/guides/kubernetes_provider_ske.md.tmpl @@ -32,7 +32,7 @@ This guide outlines the process of utilizing the [HashiCorp Kubernetes provider] node_pools = [ { name = "example-node-pool" - machine_type = "g1.3" + machine_type = "g2i.4" minimum = 1 maximum = 2 availability_zones = ["eu01-1"] diff --git a/templates/guides/using_loadbalancer_with_observability.md.tmpl b/templates/guides/using_loadbalancer_with_observability.md.tmpl index d22edf5d..a6bc9703 100644 --- a/templates/guides/using_loadbalancer_with_observability.md.tmpl +++ b/templates/guides/using_loadbalancer_with_observability.md.tmpl @@ -97,7 +97,7 @@ This guide explains how to configure the STACKIT Loadbalancer product to send me source_id = "59838a89-51b1-4892-b57f-b3caf598ee2f" // Ubuntu 24.04 } availability_zone = "eu01-1" - machine_type = "g1.1" + machine_type = "g2i.1" keypair_name = stackit_key_pair.keypair.name network_interfaces = [ stackit_network_interface.nic.network_interface_id