Revert "CARRY: Revert to Go v1.21"

This reverts commit dd74d64.

Author: EmilienM

api/v1alpha7/conversion_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha7
 
 import (
+	"slices"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -31,7 +32,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-openstack/internal/futures"
 	testhelpers "sigs.k8s.io/cluster-api-provider-openstack/test/helpers"
 )
 
@@ -98,7 +98,7 @@ func TestFuzzyConversion(t *testing.T) {
 			},
 		}
 
-		return futures.SlicesConcat(v1alpha7FuzzerFuncs, testhelpers.InfraV1FuzzerFuncs())
+		return slices.Concat(v1alpha7FuzzerFuncs, testhelpers.InfraV1FuzzerFuncs())
 	}
 
 	t.Run("for OpenStackCluster", runParallel(utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{

internal/futures/slices.go

@@ -28,7 +28,6 @@ import (
 
 	infrav1alpha1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1"
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-openstack/internal/futures"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/scope"
 )
@@ -161,7 +160,7 @@ func ResolveServerSpec(ctx context.Context, scope *scope.WithLogger, k8sClient c
 // The tags are a deduplicated combination of the tags specified in the
 // OpenStackMachineSpec and the ones specified on the OpenStackCluster.
 func InstanceTags(spec *infrav1.OpenStackMachineSpec, openStackCluster *infrav1.OpenStackCluster) []string {
-	machineTags := futures.SlicesConcat(spec.Tags, openStackCluster.Spec.Tags)
+	machineTags := slices.Concat(spec.Tags, openStackCluster.Spec.Tags)
 
 	seen := make(map[string]struct{}, len(machineTags))
 	unique := make([]string, 0, len(machineTags))

pkg/cloud/services/compute/referenced_resources.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
@@ -33,7 +34,6 @@ import (
 
 	infrav1alpha1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1"
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-openstack/internal/futures"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/scope"
 	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
@@ -469,7 +469,7 @@ func (s *Service) normalizePorts(ports []infrav1.PortOpts, clusterResourceName,
 		}
 
 		// Tags are inherited base tags plus any port-specific tags
-		normalizedPort.Tags = futures.SlicesConcat(baseTags, port.Tags)
+		normalizedPort.Tags = slices.Concat(baseTags, port.Tags)
 
 		// No Trunk field specified for the port, inherit the machine default
 		if port.Trunk == nil {