CARRY: Revert to Go v1.21

Author: pierreprinetti

api/v1alpha6/conversion_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha6
 
 import (
-	"slices"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -32,6 +31,7 @@ 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"
 )
 
@@ -123,7 +123,7 @@ func TestFuzzyConversion(t *testing.T) {
 			},
 		}
 
-		return slices.Concat(v1alpha6FuzzerFuncs, testhelpers.InfraV1FuzzerFuncs())
+		return futures.SlicesConcat(v1alpha6FuzzerFuncs, testhelpers.InfraV1FuzzerFuncs())
 	}
 
 	t.Run("for OpenStackCluster", runParallel(utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{

api/v1alpha7/conversion_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha7
 
 import (
-	"slices"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -32,6 +31,7 @@ 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"
 )
 
@@ -91,7 +91,7 @@ func TestFuzzyConversion(t *testing.T) {
 			},
 		}
 
-		return slices.Concat(v1alpha7FuzzerFuncs, testhelpers.InfraV1FuzzerFuncs())
+		return futures.SlicesConcat(v1alpha7FuzzerFuncs, testhelpers.InfraV1FuzzerFuncs())
 	}
 
 	t.Run("for OpenStackCluster", runParallel(utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{

go.mod

@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api-provider-openstack
 
-go 1.22
+go 1.21
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc

hack/tools/go.mod

@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api-provider-openstack/hack/tools
 
-go 1.22
+go 1.21
 
 require (
 	github.com/a8m/envsubst v1.2.0

internal/futures/slices.go

@@ -0,0 +1,19 @@
+package futures
+
+import stdlib_slices "slices"
+
+// SlicesConcat vendors the Go v1.22 slices.Concat function.
+func SlicesConcat[S ~[]E, E any](slices ...S) S {
+	size := 0
+	for _, s := range slices {
+		size += len(s)
+		if size < 0 {
+			panic("len out of range")
+		}
+	}
+	newslice := stdlib_slices.Grow[S](nil, size)
+	for _, s := range slices {
+		newslice = append(newslice, s...)
+	}
+	return newslice
+}

pkg/cloud/services/compute/referenced_resources.go

@@ -21,6 +21,7 @@ import (
 	"slices"
 
 	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"
 )
@@ -89,7 +90,7 @@ func ResolveMachineSpec(scope *scope.WithLogger, spec *infrav1.OpenStackMachineS
 // 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 := slices.Concat(spec.Tags, openStackCluster.Spec.Tags)
+	machineTags := futures.SlicesConcat(spec.Tags, openStackCluster.Spec.Tags)
 
 	seen := make(map[string]struct{}, len(machineTags))
 	unique := make([]string, 0, len(machineTags))

pkg/cloud/services/networking/port.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"slices"
 	"strings"
 	"time"
 
@@ -33,6 +32,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	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"
@@ -427,7 +427,7 @@ func (s *Service) normalizePorts(ports []infrav1.PortOpts, clusterResourceName,
 		}
 
 		// Tags are inherited base tags plus any port-specific tags
-		normalizedPort.Tags = slices.Concat(baseTags, port.Tags)
+		normalizedPort.Tags = futures.SlicesConcat(baseTags, port.Tags)
 
 		// No Trunk field specified for the port, inherit the machine default
 		if port.Trunk == nil {