From f983d4f8770448b6adffd0bcebf0635010a4217c Mon Sep 17 00:00:00 2001 From: Marcel Richter Date: Mon, 25 Mar 2024 18:35:14 +0100 Subject: [PATCH] fix: initial assignment of Hetzner Cloud Alias IP The assignment of private networks happens in the hetzner cloud after starting the server and therefore often after querying the network information when assigning VIPs. If an alias IP is to be set but no private network is yet available, an error message is now thrown, until the private network is assigned. Previously, no error message was thrown and the network ID was set to 0, which means that the VIP is regarded as a public floating IP in the further code and not as a private alias IP. Signed-off-by: Marcel Richter --- .../network/operator/vip/hcloud.go | 39 ++++++++++++------- .../network/operator_vip_config.go | 2 +- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go b/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go index c9d1fbed3ba..f1e09333c43 100644 --- a/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go +++ b/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go @@ -62,6 +62,10 @@ func (handler *HCloudHandler) Acquire(ctx context.Context) error { oldDeviceID := findServerByAlias(serverList, handler.networkID, handler.vip) if oldDeviceID != 0 { + handler.logger.Info("trying to remove previous Hetzner Cloud IP alias", + zap.String("vip", handler.vip), zap.Int64("device_id", oldDeviceID), + zap.Int64("network_id", handler.networkID), + ) action, _, err = handler.client.Server.ChangeAliasIPs(ctx, &hcloud.Server{ID: oldDeviceID}, hcloud.ServerChangeAliasIPsOpts{ @@ -69,7 +73,7 @@ func (handler *HCloudHandler) Acquire(ctx context.Context) error { AliasIPs: []net.IP{}, }) if err != nil { - return fmt.Errorf("error remove alias IPs %q on server %d: %w", handler.vip, oldDeviceID, err) + return fmt.Errorf("error remove Hetzner Cloud IP alias %q from server %d: %w", handler.vip, oldDeviceID, err) } handler.logger.Info("cleared previous Hetzner Cloud IP alias", zap.String("vip", handler.vip), @@ -86,7 +90,7 @@ func (handler *HCloudHandler) Acquire(ctx context.Context) error { return fmt.Errorf("error change alias IPs %q to server %d: %w", handler.vip, handler.deviceID, err) } - handler.logger.Info("assigned Hetzner Cloud alias IP", zap.String("vip", handler.vip), zap.Int64("device_id", handler.deviceID), + handler.logger.Info("assigned Hetzner Cloud IP alias", zap.String("vip", handler.vip), zap.Int64("device_id", handler.deviceID), zap.Int64("network_id", handler.networkID), zap.String("status", string(action.Status))) return nil @@ -111,7 +115,7 @@ func (handler *HCloudHandler) Acquire(ctx context.Context) error { } } - return fmt.Errorf("error assigning %q to server %d: floating IP is not found", handler.vip, handler.deviceID) + return fmt.Errorf("error assigning %q to server %d in network %d: floating IP / alias IP is not found", handler.vip, handler.deviceID, handler.networkID) } // Release implements Handler interface. @@ -155,7 +159,7 @@ func (handler *HCloudHandler) Release(ctx context.Context) error { const HCloudMetaDataEndpoint = "http://169.254.169.254/hetzner/v1/metadata/instance-id" // GetNetworkAndDeviceIDs fills in parts of the spec based on the API token and instance metadata. -func GetNetworkAndDeviceIDs(ctx context.Context, spec *network.VIPHCloudSpec, vip netip.Addr) error { +func GetNetworkAndDeviceIDs(ctx context.Context, spec *network.VIPHCloudSpec, vip netip.Addr, logger *zap.Logger) error { metadataInstanceID, err := download.Download(ctx, HCloudMetaDataEndpoint) if err != nil { return fmt.Errorf("error downloading instance-id: %w", err) @@ -173,19 +177,28 @@ func GetNetworkAndDeviceIDs(ctx context.Context, spec *network.VIPHCloudSpec, vi return fmt.Errorf("error getting server info: %w", err) } - spec.NetworkID = 0 - - for _, privnet := range server.PrivateNet { - network, _, err := client.Network.GetByID(ctx, privnet.Network.ID) - if err != nil { - return fmt.Errorf("error getting network info: %w", err) + if vip.IsPrivate() { + // find private network for private vip (alias IP) + assignedPrivateNetworks := server.PrivateNet + if len(assignedPrivateNetworks) <= 0 { + return fmt.Errorf("trying to assign private vip (alias IP) %q, but no private network is assigned to the server", vip.String()) } - if network.IPRange.Contains(vip.AsSlice()) { - spec.NetworkID = privnet.Network.ID + for _, assignedPrivateNetwork := range assignedPrivateNetworks { + privateNetwork, _, err := client.Network.GetByID(ctx, assignedPrivateNetwork.Network.ID) + if err != nil { + return fmt.Errorf("error getting network info: %w", err) + } - break + if privateNetwork.IPRange.Contains(vip.AsSlice()) { + spec.NetworkID = assignedPrivateNetwork.Network.ID + logger.Info("found private network for private vip (alias IP)", zap.String("vip", vip.String()), zap.Int64("network_id", spec.NetworkID)) + break + } } + } else { + // the public vip (floating IP) doesn't require a private network + spec.NetworkID = 0 } return nil diff --git a/internal/app/machined/pkg/controllers/network/operator_vip_config.go b/internal/app/machined/pkg/controllers/network/operator_vip_config.go index f392adc164c..64531a14fca 100644 --- a/internal/app/machined/pkg/controllers/network/operator_vip_config.go +++ b/internal/app/machined/pkg/controllers/network/operator_vip_config.go @@ -229,7 +229,7 @@ func handleVIP(ctx context.Context, vlanConfig talosconfig.VIPConfig, deviceName spec.VIP.GratuitousARP = false spec.VIP.HCloud.APIToken = vlanConfig.HCloud().APIToken() - if err = vip.GetNetworkAndDeviceIDs(ctx, &spec.VIP.HCloud, sharedIP); err != nil { + if err = vip.GetNetworkAndDeviceIDs(ctx, &spec.VIP.HCloud, sharedIP, logger); err != nil { return network.OperatorSpecSpec{}, err } // Regular layer 2 VIP