Skip to content

Commit 03f0e5a

Browse files
committed
[golang] replace "golang.org/x/exp/slices" with stdlib one
Signed-off-by: Martin Schuppert <[email protected]>
1 parent 5665f90 commit 03f0e5a

File tree

8 files changed

+8
-9
lines changed

8 files changed

+8
-9
lines changed

apis/core/v1beta1/openstackcontrolplane_webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package v1beta1
1919
import (
2020
"context"
2121
"fmt"
22+
"slices"
2223
"strings"
2324

2425
keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
@@ -28,7 +29,6 @@ import (
2829
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
2930
watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1"
3031
"golang.org/x/exp/maps"
31-
"golang.org/x/exp/slices"
3232
apierrors "k8s.io/apimachinery/pkg/api/errors"
3333
"k8s.io/apimachinery/pkg/runtime"
3434
"k8s.io/apimachinery/pkg/runtime/schema"

apis/dataplane/v1beta1/openstackdataplanenodeset_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package v1beta1
1919
import (
2020
"context"
2121
"fmt"
22+
"slices"
2223

23-
"golang.org/x/exp/slices"
2424
"sigs.k8s.io/controller-runtime/pkg/client"
2525

2626
infranetworkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"

controllers/dataplane/openstackdataplanenodeset_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ package dataplane
1919
import (
2020
"context"
2121
"fmt"
22+
"slices"
2223
"strings"
2324
"time"
2425

2526
"github.com/go-playground/validator/v10"
26-
"golang.org/x/exp/slices"
2727
batchv1 "k8s.io/api/batch/v1"
2828
corev1 "k8s.io/api/core/v1"
2929
rbacv1 "k8s.io/api/rbac/v1"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ require (
4343
github.com/rabbitmq/cluster-operator/v2 v2.9.0
4444
github.com/stretchr/testify v1.10.0
4545
go.uber.org/zap v1.27.0
46-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
4746
gopkg.in/yaml.v3 v3.0.1
4847
k8s.io/api v0.29.15
4948
k8s.io/apimachinery v0.29.15
@@ -97,6 +96,7 @@ require (
9796
github.com/spf13/pflag v1.0.6 // indirect
9897
go.uber.org/multierr v1.11.0 // indirect
9998
golang.org/x/crypto v0.33.0 // indirect
99+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
100100
golang.org/x/mod v0.20.0 // indirect
101101
golang.org/x/net v0.34.0 // indirect
102102
golang.org/x/oauth2 v0.18.0 // indirect

pkg/dataplane/cert.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ import (
2121
"crypto/sha256"
2222
"encoding/hex"
2323
"fmt"
24+
"slices"
2425
"sort"
2526
"strconv"
2627
"strings"
2728
"time"
2829

29-
"golang.org/x/exp/slices"
30-
3130
corev1 "k8s.io/api/core/v1"
3231
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3332
apimachineryvalidation "k8s.io/apimachinery/pkg/util/validation"

pkg/dataplane/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import (
2323
"fmt"
2424
"path"
2525
"reflect"
26+
"slices"
2627
"sort"
2728
"strconv"
2829

2930
batchv1 "k8s.io/api/batch/v1"
3031
corev1 "k8s.io/api/core/v1"
3132

32-
slices "golang.org/x/exp/slices"
3333
k8s_errors "k8s.io/apimachinery/pkg/api/errors"
3434
"k8s.io/apimachinery/pkg/types"
3535
apimachineryvalidation "k8s.io/apimachinery/pkg/util/validation"

pkg/dataplane/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"fmt"
2222
"os"
2323
"path"
24+
"slices"
2425
"strings"
2526

26-
"golang.org/x/exp/slices"
2727
yaml "gopkg.in/yaml.v3"
2828
k8s_errors "k8s.io/apimachinery/pkg/api/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/openstack/ca.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"fmt"
1010
"math"
1111
"os"
12+
"slices"
1213
"strings"
1314
"time"
1415

@@ -20,7 +21,6 @@ import (
2021
"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
2122
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
2223
"github.com/openstack-k8s-operators/lib-common/modules/common/util"
23-
"golang.org/x/exp/slices"
2424
k8s_errors "k8s.io/apimachinery/pkg/api/errors"
2525

2626
corev1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"

0 commit comments

Comments
 (0)