Merge branch 'master' into instance_eos_filter_by_offer_id

Author: Mia-Cross

docs/guides/increase-resources-timeout.md

@@ -0,0 +1,71 @@
+---
+page_title: "Increasing Timeout in terraform apply"
+---
+# Increasing Timeout in terraform apply
+
+When deploying resources with the Scaleway Terraform provider, operations like creating or updating instances, buckets, or other infrastructure may take longer than the default timeout durations. To avoid failures caused by these timeouts, you can configure custom timeouts per resource.
+
+## How to set custom timeouts
+
+Most Scaleway Terraform resources support a timeouts block where you can specify how long Terraform should wait for each operation.
+
+#### Timeout keywords supported
+
+- `create` — Timeout duration for creating the resource.
+- `update` — Timeout duration for updating the resource.
+- `delete` — Timeout duration for deleting the resource.
+- `default` — (Scaleway-specific) A unified timeout applied to all operations (create, update, delete) if specific keys are not set.
+
+### Example: Using Specific Operation Timeouts
+
+```terraform
+resource "scaleway_vpc_private_network" "pn" {}
+
+resource "scaleway_k8s_cluster" "cluster" {
+  name                         = "tf-cluster"
+  version                      = "1.32.3"
+  cni                          = "cilium"
+  private_network_id           = scaleway_vpc_private_network.pn.id
+  delete_additional_resources  = false
+
+  timeouts {
+    delete = "15m"
+    create = "20m"
+    update = "15m"
+  }
+}
+
+resource "scaleway_k8s_pool" "pool" {
+  cluster_id = scaleway_k8s_cluster.cluster.id
+  name       = "tf-pool"
+  node_type  = "DEV1-M"
+  size       = 1
+}
+
+```
+
+### Example: Using the default Timeout
+
+```terraform
+resource "scaleway_object_bucket" "test" {
+  name = "this-is-a-test"
+  tags = {
+    TestName = "TestAccSCW_WebsiteConfig_basic"
+  }
+  timeouts {
+    default = "5m"
+  }
+}
+```
+
+If both default and one of create, update, or delete are set, the specific key overrides the default value.
+
+If no timeouts block is set, Terraform uses the provider's internal defaults.
+
+Not all Scaleway resources support timeouts.
+
+Custom timeouts are useful for long-running operations but do not affect retry intervals or polling frequency.
+
+## Official Documentation
+
+For more details on timeout support, refer to the official [Terraform documentation](https://developer.hashicorp.com/terraform/plugin/sdkv2/resources/retries-and-customizable-timeouts).

docs/resources/k8s_cluster.md

@@ -16,7 +16,7 @@ resource "scaleway_vpc_private_network" "pn" {}
 
 resource "scaleway_k8s_cluster" "cluster" {
   name                        = "tf-cluster"
-  version                     = "1.29.1"
+  version                     = "1.32.3"
   cni                         = "cilium"
   private_network_id          = scaleway_vpc_private_network.pn.id
   delete_additional_resources = false
@@ -36,7 +36,7 @@ resource "scaleway_k8s_pool" "pool" {
 resource "scaleway_k8s_cluster" "cluster" {
   name                        = "tf-cluster"
   type                        = "multicloud"
-  version                     = "1.29.1"
+  version                     = "1.32.3"
   cni                         = "kilo"
   delete_additional_resources = false
 }
@@ -60,7 +60,7 @@ resource "scaleway_vpc_private_network" "pn" {}
 resource "scaleway_k8s_cluster" "cluster" {
   name                        = "tf-cluster"
   description                 = "cluster made in terraform"
-  version                     = "1.29.1"
+  version                     = "1.32.3"
   cni                         = "calico"
   tags                        = ["terraform"]
   private_network_id          = scaleway_vpc_private_network.pn.id

docs/resources/k8s_pool.md

@@ -14,7 +14,7 @@ Creates and manages Scaleway Kubernetes cluster pools. For more information, see
 ```terraform
 resource "scaleway_k8s_cluster" "jack" {
   name    = "jack"
-  version = "1.24.3"
+  version = "1.32.3"
   cni     = "cilium"
 }
 
@@ -153,7 +153,7 @@ resource "scaleway_k8s_pool" "pool" {
 resource "scaleway_k8s_cluster" "cluster" {
   name    = "placement_group"
   cni     = "kilo"
-  version = "%s"
+  version = "1.32.3"
   tags    = ["terraform-test", "scaleway_k8s_cluster", "placement_group"]
   region  = "fr-par"
   type    = "multicloud"

internal/services/domain/helpers.go

@@ -623,3 +623,11 @@ func FlattenDSRecord(dsRecords []*domain.DSRecord) []any {
 
 	return results
 }
+
+func BuildZoneName(subdomain, domain string) string {
+	if subdomain == "" {
+		return domain
+	}
+
+	return fmt.Sprintf("%s.%s", subdomain, domain)
+}