Skip to content

Commit 22dbd3e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5038 from KnVerey/unpin-modules
Update all modules to latest releases, but unpinned
2 parents a090cea + 51e2714 commit 22dbd3e

File tree

68 files changed

+252
-14871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+252
-14871
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ require (
3535
google.golang.org/protobuf v1.28.0 // indirect
3636
gopkg.in/yaml.v3 v3.0.1 // indirect
3737
)
38+
39+
replace sigs.k8s.io/kustomize/kyaml => ../kyaml

‎api/go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
149149
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
150150
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 h1:8cNCQs+WqqnSpZ7y0LMQPKD+RZUHU17VqLPMW3qxnxc=
151151
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
152-
sigs.k8s.io/kustomize/kyaml v0.14.0 h1:uzH0MzMtYypHW09LbMDk8k/lT/LSsUuCoZIuEGhIBNE=
153-
sigs.k8s.io/kustomize/kyaml v0.14.0/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
154152
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
155153
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎cmd/config/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ require (
3535
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
3636
sigs.k8s.io/yaml v1.3.0 // indirect
3737
)
38+
39+
replace sigs.k8s.io/kustomize/kyaml => ../../kyaml

‎cmd/config/go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
151151
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
152152
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 h1:8cNCQs+WqqnSpZ7y0LMQPKD+RZUHU17VqLPMW3qxnxc=
153153
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
154-
sigs.k8s.io/kustomize/kyaml v0.14.0 h1:uzH0MzMtYypHW09LbMDk8k/lT/LSsUuCoZIuEGhIBNE=
155-
sigs.k8s.io/kustomize/kyaml v0.14.0/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
156154
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
157155
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎cmd/gorepomod/internal/repo/dotgitdata.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (dg *DotGitData) checkModules(modules []*protoModule) error {
127127
}
128128
} else {
129129
// Do the relative path and short name make sense?
130-
if !strings.HasPrefix(string(shortName), "plugin/") && !strings.HasSuffix(pm.PathToGoMod(), string(shortName)) {
130+
if !strings.HasSuffix(pm.PathToGoMod(), string(shortName)) {
131131
return fmt.Errorf(
132132
"in %q, the module name %q doesn't match the file's pathToGoMod %q",
133133
file, shortName, pm.PathToGoMod())

‎cmd/pluginator/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ require (
3838
)
3939

4040
replace sigs.k8s.io/kustomize/api => ../../api
41+
42+
replace sigs.k8s.io/kustomize/kyaml => ../../kyaml

‎cmd/pluginator/go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,5 @@ k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 h1:8cNCQs+WqqnSpZ7y0LMQPK
155155
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
156156
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
157157
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
158-
sigs.k8s.io/kustomize/kyaml v0.14.0 h1:uzH0MzMtYypHW09LbMDk8k/lT/LSsUuCoZIuEGhIBNE=
159-
sigs.k8s.io/kustomize/kyaml v0.14.0/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
160158
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
161159
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎kustomize/go.mod‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,9 @@ require (
4141
gopkg.in/yaml.v3 v3.0.1 // indirect
4242
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
4343
)
44+
45+
replace sigs.k8s.io/kustomize/api => ../api
46+
47+
replace sigs.k8s.io/kustomize/cmd/config => ../cmd/config
48+
49+
replace sigs.k8s.io/kustomize/kyaml => ../kyaml

‎kustomize/go.sum‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
157157
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
158158
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 h1:8cNCQs+WqqnSpZ7y0LMQPKD+RZUHU17VqLPMW3qxnxc=
159159
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
160-
sigs.k8s.io/kustomize/api v0.13.1 h1:2jLAM6w5nGznnQgq2V0YUMFGtAixD2SO8Q+f5B9Un9U=
161-
sigs.k8s.io/kustomize/api v0.13.1/go.mod h1:KDhwElNK4jxc2/cEpFQOnYT/72t+ET7yeasogV89ow4=
162-
sigs.k8s.io/kustomize/cmd/config v0.11.0 h1:GUrKUO954lWfDy4yU9t22xNo++rgC0piWhyeDqqmMTQ=
163-
sigs.k8s.io/kustomize/cmd/config v0.11.0/go.mod h1:vsC4WPJub39YAH1aMeuU5dzCwe2zY6EbEKDo0PddiIc=
164-
sigs.k8s.io/kustomize/kyaml v0.14.0 h1:uzH0MzMtYypHW09LbMDk8k/lT/LSsUuCoZIuEGhIBNE=
165-
sigs.k8s.io/kustomize/kyaml v0.14.0/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
166160
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
167161
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎plugin/builtin/annotationstransformer/go.mod‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module sigs.k8s.io/kustomize/plugin/builtin/annotationstransformer
33
go 1.19
44

55
require (
6-
sigs.k8s.io/kustomize/api v0.11.5
6+
sigs.k8s.io/kustomize/api v0.13.1
77
sigs.k8s.io/yaml v1.3.0
88
)
99

@@ -26,9 +26,14 @@ require (
2626
github.com/pkg/errors v0.9.1 // indirect
2727
github.com/xlab/treeprint v1.1.0 // indirect
2828
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
29+
golang.org/x/sys v0.3.0 // indirect
2930
google.golang.org/protobuf v1.28.0 // indirect
3031
gopkg.in/yaml.v2 v2.4.0 // indirect
3132
gopkg.in/yaml.v3 v3.0.1 // indirect
3233
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
33-
sigs.k8s.io/kustomize/kyaml v0.13.7 // indirect
34+
sigs.k8s.io/kustomize/kyaml v0.14.0 // indirect
3435
)
36+
37+
replace sigs.k8s.io/kustomize/api => ../../../api
38+
39+
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

0 commit comments

Comments
 (0)