Skip to content

Commit a6ea3e2

Browse files
authored
Merge pull request #5567 from koba1t/remove_exp_slices_dependencies
fix 'golang.org/x/exp/slices' dependencies
2 parents 1eccd8f + 72f0a3c commit a6ea3e2

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

kustomize/commands/edit/set/setconfigmap.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import (
99

1010
"sigs.k8s.io/kustomize/api/konfig"
1111

12+
"slices"
13+
1214
"github.com/spf13/cobra"
13-
"golang.org/x/exp/slices"
1415
"sigs.k8s.io/kustomize/api/ifc"
1516
"sigs.k8s.io/kustomize/api/resource"
1617
"sigs.k8s.io/kustomize/api/types"
@@ -34,7 +35,7 @@ When namespace is omitted, the default namespace is used. Conversely, when an en
3435
in the %[1]s file, it can be updated by either omitting the namespace on the kustomize edit set configmap invocation or by
3536
specifying --namespace=default.`, konfig.DefaultKustomizationFileName()),
3637
Example: fmt.Sprintf(`
37-
# Edits an existing ConfigMap in the %[1]s file, changing value of key1 to 2, and namespace is implicitly defined as "default"
38+
# Edits an existing ConfigMap in the %[1]s file, changing value of key1 to 2, and namespace is implicitly defined as "default"
3839
kustomize edit set configmap my-configmap --from-literal=key1=2
3940
4041
# Edits an existing ConfigMap in the %[1]s file, changing value of key1 to 2, and explicitly define namespace as "default"

kustomize/commands/edit/set/setsecret.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ package set
77
import (
88
"fmt"
99

10+
"slices"
11+
1012
"github.com/spf13/cobra"
11-
"golang.org/x/exp/slices"
1213
"sigs.k8s.io/kustomize/api/ifc"
1314
"sigs.k8s.io/kustomize/api/konfig"
1415
"sigs.k8s.io/kustomize/api/resource"

kustomize/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/spf13/cobra v1.7.0
88
github.com/spf13/pflag v1.0.5
99
github.com/stretchr/testify v1.8.4
10-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
1110
golang.org/x/text v0.13.0
1211
sigs.k8s.io/kustomize/api v0.16.0
1312
sigs.k8s.io/kustomize/cmd/config v0.13.0

kustomize/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee33
7575
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
7676
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
7777
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
78-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
79-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
8078
golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
8179
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
8280
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

0 commit comments

Comments
 (0)