Update kustomize/api/internal/crawl/go.sum

Merge pull request #3643 from monopole/pinToCmdConfig
Pin to cmd/config v0.9.4
2026-06-17 11:58:18 +00:00 · 2021-02-26 16:40:04 -08:00 · 2021-02-26 16:21:30 -08:00 · 2021-02-26 15:51:25 -08:00 · 2021-02-26 15:49:11 -08:00 · 2021-02-26 15:35:13 -08:00
13 changed files with 20 additions and 19 deletions
--- a/api/go.mod
+++ b/api/go.mod
@@ -13,6 +13,6 @@ require (
 	github.com/stretchr/testify v1.4.0
 	gopkg.in/yaml.v2 v2.3.0
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
-	sigs.k8s.io/kustomize/kyaml v0.10.11
+	sigs.k8s.io/kustomize/kyaml v0.10.12
 	sigs.k8s.io/yaml v1.2.0
 )
--- a/api/go.sum
+++ b/api/go.sum
@@ -281,7 +281,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sigs.k8s.io/kustomize/kyaml v0.10.11 h1:7KzaMS6TtwhGQW6hkw8umC2zFtSGAQPdAMagfautnkw=
-sigs.k8s.io/kustomize/kyaml v0.10.11/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
+sigs.k8s.io/kustomize/kyaml v0.10.12 h1:1lUvuSVETthZspl4X+Xdic/FgPAfxUbc7MKtc1vcO2c=
+sigs.k8s.io/kustomize/kyaml v0.10.12/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
--- a/api/internal/crawl/go.sum
+++ b/api/internal/crawl/go.sum
@@ -269,7 +269,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sigs.k8s.io/kustomize/kyaml v0.10.11 h1:7KzaMS6TtwhGQW6hkw8umC2zFtSGAQPdAMagfautnkw=
-sigs.k8s.io/kustomize/kyaml v0.10.11/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
+sigs.k8s.io/kustomize/kyaml v0.10.12 h1:1lUvuSVETthZspl4X+Xdic/FgPAfxUbc7MKtc1vcO2c=
+sigs.k8s.io/kustomize/kyaml v0.10.12/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
--- a/cmd/config/go.mod
+++ b/cmd/config/go.mod
@@ -17,5 +17,5 @@ require (
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/inf.v0 v0.9.1
-	sigs.k8s.io/kustomize/kyaml v0.10.11
+	sigs.k8s.io/kustomize/kyaml v0.10.12
 )
