feat(node): disable zone label for cloud servers

Author: lukasmetzner

hcloud/cloud_test.go

@@ -74,6 +74,7 @@ func newTestEnv() testEnv {
 
 	cfg := config.HCCMConfiguration{}
 	cfg.Instance.AddressFamily = config.AddressFamilyIPv4
+	cfg.Instance.ZoneLabelEnabled = true
 
 	return testEnv{
 		Server:      server,

hcloud/instances.go

@@ -356,16 +356,23 @@ func (s hcloudServer) IsShutdown() (bool, error) {
 }
 
 func (s hcloudServer) Metadata(networkID int64, _ *corev1.Node, cfg config.HCCMConfiguration) (*cloudprovider.InstanceMetadata, error) {
-	return &cloudprovider.InstanceMetadata{
+	metadata := &cloudprovider.InstanceMetadata{
 		ProviderID:    providerid.FromCloudServerID(s.ID),
 		InstanceType:  s.ServerType.Name,
 		NodeAddresses: hcloudNodeAddresses(networkID, s.Server, cfg),
-		Zone:          legacydatacenter.NameFromLocation(s.Location.Name),
 		Region:        s.Location.Name,
 		AdditionalLabels: map[string]string{
 			ProvidedBy: "cloud",
 		},
-	}, nil
+	}
+
+	// By default, we continue to configure a zone label. The user
+	// can configure this behavior. We can drop this entirely in a v2.
+	if cfg.Instance.ZoneLabelEnabled {
+		metadata.Zone = legacydatacenter.NameFromLocation(s.Location.Name)
+	}
+
+	return metadata, nil
 }
 
 type robotServer struct {

internal/config/config.go

@@ -29,9 +29,10 @@ const (
 	robotRateLimitWaitTime  = "ROBOT_RATE_LIMIT_WAIT_TIME"
 	robotForwardInternalIPs = "ROBOT_FORWARD_INTERNAL_IPS"
 
-	hcloudInstancesAddressFamily = "HCLOUD_INSTANCES_ADDRESS_FAMILY"
-	hcloudServerCacheMode        = "HCLOUD_SERVER_CACHE_MODE"
-	hcloudServerCacheMaxAge      = "HCLOUD_SERVER_CACHE_MAX_AGE"
+	hcloudInstancesZoneLabelEnabled = "HCLOUD_INSTANCES_ZONE_LABEL_ENABLED"
+	hcloudInstancesAddressFamily    = "HCLOUD_INSTANCES_ADDRESS_FAMILY"
+	hcloudServerCacheMode           = "HCLOUD_SERVER_CACHE_MODE"
+	hcloudServerCacheMaxAge         = "HCLOUD_SERVER_CACHE_MAX_AGE"
 
 	// Disable the "master/server is attached to the network" check against the metadata service.
 	hcloudNetworkDisableAttachedCheck = "HCLOUD_NETWORK_DISABLE_ATTACHED_CHECK"
@@ -73,7 +74,8 @@ const (
 const ServerCacheDefaultMaxAge time.Duration = 10 * time.Second
 
 type InstanceConfiguration struct {
-	AddressFamily AddressFamily
+	AddressFamily    AddressFamily
+	ZoneLabelEnabled bool
 }
 
 type ServerCacheConfiguration struct {
@@ -185,6 +187,11 @@ func Read() (HCCMConfiguration, error) {
 		cfg.Instance.AddressFamily = AddressFamilyIPv4
 	}
 
+	cfg.Instance.ZoneLabelEnabled, err = getEnvBool(hcloudInstancesZoneLabelEnabled, true)
+	if err != nil {
+		errs = append(errs, err)
+	}
+
 	// ---- Server Cache ----
 
 	cfg.ServerCache = ServerCacheConfiguration{