kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 18:10:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Drop regeneration directives from copied code.

Browse Source
This commit is contained in:
monopole
2021-02-26 14:34:22 -08:00
parent c9d9348944
commit bbebd1e56a
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/amount.go
View File

@@ -57,7 +57,6 @@ var (
// int64Amount represents a fixed precision numerator and arbitrary scale exponent. It is faster // 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. // than operations on inf.Dec for values that can be represented as int64.
// +k8s:openapi-gen=true
type int64Amount struct { type int64Amount struct {
value int64 value int64
scale Scale scale Scale

2
cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/quantity.go
View File

@@ -86,8 +86,6 @@ import (
// +protobuf.embed=string // +protobuf.embed=string
// +protobuf.options.marshal=false // +protobuf.options.marshal=false
// +protobuf.options.(gogoproto.goproto_stringer)=false // +protobuf.options.(gogoproto.goproto_stringer)=false
// +k8s:deepcopy-gen=true
// +k8s:openapi-gen=true
type Quantity struct { type Quantity struct {
// i is the quantity in int64 scaled form, if d.Dec == nil // i is the quantity in int64 scaled form, if d.Dec == nil
i int64Amount i int64Amount

5
cmd/k8scopy/internal/copier.go
View File

@@ -92,10 +92,11 @@ func (c Copier) CopyFile(dir, name string) error {
for scanner.Scan() { for scanner.Scan() {
l := scanner.Text() l := scanner.Text()
// Disallow recursive generation. // Disallow recursive generation.
if strings.HasPrefix(l, "//go:generate") { if strings.HasPrefix(l, "//go:generate") ||
strings.HasPrefix(l, "// +k8s:") {
continue continue
} }
// Don't want it to appear double generated. // When copying generated code, drop the old 'generated' message.
if strings.HasPrefix(l, "// Code generated") { if strings.HasPrefix(l, "// Code generated") {
continue continue
} }

1
kyaml/yaml/internal/k8sgen/pkg/labels/selector.go
View File

@@ -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. // The zero value of Requirement is invalid.
// Requirement implements both set based match and exact match // Requirement implements both set based match and exact match
// Requirement should be initialized via NewRequirement constructor for creating a valid Requirement. // Requirement should be initialized via NewRequirement constructor for creating a valid Requirement.
// +k8s:deepcopy-gen=true
type Requirement struct { type Requirement struct {
key string key string
operator selection.Operator operator selection.Operator