From bbccee02194a8063ddde27a5aa840b014f6c5623 Mon Sep 17 00:00:00 2001 From: monopole Date: Tue, 9 Feb 2021 07:22:50 -0800 Subject: [PATCH] Fix message in generated code. --- .../k8sgen/pkg/api/resource/amount.go | 2 +- .../internal/k8sgen/pkg/api/resource/math.go | 2 +- .../k8sgen/pkg/api/resource/quantity.go | 2 +- .../k8sgen/pkg/api/resource/scale_int.go | 2 +- .../k8sgen/pkg/api/resource/suffix.go | 2 +- cmd/config/internal/generateddocs/api/docs.go | 16 +-- .../internal/generateddocs/commands/docs.go | 104 +++++++++--------- .../internal/generateddocs/tutorials/docs.go | 10 +- cmd/k8scopy/internal/copier.go | 11 +- cmd/k8scopy/main.go | 4 +- kyaml/fn/framework/example2/pkged.go | 5 +- .../yaml/internal/k8sgen/pkg/labels/labels.go | 2 +- .../internal/k8sgen/pkg/labels/selector.go | 2 +- .../pkg/labels/zz_generated.deepcopy.go | 2 +- .../internal/k8sgen/pkg/selection/operator.go | 2 +- .../internal/k8sgen/pkg/util/errors/errors.go | 2 +- .../internal/k8sgen/pkg/util/sets/empty.go | 2 +- .../internal/k8sgen/pkg/util/sets/string.go | 2 +- .../pkg/util/validation/field/errors.go | 2 +- .../k8sgen/pkg/util/validation/field/path.go | 2 +- .../k8sgen/pkg/util/validation/validation.go | 2 +- kyaml/yaml/merge2/smpdirective_string.go | 3 - 22 files changed, 94 insertions(+), 89 deletions(-) diff --git a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/amount.go b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/amount.go index a8d93065f..25d60c034 100644 --- a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/amount.go +++ b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/amount.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.18.10/pkg/api/resource/amount.go /* diff --git a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/math.go b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/math.go index 5da3db477..a8cfa23a9 100644 --- a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/math.go +++ b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/math.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.18.10/pkg/api/resource/math.go /* diff --git a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/quantity.go b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/quantity.go index e353bc454..3a70419f8 100644 --- a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/quantity.go +++ b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/quantity.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.18.10/pkg/api/resource/quantity.go /* diff --git a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/scale_int.go b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/scale_int.go index e56d1d725..66147cbb3 100644 --- a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/scale_int.go +++ b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/scale_int.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.18.10/pkg/api/resource/scale_int.go /* diff --git a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/suffix.go b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/suffix.go index aced71806..0b04d3768 100644 --- a/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/suffix.go +++ b/cmd/config/internal/commands/internal/k8sgen/pkg/api/resource/suffix.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.18.10; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.18.10/pkg/api/resource/suffix.go /* diff --git a/cmd/config/internal/generateddocs/api/docs.go b/cmd/config/internal/generateddocs/api/docs.go index d4ffb9672..5ef569132 100644 --- a/cmd/config/internal/generateddocs/api/docs.go +++ b/cmd/config/internal/generateddocs/api/docs.go @@ -1,7 +1,9 @@ + + // Code generated by "mdtogo"; DO NOT EDIT. package api -var ConfigIoLong = `# Configuration IO API Semantics +var ConfigIoLong=`# Configuration IO API Semantics Resource Configuration may be read / written from / to sources such as directories, stdin|out or network. Tools may be composed using pipes such that the tools writing @@ -61,8 +63,8 @@ Example: annotations: config.kubernetes.io/local-config: "true"` -var FunctionsImplShort = `Following is an example for implementing an nginx abstraction using a configuration` -var FunctionsImplLong = `# Running Configuration Functions using kustomize CLI +var FunctionsImplShort=`Following is an example for implementing an nginx abstraction using a configuration` +var FunctionsImplLong=`# Running Configuration Functions using kustomize CLI Configuration functions can be implemented using any toolchain and invoked using any container workflow orchestrator including Tekton, Cloud Build, or run directly using ` + "`" + `docker run` + "`" + `. @@ -231,8 +233,8 @@ The function is invoked using byrunning ` + "`" + `kustomize config run dir/` + app: nginx instance: my-instance` -var FunctionsSpecShort = `_Configuration functions_ enable shift-left practices (client-side) through:` -var FunctionsSpecLong = `# Configuration Functions Specification +var FunctionsSpecShort=`_Configuration functions_ enable shift-left practices (client-side) through:` +var FunctionsSpecLong=`# Configuration Functions Specification This document specifies a standard for client-side functions that operate on Kubernetes declarative configurations. This standard enables creating @@ -409,7 +411,7 @@ A non-zero exit code indicates a failure. [2]: https://tools.ietf.org/html/rfc2119 [3]: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#types-kinds` -var Merge2Long = `# Merge (2-way) +var Merge2Long=`# Merge (2-way) 2-way merges fields from a source to a destination, overriding the destination fields where they differ. @@ -501,7 +503,7 @@ var Merge2Long = `# Merge (2-way) - name: sidecar2 image: sidecar2:v1` -var Merge3Long = `# Merge (3-way) +var Merge3Long=`# Merge (3-way) 3-way merge identifies changes between an original source + updated source and merges the result into a destination, overriding the destination fields where they have changed between diff --git a/cmd/config/internal/generateddocs/commands/docs.go b/cmd/config/internal/generateddocs/commands/docs.go index 2bde8042c..940f9c4da 100644 --- a/cmd/config/internal/generateddocs/commands/docs.go +++ b/cmd/config/internal/generateddocs/commands/docs.go @@ -1,28 +1,30 @@ + + // Code generated by "mdtogo"; DO NOT EDIT. package commands -var AnnotateShort = `[Alpha] Set an annotation on Resources.` -var AnnotateLong = ` +var AnnotateShort=`[Alpha] Set an annotation on Resources.` +var AnnotateLong=` [Alpha] Set an annotation on Resources. DIR: Path to local directory. ` -var AnnotateExamples = ` +var AnnotateExamples=` kustomize cfg annotate my-dir/ --kv foo=bar kustomize cfg annotate my-dir/ --kv foo=bar --kv a=b kustomize cfg annotate my-dir/ --kv foo=bar --kind Deployment --name foo` -var CatShort = `[Alpha] Print Resource Config from a local directory.` -var CatLong = ` +var CatShort=`[Alpha] Print Resource Config from a local directory.` +var CatLong=` [Alpha] Print Resource Config from a local directory. DIR: Path to local directory. ` -var CatExamples = ` +var CatExamples=` # print Resource config from a directory kustomize cfg cat my-dir/ @@ -32,11 +34,11 @@ var CatExamples = ` # unwrap Resource config from a directory in an ResourceList ... | kustomize cfg cat` -var CompletionShort = `Generate shell completion.` -var CompletionLong = ` +var CompletionShort=`Generate shell completion.` +var CompletionLong=` Generate shell completion for ` + "`" + `kustomize` + "`" + ` -- supports bash, zsh, fish and powershell. ` -var CompletionExamples = ` +var CompletionExamples=` # load completion for Bash source <(kustomize completion bash) @@ -53,19 +55,19 @@ var CompletionExamples = ` kustomize completion zsh > /usr/share/zsh/site-functions/_kustomize ` -var CountShort = `[Alpha] Count Resources Config from a local directory.` -var CountLong = ` +var CountShort=`[Alpha] Count Resources Config from a local directory.` +var CountLong=` [Alpha] Count Resources Config from a local directory. DIR: Path to local directory. ` -var CountExamples = ` +var CountExamples=` # print Resource counts from a directory kustomize cfg count my-dir/` -var CreateSetterShort = `[Alpha] Create a custom setter for a Resource field` -var CreateSetterLong = ` +var CreateSetterShort=`[Alpha] Create a custom setter for a Resource field` +var CreateSetterLong=` Create a custom setter for a Resource field by inlining OpenAPI as comments. DIR @@ -80,7 +82,7 @@ Create a custom setter for a Resource field by inlining OpenAPI as comments. The current value of the field, or a substring within the field. ` -var CreateSetterExamples = ` +var CreateSetterExamples=` # create a setter for port fields matching "8080" kustomize cfg create-setter DIR/ port 8080 --type "integer" --field port \ --description "default port used by the app" @@ -90,8 +92,8 @@ var CreateSetterExamples = ` kustomize cfg create-setter DIR/ image-tag v1.0.1 --type "string" \ --field image --description "current stable release"` -var DeleteSetterShort = `[Alpha] Delete a custom setter for a Resource field` -var DeleteSetterLong = ` +var DeleteSetterShort=`[Alpha] Delete a custom setter for a Resource field` +var DeleteSetterLong=` Delete a custom setter for a Resource field. DIR @@ -102,12 +104,12 @@ Delete a custom setter for a Resource field. The name of the setter to create. ` -var DeleteSetterExamples = ` +var DeleteSetterExamples=` # delete a setter for port kustomize cfg create-setter DIR/ port` -var FmtShort = `[Alpha] Format yaml configuration files.` -var FmtLong = ` +var FmtShort=`[Alpha] Format yaml configuration files.` +var FmtLong=` [Alpha] Format yaml configuration files. Fmt will format input by ordering fields and unordered list items in Kubernetes @@ -133,7 +135,7 @@ field paths. - .spec.template.spec.containers (by element name) - .webhooks.rules.operations (by element value) ` -var FmtExamples = ` +var FmtExamples=` # format file1.yaml and file2.yml kustomize cfg fmt file1.yaml file2.yml @@ -146,8 +148,8 @@ var FmtExamples = ` # format kustomize output kustomize build | kustomize cfg fmt` -var GrepShort = `[Alpha] Search for matching Resources in a directory or from stdin` -var GrepLong = ` +var GrepShort=`[Alpha] Search for matching Resources in a directory or from stdin` +var GrepLong=` [Alpha] Search for matching Resources in a directory or from stdin. QUERY: @@ -160,7 +162,7 @@ var GrepLong = ` DIR: Path to local directory. ` -var GrepExamples = ` +var GrepExamples=` # find Deployment Resources kustomize cfg grep "kind=Deployment" my-dir/ @@ -173,22 +175,22 @@ var GrepExamples = ` # look for Resources matching a specific container image kustomize cfg grep "spec.template.spec.containers[name=nginx].image=nginx:1\.7\.9" my-dir/ | kustomize cfg tree` -var InitShort = `[Alpha] Initialize a directory with a Krmfile.` -var InitLong = ` +var InitShort=`[Alpha] Initialize a directory with a Krmfile.` +var InitLong=` [Alpha] Initialize a directory with a Krmfile. DIR: Path to local directory. ` -var InitExamples = ` +var InitExamples=` # create a Krmfile in the local directory kustomize cfg init # create a Krmfile in my-dir/ kustomize cfg init my-dir/` -var ListSettersShort = `[Alpha] List setters for Resources.` -var ListSettersLong = ` +var ListSettersShort=`[Alpha] List setters for Resources.` +var ListSettersLong=` List setters for Resources. DIR @@ -199,15 +201,15 @@ List setters for Resources. Optional. The name of the setter to display. ` -var ListSettersExamples = ` +var ListSettersExamples=` Show setters: $ kustomize cfg list-setters DIR/ NAME DESCRIPTION VALUE TYPE COUNT SETBY name-prefix '' PREFIX string 2` -var MergeShort = `[Alpha] Merge Resource configuration files` -var MergeLong = ` +var MergeShort=`[Alpha] Merge Resource configuration files` +var MergeLong=` [Alpha] Merge Resource configuration files Merge reads Kubernetes Resource yaml configuration files from stdin or sources packages and write @@ -223,11 +225,11 @@ For information on merge rules, run: kustomize cfg docs merge ` -var MergeExamples = ` +var MergeExamples=` cat resources_and_patches.yaml | kustomize cfg merge > merged_resources.yaml` -var Merge3Short = `[Alpha] Merge diff of Resource configuration files into a destination (3-way)` -var Merge3Long = ` +var Merge3Short=`[Alpha] Merge diff of Resource configuration files into a destination (3-way)` +var Merge3Long=` [Alpha] Merge diff of Resource configuration files into a destination (3-way) Merge3 performs a 3-way merge by applying the diff between 2 sets of Resources to a 3rd set. @@ -242,11 +244,11 @@ For information on merge rules, run: kustomize cfg docs-merge3 ` -var Merge3Examples = ` +var Merge3Examples=` kustomize cfg merge3 --ancestor a/ --from b/ --to c/` -var RunFnsShort = `[Alpha] Reoncile config functions to Resources.` -var RunFnsLong = ` +var RunFnsShort=`[Alpha] Reoncile config functions to Resources.` +var RunFnsLong=` [Alpha] Reconcile config functions to Resources. run sequentially invokes all config functions in the directory, providing Resources @@ -291,11 +293,11 @@ order they appear in the file). See ` + "`" + `kustomize help cfg docs-fn` + "`" + ` for more details on writing functions. ` -var RunFnsExamples = ` +var RunFnsExamples=` kustomize fn run example/` -var SetShort = `[Alpha] Set values on Resources fields values.` -var SetLong = ` +var SetShort=`[Alpha] Set values on Resources fields values.` +var SetLong=` Set values on Resources fields. May set either the complete or partial field value. ` + "`" + `set` + "`" + ` identifies setters using field metadata published as OpenAPI extensions. @@ -333,7 +335,7 @@ The description and setBy fields are left unmodified unless specified with flags To create a custom setter for a field see: ` + "`" + `kustomize help cfg create-setter` + "`" + ` ` -var SetExamples = ` +var SetExamples=` Resource YAML: Name Prefix Setter # DIR/resources.yaml @@ -377,8 +379,8 @@ var SetExamples = ` name: test-app2 # {"description":"test environment","type":"string","x-kustomize":{"setBy":"dev","setter":[{"name":"name-prefix","value":"test"}]}} ...` -var SinkShort = `[Alpha] Implement a Sink by writing input to a local directory.` -var SinkLong = ` +var SinkShort=`[Alpha] Implement a Sink by writing input to a local directory.` +var SinkLong=` [Alpha] Implement a Sink by writing input to a local directory. kustomize fn sink [DIR] @@ -388,11 +390,11 @@ var SinkLong = ` ` + "`" + `sink` + "`" + ` writes its input to a directory ` -var SinkExamples = ` +var SinkExamples=` kustomize fn source DIR/ | your-function | kustomize fn sink DIR/` -var SourceShort = `[Alpha] Implement a Source by reading a local directory.` -var SourceLong = ` +var SourceShort=`[Alpha] Implement a Source by reading a local directory.` +var SourceLong=` [Alpha] Implement a Source by reading a local directory. kustomize fn source DIR... @@ -403,14 +405,14 @@ var SourceLong = ` ` + "`" + `source` + "`" + ` emits configuration to act as input to a function ` -var SourceExamples = ` +var SourceExamples=` # emity configuration directory as input source to a function kustomize fn source DIR/ kustomize fn source DIR/ | your-function | kustomize fn sink DIR/` -var TreeShort = `[Alpha] Display Resource structure from a directory or stdin.` -var TreeLong = ` +var TreeShort=`[Alpha] Display Resource structure from a directory or stdin.` +var TreeLong=` [Alpha] Display Resource structure from a directory or stdin. kustomize cfg tree may be used to print Resources in a directory or cluster, preserving structure @@ -431,7 +433,7 @@ By default, kustomize cfg tree uses Resource graph structure if any relationship are detected, as is typically the case when printing from a cluster. Otherwise, directory graph structure is used. The graph structure can also be selected explicitly using the '--graph-structure' flag. ` -var TreeExamples = ` +var TreeExamples=` # print Resources using directory structure kustomize cfg tree my-dir/ diff --git a/cmd/config/internal/generateddocs/tutorials/docs.go b/cmd/config/internal/generateddocs/tutorials/docs.go index 27f1f0fe6..b02cd1e21 100644 --- a/cmd/config/internal/generateddocs/tutorials/docs.go +++ b/cmd/config/internal/generateddocs/tutorials/docs.go @@ -1,8 +1,10 @@ + + // Code generated by "mdtogo"; DO NOT EDIT. package tutorials -var ConfigurationBasicsShort = `### Synopsis` -var ConfigurationBasicsLong = ` +var ConfigurationBasicsShort=`### Synopsis` +var ConfigurationBasicsLong=` ` + "`" + `kustomize cfg` + "`" + ` provides tools for working with local configuration directories. First fetch a bundle of configuration to your local file system from the @@ -274,8 +276,8 @@ var ConfigurationBasicsLong = ` │   └── image: ...` -var FunctionBasicsShort = `### Synopsis` -var FunctionBasicsLong = ` +var FunctionBasicsShort=`### Synopsis` +var FunctionBasicsLong=` ` + "`" + `kustomize config` + "`" + ` enables encapsulating function for manipulating Resource configuration inside containers, which are run using ` + "`" + `run` + "`" + `. diff --git a/cmd/k8scopy/internal/copier.go b/cmd/k8scopy/internal/copier.go index 6baa26ec4..ee6717824 100644 --- a/cmd/k8scopy/internal/copier.go +++ b/cmd/k8scopy/internal/copier.go @@ -20,6 +20,7 @@ type Copier struct { spec *ModuleSpec goModCache string topPackage string + pwdPackage string srcDir string pgmName string } @@ -29,7 +30,7 @@ func (c Copier) replacementPath() string { } func (c Copier) subPath() string { - return filepath.Join("internal", c.pgmName) + return filepath.Join("internal", c.pwdPackage) } func (c Copier) Print() { @@ -37,6 +38,7 @@ func (c Copier) Print() { fmt.Printf(" replacementPath: %s\n", c.replacementPath()) fmt.Printf(" goModCache: %s\n", c.goModCache) fmt.Printf(" topPackage: %s\n", c.topPackage) + fmt.Printf(" pwdPackage: %s\n", c.pwdPackage) fmt.Printf(" subPath: %s\n", c.subPath()) fmt.Printf(" srcDir: %s\n", c.srcDir) fmt.Printf(" apiMachineryModSpec: %s\n", c.spec.Name()) @@ -44,10 +46,11 @@ func (c Copier) Print() { fmt.Printf(" pwd: %s\n", os.Getenv("PWD")) } -func NewCopier(s *ModuleSpec, prefix string) Copier { +func NewCopier(s *ModuleSpec, prefix, pgmName string) Copier { tmp := Copier{ spec: s, - pgmName: os.Getenv("GOPACKAGE"), + pgmName: pgmName, + pwdPackage: os.Getenv("GOPACKAGE"), goModCache: RunGetOutputCommand("go", "env", "GOMODCACHE"), } goMod := RunGetOutputCommand("go", "env", "GOMOD") @@ -79,7 +82,7 @@ func (c Copier) CopyFile(dir, name string) error { w.write( fmt.Sprintf( // This particular phrasing is required. - "// Code generated by %s/generator from %s; DO NOT EDIT.", + "// Code generated by %s from %s; DO NOT EDIT.", c.pgmName, c.spec.Name())) w.write( fmt.Sprintf( diff --git a/cmd/k8scopy/main.go b/cmd/k8scopy/main.go index 83faca30d..aa5a57db3 100644 --- a/cmd/k8scopy/main.go +++ b/cmd/k8scopy/main.go @@ -33,12 +33,14 @@ import ( "sigs.k8s.io/kustomize/cmd/k8scopy/internal" ) +const pgmName = "k8scopy" + func main() { if len(os.Args) < 3 { log.Fatal("Need name of yaml file containing module specs and prefix.") } spec := internal.ReadSpec(os.Args[1]) - c := internal.NewCopier(spec, os.Args[2]) + c := internal.NewCopier(spec, os.Args[2], pgmName) internal.RunNoOutputCommand("go", "get", spec.Name()) for _, p := range spec.Packages { for _, n := range p.Files { diff --git a/kyaml/fn/framework/example2/pkged.go b/kyaml/fn/framework/example2/pkged.go index fa02488c5..4d222015e 100644 --- a/kyaml/fn/framework/example2/pkged.go +++ b/kyaml/fn/framework/example2/pkged.go @@ -1,6 +1,3 @@ -// Copyright 2019 The Kubernetes Authors. -// SPDX-License-Identifier: Apache-2.0 - // Code generated by pkger; DO NOT EDIT. // +build !skippkger @@ -12,4 +9,4 @@ import ( "github.com/markbates/pkger/pkging/mem" ) -var _ = pkger.Apply(mem.UnmarshalEmbed([]byte(`1f8b08000000000000ffec996d73a23a1b80ff0a93cfac10de02cc9c0fa53d52dbd5b6da8a7a66a71320626a200e606dedf8df9f01aaf6d9ed0b9e63bb333b8e1f20e14ec29d848b6bf009d064cc33603f818c4659636a660dcaa5e93ccb794c97449a3ee29815974f680a6c20dd6424cda4d982e679ca83a91471294b03e9bdc62268c5339ee697389f00fbdd7144d0c131013658174f78006c708983298e8850d60a014f724c934c60d44f714a49268c792aa404873489049c84c222a579717e3ef7499a909c644297647c9e06a4683ea6d13cc539e5898033a1e8b40144708dd388e46f24399b465288d3054d6e711c1ada7b193730104197f337fa022268e33c9800fb1fd0003f44d0cb3123c0ced339792e7409ce78026c90f05ca0499663c64828f8f35cc0f79832ec3322d044f0e79485428083090122707993329215fd863c6844bce8bc9afb0cd8c99c31119c90d9e6fc9a64f9a6cdb6eaa7166d1ece8bdb7b02b516b08d69b2cee5bfec1997b779f8ef5a4b116fc43c2c3be99334a3e554c206d4c16ab512c1b8caf8dd2d6f4be3441aa738260b9e4e25f280e319238a14e21c4bcf3b90a4df66c542569d150f52710c498e292bab926a33ff1a2e828c2e09b02d4304310f09b015a821cdd4a006cb9adb9c964d155991bf41f84d31aea16ccb9aad180d03299aa919a6f94d366d590622a0d96d584c7535ebd96339f809b907363410428a02cb652445d94448041d469329b05511b4120e6c8874d544c5cddcd010d8ba0c45e016678a2c826e5874248be01287b741c46f6560ff238be5ef87088e8a3bcd662428c6ec150768c8860655d33045d0c98a1ad5b42c8854d35889a0fd76bcb18edf64b812c1f18ef10e4df3499d3650d6a0a959d64a04bdcd62388c07d3ac4cd761d36a9134b9b8d26438aa2eb824298fdfb3194e49797af57c5acccb8f728f4d487aa0e6819a7f0a3545302bd3780297d3a8ee76dc0da12b111457d613583c5049be1d71db6d793b7b43f7b6a6919378c6704e1a6be7a981f49f1aadc10e156d4d76ad80e8c748d7151569fa2f481f63967dc0745585a6b9613a7cc974136a7b663a5af3d34286ac2364edc0f42ac5fa4cdfc4d7663a5234649aa6b2617ab90e6ba89bbf1bead2983efc0cf6edbeae2e56ec7e09d62d16b70cac9e9167043eef91ff67e04bb255d107a67d35d3de64cb8675a0f5e89cf8aaa307314bf0e955d4be3b7ab8e83937d8bd897a6a9f8e0667f3d1a0cb8247c709075deeab67cbef11bf6b353b57dd66945fbbec6ee4e9cb510f9e8ddcfe3c74598cbdfee305759cc06dde61f7266f536d711ccd989f0c8d637a1461a5af5f500791c7a3794fe9ebad536815f561dccc42efc6689de6a875ac7b43ef018e7a8e35befaeb2ff06944aea5d0fb1167289b4851556bdfe26cee19b22f2455438aa1cbb521bbceb02e645fc4ef20cea66c58967610e783381fc4f9ab5f325fabcbeb175979dc45905f6bb09163a8ee24c750b610429aba67394696f589726c982a44667d6e5729d6e7f6267e176e1b4835e0568e8b7538c8f1418ebf905baf92e4b7e8f03270fb7717118f5aa7672c701f6643a5b95c6bf14ddc5ff82ebb1b0edad178207fa2feae67e20301de86fd47058610225545fb556053963f53817564587a6d943e67581ba5dbf8fa2885b20ed18bef0c07053e28f04181bfe855b265e1d748f0663c292433c61f77f1e0575bac11ae68e66e220c95f22fab7d7f252e98fd59226ca282af4a7d7a2beb7fe56ad27b13bf03bd2154745dded0bb5c8783081f44f84be9f53a4d7e8b0b4f029779a3c1d9127bd6fc823a93e0d4597e57870fc7713ef3e32ba3f577b770e47be241e62757e7bed797875e7712ba7f979f94fdb8998fae79348aadfb4d79d0590cbd0ebba00e1d0e5ae781eab0e1929fb78e1d79e4c185ef36e5d175513e8a5aa79dc5c86b977d9565b773ef27dd09f67416242fea8fe55fc6aaea8f22ecc1c948d97cbe3ef3bd66527dbee61ffa7bf5d89283761db4eb4f01d7ea7f000000ffff010000ffff631c0417dc270000`))) +var _ = pkger.Apply(mem.UnmarshalEmbed([]byte(`1f8b08000000000000ffec985d53dac01a80ff4ae6bd8e64f369c84c2f8c968816aca004e8749c4db284954d9649362a38fcf7330902adf5b4da0f7b3ccd15d937fbeef73e3c937ba0e984e7e0dc434ee3bc31b3f306e5caacc8054fe89228b3054e58f9fa8866e08032e50951ae3312e35489f91c8ba99267a1f2bd6419dac99c67e223165370bedb8f0c5d9c107060533ce22138f01187331c13a98a4a214f05a6692e311a6438a32497263c933282239ac6124e23e936a3a27c3e2d0292a544905cea919c175948caf4098d8b0c0bca5309e752d9680364b8c0594c04380032f438173f3ddd0e16e1149c4fd080cf32f40566041c9115e4a1d02338e72938907221d13417983112494121247c8329c30123124da5a0a02c92421c4e09c8e0f11665242fdb8d78d88879d9f87a657370d28231198ec87cfb7c4172b1cdd9851e6574785494c3bb87676d4f07d37433975f39111eeff0e8e7b2959837121e558d0c4896d36a29d5866ac26ab59261b29ef1770fb4a34c526592e184dcf26ca6903b9ccc19d194080bac3c9c2f92edcdcb8d5c37565e93f2372202535685d2f551fdb6ba0c395d12700cd4b464487844c0d15463dfb00dd5dcaf22578256c91ad2d43da4eea1fd0bd57074cb319b0ddb6e1aa8695bfb7bc876100219687e15958bbd5ef77c51757f446ec0b12c5d356568a71c1ccdd20dcb6c2219ba8ca63370b46a7b0938aa653775192e69048e8a1092c1db3d0eafaee63842e020197a51d92892a1ffc5045c36cbbf2af270968363cb702068520ea54fc2b21355b36da499860cddbc8c3475cd3235cb345732741e5545c86c22b5b9a9ba9df34a86c3e7571d5e5d15699193089c4f484632fa5c1d8129c96a64d5c87a1bc892615e4de31e3ecee2e71eb697f16b2543f966b380739c9154ec7adc355b0de7b7717317690892cc1916a4b1d18967f0f451d286aaaa666ca06ae8d62fd0748259fe639caa5b9caa1b9ceaba868c9fc06935f297d054552ddbda704fb755c3b65403bd359a2a137af798a8bb23b77eb986e6d344dbe1697d7c1fe8f4b07d5fe3e94be8ac6bd7b8796ddcfcd76bbfc510b417ee51a0bb6698b0141f9fc79deb83bbb3be7b89bdcbb8af0fe87878528c873d162e5c371af678a09f2c3fc4fcbaddea9ef75ab1b8f0d8f5d83797e3be7a32f60645e4b104fb83c51975ddd06b5d63ef5274a8717b18cf59908eac437a10636d609e51779f2c0e8abe3630dbc76ab38c47492b8ffc4bab7d2cf6db87a63ff2efd471df6d4ecedfbd833f06cb67a9e5ff86506ab550d642590be5bf4bf8d7d5c8cdbf48f5fb12717c2a612b8daafe9ad2a8ff46692c47fe0bd2681ab6850ce3ad11b396c67f01294f5ef2bfa289cbd01b5c9fc53c6e1f9fb0d0bb9b8fb4d672a38b97c9e036f0d8f568d8892743f407b570b3123f10c35db5bfab8646ad86b51ad66af8ef727c07a2d791c36d7f4a44e68c2f5ee2874f666cf8a919f66b0aa2f9fb04b11a792d88b520fe7f82e5e98bfe571c711a7acc1f0f4f96d86f1667d49d86c7eef2833eba3b4cc43c48ceadf6fb5ee98e37c45759909e9f06fe008dfcde34f2de579f2083a425c6173c1e27cd9b6d79d8bd1df95d76465d3a1ab64f43dd65a3253f6d1fba68ecabb781d742e38bb27c10b78fbbb763bf53b55595bdee4d90f6a6d83759987e113f44dff4b58e1fc4d857a7636dfbb9f324f05be9fa7327ffa1d7aeaf2da97da7f69db781a5d57f000000ffff010000ffff6b4abe49e0240000`))) diff --git a/kyaml/yaml/internal/k8sgen/pkg/labels/labels.go b/kyaml/yaml/internal/k8sgen/pkg/labels/labels.go index e72c60c68..92ee10f60 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/labels/labels.go +++ b/kyaml/yaml/internal/k8sgen/pkg/labels/labels.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/labels/labels.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go b/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go index 666b417b9..1a7906002 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go +++ b/kyaml/yaml/internal/k8sgen/pkg/labels/selector.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/labels/selector.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/labels/zz_generated.deepcopy.go b/kyaml/yaml/internal/k8sgen/pkg/labels/zz_generated.deepcopy.go index b3dd250f0..980093f69 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/labels/zz_generated.deepcopy.go +++ b/kyaml/yaml/internal/k8sgen/pkg/labels/zz_generated.deepcopy.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/labels/zz_generated.deepcopy.go // +build !ignore_autogenerated diff --git a/kyaml/yaml/internal/k8sgen/pkg/selection/operator.go b/kyaml/yaml/internal/k8sgen/pkg/selection/operator.go index fa38dd078..0b5278988 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/selection/operator.go +++ b/kyaml/yaml/internal/k8sgen/pkg/selection/operator.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/selection/operator.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/util/errors/errors.go b/kyaml/yaml/internal/k8sgen/pkg/util/errors/errors.go index d50c63623..0b51357d3 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/util/errors/errors.go +++ b/kyaml/yaml/internal/k8sgen/pkg/util/errors/errors.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/util/errors/errors.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/util/sets/empty.go b/kyaml/yaml/internal/k8sgen/pkg/util/sets/empty.go index b2aaacf2a..d3b52b760 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/util/sets/empty.go +++ b/kyaml/yaml/internal/k8sgen/pkg/util/sets/empty.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/util/sets/empty.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/util/sets/string.go b/kyaml/yaml/internal/k8sgen/pkg/util/sets/string.go index f4447c773..3b52f6688 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/util/sets/string.go +++ b/kyaml/yaml/internal/k8sgen/pkg/util/sets/string.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/util/sets/string.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/errors.go b/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/errors.go index 393bab085..ff4367096 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/errors.go +++ b/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/errors.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/util/validation/field/errors.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/path.go b/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/path.go index 2a636739e..daa777441 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/path.go +++ b/kyaml/yaml/internal/k8sgen/pkg/util/validation/field/path.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/util/validation/field/path.go /* diff --git a/kyaml/yaml/internal/k8sgen/pkg/util/validation/validation.go b/kyaml/yaml/internal/k8sgen/pkg/util/validation/validation.go index b6e98da7d..21131bda9 100644 --- a/kyaml/yaml/internal/k8sgen/pkg/util/validation/validation.go +++ b/kyaml/yaml/internal/k8sgen/pkg/util/validation/validation.go @@ -1,4 +1,4 @@ -// Code generated by k8sgen/generator from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. +// Code generated by k8scopy from k8s.io/apimachinery@v0.17.0; DO NOT EDIT. // Copied from k8s.io/apimachinery@v0.17.0/pkg/util/validation/validation.go /* diff --git a/kyaml/yaml/merge2/smpdirective_string.go b/kyaml/yaml/merge2/smpdirective_string.go index d60ac4465..b4f937f0e 100644 --- a/kyaml/yaml/merge2/smpdirective_string.go +++ b/kyaml/yaml/merge2/smpdirective_string.go @@ -1,6 +1,3 @@ -// Copyright 2020 The Kubernetes Authors. -// SPDX-License-Identifier: Apache-2.0 - // Code generated by "stringer -type=smpDirective -linecomment"; DO NOT EDIT. package merge2