Skip to content

Commit 4711bfe

Browse files
natasha41575natasha41575
authored
Merge pull request #5212 from natasha41575/pintokyaml
pin to kyaml
2 parents 9e42f8d + 8c0e0b3 commit 4711bfe

File tree

66 files changed

+149
-99
lines changed

Some content is hidden

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

66 files changed

+149
-99
lines changed

‎api/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/stretchr/testify v1.8.1
1111
gopkg.in/yaml.v2 v2.4.0
1212
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961
13-
sigs.k8s.io/kustomize/kyaml v0.14.2
13+
sigs.k8s.io/kustomize/kyaml v0.14.3
1414
sigs.k8s.io/yaml v1.3.0
1515
)
1616

@@ -35,5 +35,3 @@ require (
3535
google.golang.org/protobuf v1.30.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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
8585
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 h1:pqRVJGQJz6oeZby8qmPKXYIBjyrcv7EHCe/33UkZMYA=
8686
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961/go.mod h1:l8HTwL5fqnlns4jOveW1L75eo7R9KFHxiE0bsPGy428=
8787
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
88+
sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=
89+
sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=
8890
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
8991
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎cmd/config/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/spf13/cobra v1.7.0
88
github.com/stretchr/testify v1.8.1
99
gopkg.in/inf.v0 v0.9.1
10-
sigs.k8s.io/kustomize/kyaml v0.14.2
10+
sigs.k8s.io/kustomize/kyaml v0.14.3
1111
)
1212

1313
require (
@@ -35,5 +35,3 @@ require (
3535
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 // 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
8787
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 h1:pqRVJGQJz6oeZby8qmPKXYIBjyrcv7EHCe/33UkZMYA=
8888
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961/go.mod h1:l8HTwL5fqnlns4jOveW1L75eo7R9KFHxiE0bsPGy428=
8989
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
90+
sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=
91+
sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=
9092
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
9193
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎cmd/pluginator/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/spf13/cobra v1.7.0
77
github.com/stretchr/testify v1.8.1
88
sigs.k8s.io/kustomize/api v0.13.4
9-
sigs.k8s.io/kustomize/kyaml v0.14.2
9+
sigs.k8s.io/kustomize/kyaml v0.14.3
1010
)
1111

1212
require (
@@ -37,5 +37,3 @@ require (
3737
)
3838

3939
replace sigs.k8s.io/kustomize/api => ../../api
40-
41-
replace sigs.k8s.io/kustomize/kyaml => ../../kyaml

‎cmd/pluginator/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,7 @@ k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961/go.mod h1:l8HTwL5fqnlns4j
8383
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
8484
k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
8585
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
86+
sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=
87+
sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=
8688
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
8789
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎kustomize/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
golang.org/x/text v0.8.0
1111
sigs.k8s.io/kustomize/api v0.13.4
1212
sigs.k8s.io/kustomize/cmd/config v0.11.2
13-
sigs.k8s.io/kustomize/kyaml v0.14.2
13+
sigs.k8s.io/kustomize/kyaml v0.14.3
1414
sigs.k8s.io/yaml v1.3.0
1515
)
1616

@@ -45,5 +45,3 @@ require (
4545
replace sigs.k8s.io/kustomize/api => ../api
4646

4747
replace sigs.k8s.io/kustomize/cmd/config => ../cmd/config
48-
49-
replace sigs.k8s.io/kustomize/kyaml => ../kyaml

‎kustomize/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
9191
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 h1:pqRVJGQJz6oeZby8qmPKXYIBjyrcv7EHCe/33UkZMYA=
9292
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961/go.mod h1:l8HTwL5fqnlns4jOveW1L75eo7R9KFHxiE0bsPGy428=
9393
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
94+
sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=
95+
sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=
9496
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
9597
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎plugin/builtin/annotationstransformer/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ require (
2424
github.com/mailru/easyjson v0.7.7 // indirect
2525
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
2626
github.com/pkg/errors v0.9.1 // indirect
27+
github.com/pmezard/go-difflib v1.0.0 // indirect
28+
github.com/stretchr/testify v1.8.1 // indirect
2729
github.com/xlab/treeprint v1.2.0 // indirect
2830
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
2931
golang.org/x/sys v0.8.0 // indirect
3032
google.golang.org/protobuf v1.30.0 // indirect
3133
gopkg.in/yaml.v2 v2.4.0 // indirect
3234
gopkg.in/yaml.v3 v3.0.1 // indirect
3335
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 // indirect
34-
sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
36+
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
3537
)
3638

3739
replace sigs.k8s.io/kustomize/api => ../../../api
38-
39-
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

‎plugin/builtin/annotationstransformer/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
7979
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 h1:pqRVJGQJz6oeZby8qmPKXYIBjyrcv7EHCe/33UkZMYA=
8080
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961/go.mod h1:l8HTwL5fqnlns4jOveW1L75eo7R9KFHxiE0bsPGy428=
8181
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
82+
sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs=
83+
sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA=
8284
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
8385
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

0 commit comments

Comments
 (0)