--- a/cmd/config/go.sum
+++ b/cmd/config/go.sum
@@ -291,5 +291,5 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sigs.k8s.io/kustomize/kyaml v0.10.11 h1:7KzaMS6TtwhGQW6hkw8umC2zFtSGAQPdAMagfautnkw=
-sigs.k8s.io/kustomize/kyaml v0.10.11/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
+sigs.k8s.io/kustomize/kyaml v0.10.12 h1:1lUvuSVETthZspl4X+Xdic/FgPAfxUbc7MKtc1vcO2c=
+sigs.k8s.io/kustomize/kyaml v0.10.12/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
--- a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/amount.go
+++ b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/amount.go
@@ -57,7 +57,6 @@ var (

 // int64Amount represents a fixed precision numerator and arbitrary scale exponent. It is faster
 // than operations on inf.Dec for values that can be represented as int64.
-// +k8s:openapi-gen=true
 type int64Amount struct {
 	value int64
 	scale Scale
--- a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/quantity.go
+++ b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/quantity.go
@@ -86,8 +86,6 @@ import (
 // +protobuf.embed=string
 // +protobuf.options.marshal=false
 // +protobuf.options.(gogoproto.goproto_stringer)=false
-// +k8s:deepcopy-gen=true
-// +k8s:openapi-gen=true
 type Quantity struct {
 	// i is the quantity in int64 scaled form, if d.Dec == nil
 	i int64Amount
--- a/cmd/k8scopy/internal/copier.go
+++ b/cmd/k8scopy/internal/copier.go
@@ -92,10 +92,11 @@ func (c Copier) CopyFile(dir, name string) error {
 	for scanner.Scan() {
 		l := scanner.Text()
 		// Disallow recursive generation.
-		if strings.HasPrefix(l, "//go:generate") {
+		if strings.HasPrefix(l, "//go:generate") ||
+			strings.HasPrefix(l, "// +k8s:") {
 			continue
 		}
-		// Don't want it to appear double generated.
+		// When copying generated code, drop the old 'generated' message.
 		if strings.HasPrefix(l, "// Code generated") {
 			continue
 		}
--- a/cmd/pluginator/go.mod
+++ b/cmd/pluginator/go.mod
@@ -7,6 +7,6 @@ require (
 	github.com/spf13/cobra v1.0.0
 	github.com/stretchr/testify v1.4.0
 	sigs.k8s.io/kustomize/api v0.8.2
-	sigs.k8s.io/kustomize/kyaml v0.10.11
+	sigs.k8s.io/kustomize/kyaml v0.10.12
 	sigs.k8s.io/yaml v1.2.0
 )
--- a/cmd/pluginator/go.sum
+++ b/cmd/pluginator/go.sum
@@ -270,5 +270,7 @@ sigs.k8s.io/kustomize/api v0.8.2 h1:YrFKmhRgpkqa3Il2Geh+BflrRwN4vvyLH+DlKmREteU=
 sigs.k8s.io/kustomize/api v0.8.2/go.mod h1:yHAkpXolD4n+m7YoostNPYTEyDjwdNNGRQ0Mitxihrc=
 sigs.k8s.io/kustomize/kyaml v0.10.11 h1:7KzaMS6TtwhGQW6hkw8umC2zFtSGAQPdAMagfautnkw=
 sigs.k8s.io/kustomize/kyaml v0.10.11/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
+sigs.k8s.io/kustomize/kyaml v0.10.12 h1:1lUvuSVETthZspl4X+Xdic/FgPAfxUbc7MKtc1vcO2c=
+sigs.k8s.io/kustomize/kyaml v0.10.12/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
--- a/kustomize/go.mod
+++ b/kustomize/go.mod
@@ -8,8 +8,8 @@ require (
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	sigs.k8s.io/kustomize/api v0.8.2
-	sigs.k8s.io/kustomize/cmd/config v0.9.3
-	sigs.k8s.io/kustomize/kyaml v0.10.11
+	sigs.k8s.io/kustomize/cmd/config v0.9.4
+	sigs.k8s.io/kustomize/kyaml v0.10.12
 	sigs.k8s.io/yaml v1.2.0
 )

--- a/kustomize/go.sum
+++ b/kustomize/go.sum
@@ -302,9 +302,11 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 sigs.k8s.io/kustomize/api v0.8.2 h1:YrFKmhRgpkqa3Il2Geh+BflrRwN4vvyLH+DlKmREteU=
 sigs.k8s.io/kustomize/api v0.8.2/go.mod h1:yHAkpXolD4n+m7YoostNPYTEyDjwdNNGRQ0Mitxihrc=
-sigs.k8s.io/kustomize/cmd/config v0.9.3 h1:hzpeK4tiWUsGhazh8HT9fWU5/wj0RTZmH2RcCJ1c18w=
-sigs.k8s.io/kustomize/cmd/config v0.9.3/go.mod h1:UvkycBEfyyVK49Xiy546K2y9GsxFgWYQ/sGZQ8eCQAM=
+sigs.k8s.io/kustomize/cmd/config v0.9.4 h1:YCOYjb2+TboucGP3IUgK7/v80FrfSE1aqtq7br08D9c=
+sigs.k8s.io/kustomize/cmd/config v0.9.4/go.mod h1:sYbSd8IfPkx2VFWXuA/pqxHLwUItg+vi75lQa5DXKNE=
 sigs.k8s.io/kustomize/kyaml v0.10.11 h1:7KzaMS6TtwhGQW6hkw8umC2zFtSGAQPdAMagfautnkw=
 sigs.k8s.io/kustomize/kyaml v0.10.11/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
+sigs.k8s.io/kustomize/kyaml v0.10.12 h1:1lUvuSVETthZspl4X+Xdic/FgPAfxUbc7MKtc1vcO2c=
+sigs.k8s.io/kustomize/kyaml v0.10.12/go.mod h1:uD7q6dIrZV02fBV6D7FOgdOBcLfUmhG3ExxDIGbUM3w=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
--- a/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go
+++ b/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go
@@ -121,7 +121,6 @@ func (a ByKey) Less(i, j int) bool { return a[i].key < a[j].key }
 // The zero value of Requirement is invalid.
 // Requirement implements both set based match and exact match
 // Requirement should be initialized via NewRequirement constructor for creating a valid Requirement.
-// +k8s:deepcopy-gen=true
 type Requirement struct {
 	key      string
 	operator selection.Operator
Author	SHA1	Message	Date
Jeff Regan	4263d18c1a	Update kustomize/api/internal/crawl/go.sum	2021-02-26 16:40:04 -08:00
Jeff Regan	827fb1e1da	Merge pull request #3643 from monopole/pinToCmdConfig Pin to cmd/config v0.9.4	2021-02-26 16:21:30 -08:00
monopole	03c77cee9b	Pin to cmd/config v0.9.4	2021-02-26 15:51:25 -08:00
Jeff Regan	2db34e7127	Merge pull request #3642 from monopole/pinToKyamlAndCliUtils Pin to kyaml v0.10.12	2021-02-26 15:49:11 -08:00
monopole	821b14bfd1	Pin to kyaml v0.10.12	2021-02-26 15:35:13 -08:00
Jeff Regan	33b4735f98	Merge pull request #3641 from monopole/dropReGenerationDirectives Drop regeneration directives from copied code.	2021-02-26 15:18:24 -08:00
monopole	bbebd1e56a	Drop regeneration directives from copied code.	2021-02-26 14:34:22 -08:00