WIP

Author: dergeberl

pkg/provider/core.go

@@ -22,10 +22,11 @@ import (
 )
 
 const (
-	StackitProviderName      = "stackit"
-	StackitMachineLabel      = "mcm.gardener.cloud/machine"
-	StackitMachineClassLabel = "mcm.gardener.cloud/machineclass"
-	StackitRoleLabel         = "mcm.gardener.cloud/role"
+	StackitProviderName          = "stackit"
+	StackitMachineLabel          = "mcm.gardener.cloud/machine"
+	StackitMachineClassLabel     = "mcm.gardener.cloud/machineclass"
+	StackitRoleLabel             = "mcm.gardener.cloud/role"
+	portDeletionAnnotationPrefix = "stackit.cloud/cleanup-port-on-deletion-"
 )
 
 // CreateMachine handles a machine creation request by creating a STACKIT server
@@ -357,6 +358,27 @@ func (p *Provider) DeleteMachine(ctx context.Context, req *driver.DeleteMachineR
 		return nil, status.Error(codes.Internal, fmt.Sprintf("failed to delete server: %v", err))
 	}
 
+	for annotation, value := range req.Machine.Annotations {
+		if strings.HasPrefix(annotation, portDeletionAnnotationPrefix) {
+			splitted := strings.Split(value, "/")
+			if len(splitted) != 2 {
+				continue
+			}
+			klog.V(2).Infof("Found migrated nic %s for machine %q, triggering deletion", splitted[1], req.Machine.Name)
+			err = p.client.DeleteNic(ctx, projectID, providerSpec.Region, splitted[0], splitted[1])
+			if err != nil {
+				// Check if server was not found (404) - this is OK for idempotency
+				if errors.Is(err, ErrNicNotFound) {
+					klog.V(2).Infof("Nic %q already deleted for machine %q (idempotent)", serverID[1], req.Machine.Name)
+					return &driver.DeleteMachineResponse{}, nil
+				}
+				// All other errors are internal errors
+				klog.Errorf("Failed to delete nic for machine %q: %v", req.Machine.Name, err)
+				return nil, status.Error(codes.Internal, fmt.Sprintf("failed to delete nic: %v", err))
+			}
+		}
+	}
+
 	klog.V(2).Infof("Successfully deleted server %q for machine %q", serverID, req.Machine.Name)
 
 	return &driver.DeleteMachineResponse{}, nil

pkg/provider/sdk_client.go

@@ -41,6 +41,7 @@ func NewStackitClient(serviceAccountKey string) (*SdkStackitClient, error) {
 var (
 	// ErrServerNotFound indicates the server was not found (404)
 	ErrServerNotFound = errors.New("server not found")
+	ErrNicNotFound    = errors.New("nic not found")
 )
 
 // createIAASClient creates a new STACKIT SDK IAAS API client
@@ -320,6 +321,18 @@ func (c *SdkStackitClient) GetNICsForServer(ctx context.Context, projectID, regi
 	return nics, nil
 }
 
+func (c *SdkStackitClient) DeleteNic(ctx context.Context, projectID, region, networkID, nicID string) error {
+	err := c.iaasClient.DeleteNic(ctx, projectID, region, networkID, nicID).Execute()
+	if err != nil {
+		// Check if error is 404 Not Found - this is OK (idempotent)
+		if isNotFoundError(err) {
+			return fmt.Errorf("%w: %v", ErrNicNotFound, err)
+		}
+		return fmt.Errorf("SDK DeleteNic failed: %w", err)
+	}
+	return nil
+}
+
 func (c *SdkStackitClient) UpdateNIC(ctx context.Context, projectID, region, networkID, nicID string, allowedAddresses []string) (*NIC, error) {
 	addresses := make([]iaas.AllowedAddressesInner, len(allowedAddresses))
 

pkg/provider/stackit_client.go

@@ -30,6 +30,8 @@ type StackitClient interface {
 	ListServers(ctx context.Context, projectID, region string, labelSelector map[string]string) ([]*Server, error)
 	// GetNICsForServer retrieves a network interfaces for a given server
 	GetNICsForServer(ctx context.Context, projectID, region, serverID string) ([]*NIC, error)
+	// DeleteNic delete a given nic by ID
+	DeleteNic(ctx context.Context, projectID, region, networkID, nicID string) error
 	// UpdateNIC updates a network interface
 	UpdateNIC(ctx context.Context, projectID, region, networkID, nicID string, allowedAddresses []string) (*NIC, error)
 }