From c0cb06a5f875b0e5e47ae3d3e15564d7701eedef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Mon, 5 Aug 2024 09:44:45 +0200 Subject: [PATCH] :seedling: Add Singapore location and ap-southeast Network Zone The new location was released on 2024-08-06. Learn more at https://docs.hetzner.cloud/changelog#2024-08-06-new-location-singapore --- api/v1beta1/hetznercluster_webhook.go | 3 ++- api/v1beta1/types.go | 4 ++-- .../bases/infrastructure.cluster.x-k8s.io_hcloudmachines.yaml | 1 + .../infrastructure.cluster.x-k8s.io_hetznerclusters.yaml | 3 +++ ...frastructure.cluster.x-k8s.io_hetznerclustertemplates.yaml | 3 +++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/api/v1beta1/hetznercluster_webhook.go b/api/v1beta1/hetznercluster_webhook.go index 0d4c5a183..3904e4595 100644 --- a/api/v1beta1/hetznercluster_webhook.go +++ b/api/v1beta1/hetznercluster_webhook.go @@ -39,6 +39,7 @@ var regionNetworkZoneMap = map[string]string{ "hel1": "eu-central", "ash": "us-east", "hil": "us-west", + "sin": "ap-southeast", } // SetupWebhookWithManager initializes webhook manager for HetznerCluster. @@ -91,7 +92,7 @@ func (r *HetznerCluster) ValidateCreate() (admission.Warnings, error) { allErrs = append(allErrs, field.Invalid( field.NewPath("spec", "controlPlaneRegions"), r.Spec.ControlPlaneRegions, - "wrong control plane region. Should be fsn1, nbg1, hel1, or ash", + "wrong control plane region. Should be fsn1, nbg1, hel1, ash, hil or sin", )) } } diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go index 229e31ed0..f574a7942 100644 --- a/api/v1beta1/types.go +++ b/api/v1beta1/types.go @@ -233,7 +233,7 @@ type HCloudNetworkSpec struct { // NetworkZone specifies the HCloud network zone of the private network. // The zones must be one of eu-central, us-east, or us-west. The default is eu-central. - // +kubebuilder:validation:Enum=eu-central;us-east;us-west + // +kubebuilder:validation:Enum=eu-central;us-east;us-west;ap-southeast // +kubebuilder:default=eu-central // +optional NetworkZone HCloudNetworkZone `json:"networkZone,omitempty"` @@ -247,7 +247,7 @@ type NetworkStatus struct { } // Region is a Hetzner Location. -// +kubebuilder:validation:Enum=fsn1;hel1;nbg1;ash;hil +// +kubebuilder:validation:Enum=fsn1;hel1;nbg1;ash;hil;sin type Region string // HCloudNetworkZone describes the Network zone. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_hcloudmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_hcloudmachines.yaml index d5427343b..c063cd9eb 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_hcloudmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_hcloudmachines.yaml @@ -253,6 +253,7 @@ spec: - nbg1 - ash - hil + - sin type: string sshKeys: description: SSHKeys specifies the ssh keys that were used for provisioning diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclusters.yaml index 717913133..cea2fdcea 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclusters.yaml @@ -157,6 +157,7 @@ spec: - nbg1 - ash - hil + - sin type: string type: default: lb11 @@ -181,6 +182,7 @@ spec: - nbg1 - ash - hil + - sin type: string type: array hcloudNetwork: @@ -205,6 +207,7 @@ spec: - eu-central - us-east - us-west + - ap-southeast type: string subnetCidrBlock: default: 10.0.0.0/24 diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclustertemplates.yaml index 692139b74..6661bd466 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclustertemplates.yaml @@ -187,6 +187,7 @@ spec: - nbg1 - ash - hil + - sin type: string type: default: lb11 @@ -211,6 +212,7 @@ spec: - nbg1 - ash - hil + - sin type: string type: array hcloudNetwork: @@ -236,6 +238,7 @@ spec: - eu-central - us-east - us-west + - ap-southeast type: string subnetCidrBlock: default: 10.0.0.0/24