kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #385 from monopole/fixNits

Browse Source 
Fix some Go nits.
This commit is contained in:
k8s-ci-robot
2018-09-30 18:40:07 -07:00
committed by GitHub
parent 8f903b6e3f 6d935b6a4a
commit c129a3d3b8
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/glossary.md
View File

@@ -21,7 +21,7 @@
[overlays]: #overlay [overlays]: #overlay
[patch]: #patch [patch]: #patch
[patches]: #patch [patches]: #patch
[patchJson6902]: #patchJson6902 [patchJson6902]: #patchjson6902
[patchesJson6902]: #patchjson6902 [patchesJson6902]: #patchjson6902
[proposal]: https://github.com/kubernetes/community/pull/1629 [proposal]: https://github.com/kubernetes/community/pull/1629
[rebase]: https://git-scm.com/docs/git-rebase [rebase]: https://git-scm.com/docs/git-rebase

4
pkg/commands/build.go
View File

@@ -120,12 +120,12 @@ func (o *buildOptions) RunBuild(out io.Writer, fSys fs.FileSystem) error {
return err return err
} }
defer rootLoader.Cleanup() defer rootLoader.Cleanup()
target, err := target.NewKustTarget( kt, err := target.NewKustTarget(
rootLoader, fSys, makeTransformerconfig(fSys, o.transformerconfigPaths)) rootLoader, fSys, makeTransformerconfig(fSys, o.transformerconfigPaths))
if err != nil { if err != nil {
return err return err
} }
allResources, err := target.MakeCustomizedResMap() allResources, err := kt.MakeCustomizedResMap()
if err != nil { if err != nil {
return err return err
} }

2
pkg/loader/githubloader.go
View File

@@ -30,7 +30,7 @@ import (
// githubLoader loads files from a checkout github repo // githubLoader loads files from a checkout github repo
type githubLoader struct { type githubLoader struct {
repo string repo string
// target is the directory which is to be built // targetDir will hold the local repo
targetDir string targetDir string
// checkoutDir is for the whole repository // checkoutDir is for the whole repository
checkoutDir string checkoutDir string

4
pkg/patch/jsonpatch.go → pkg/patch/json6902.go
View File

@@ -18,9 +18,9 @@ package patch
import "sigs.k8s.io/kustomize/pkg/gvk" import "sigs.k8s.io/kustomize/pkg/gvk"
// PatchJson6902 represents a json patch for an object // Json6902 represents a json patch for an object
// with format documented https://tools.ietf.org/html/rfc6902. // with format documented https://tools.ietf.org/html/rfc6902.
type PatchJson6902 struct { type Json6902 struct {
// Target refers to a Kubernetes object that the json patch will be // Target refers to a Kubernetes object that the json patch will be
// applied to. It must refer to a Kubernetes resource under the // applied to. It must refer to a Kubernetes resource under the
// purview of this kustomization. Target should use the // purview of this kustomization. Target should use the

14
pkg/patch/strategicmergepatch.go → pkg/patch/strategicmerge.go
View File

@@ -16,23 +16,23 @@ limitations under the License.
package patch package patch
// PatchStrategicMerge represents a relative path to a // StrategicMerge represents a relative path to a
// stategic merget patch with the format // stategic merge patch with the format
// https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md // https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md
type PatchStrategicMerge string type StrategicMerge string
// Append appends a slice of patch paths to a PatchStategicMerge slice // Append appends a slice of patch paths to a PatchStategicMerge slice
func Append(patches []PatchStrategicMerge, paths ...string) []PatchStrategicMerge { func Append(patches []StrategicMerge, paths ...string) []StrategicMerge {
for _, p := range paths { for _, p := range paths {
patches = append(patches, PatchStrategicMerge(p)) patches = append(patches, StrategicMerge(p))
} }
return patches return patches
} }
// Exist determines if a patch path exists in a slice of PatchStategicMerge // Exist determines if a patch path exists in a slice of PatchStategicMerge
func Exist(patches []PatchStrategicMerge, path string) bool { func Exist(patches []StrategicMerge, path string) bool {
for _, p := range patches { for _, p := range patches {
if p == PatchStrategicMerge(path) { if p == StrategicMerge(path) {
return true return true
} }
} }

6
pkg/patch/transformer/factory.go
View File

@@ -28,7 +28,7 @@ import (
"sigs.k8s.io/kustomize/pkg/transformers" "sigs.k8s.io/kustomize/pkg/transformers"
) )
// PatchJson6902Factory makes PatchJson6902 transformers // PatchJson6902Factory makes Json6902 transformers
type PatchJson6902Factory struct { type PatchJson6902Factory struct {
loader loader.Loader loader loader.Loader
} }
@@ -39,7 +39,7 @@ func NewPatchJson6902Factory(l loader.Loader) PatchJson6902Factory {
} }
// MakePatchJson6902Transformer returns a transformer for applying Json6902 patch // MakePatchJson6902Transformer returns a transformer for applying Json6902 patch
func (f PatchJson6902Factory) MakePatchJson6902Transformer(patches []patch.PatchJson6902) (transformers.Transformer, error) { func (f PatchJson6902Factory) MakePatchJson6902Transformer(patches []patch.Json6902) (transformers.Transformer, error) {
var ts []transformers.Transformer var ts []transformers.Transformer
for _, p := range patches { for _, p := range patches {
t, err := f.makeOnePatchJson6902Transformer(p) t, err := f.makeOnePatchJson6902Transformer(p)
@@ -53,7 +53,7 @@ func (f PatchJson6902Factory) MakePatchJson6902Transformer(patches []patch.Patch
return transformers.NewMultiTransformerWithConflictCheck(ts), nil return transformers.NewMultiTransformerWithConflictCheck(ts), nil
} }
func (f PatchJson6902Factory) makeOnePatchJson6902Transformer(p patch.PatchJson6902) (transformers.Transformer, error) { func (f PatchJson6902Factory) makeOnePatchJson6902Transformer(p patch.Json6902) (transformers.Transformer, error) {
if p.Target == nil { if p.Target == nil {
return nil, fmt.Errorf("must specify the target field in patchesJson6902") return nil, fmt.Errorf("must specify the target field in patchesJson6902")
} }

12
pkg/patch/transformer/factory_test.go
View File

@@ -30,7 +30,7 @@ import (
) )
func TestNewPatchJson6902FactoryNoTarget(t *testing.T) { func TestNewPatchJson6902FactoryNoTarget(t *testing.T) {
p := patch.PatchJson6902{} p := patch.Json6902{}
_, err := NewPatchJson6902Factory(nil).makeOnePatchJson6902Transformer(p) _, err := NewPatchJson6902Factory(nil).makeOnePatchJson6902Transformer(p)
if err == nil { if err == nil {
t.Fatal("expected error") t.Fatal("expected error")
@@ -46,7 +46,7 @@ target:
name: some-name name: some-name
kind: Deployment kind: Deployment
`) `)
p := patch.PatchJson6902{} p := patch.Json6902{}
err := yaml.Unmarshal(jsonPatch, &p) err := yaml.Unmarshal(jsonPatch, &p)
if err != nil { if err != nil {
t.Fatalf("expected error %v", err) t.Fatalf("expected error %v", err)
@@ -79,7 +79,7 @@ target:
name: some-name name: some-name
path: /testpath/patch.json path: /testpath/patch.json
`) `)
p := patch.PatchJson6902{} p := patch.Json6902{}
err = yaml.Unmarshal(jsonPatch, &p) err = yaml.Unmarshal(jsonPatch, &p)
if err != nil { if err != nil {
t.Fatal("expected error") t.Fatal("expected error")
@@ -117,7 +117,7 @@ target:
kind: Deployment kind: Deployment
path: /testpath/patch.yaml path: /testpath/patch.yaml
`) `)
p := patch.PatchJson6902{} p := patch.Json6902{}
err = yaml.Unmarshal(jsonPatch, &p) err = yaml.Unmarshal(jsonPatch, &p)
if err != nil { if err != nil {
t.Fatalf("unexpected error : %v", err) t.Fatalf("unexpected error : %v", err)
@@ -164,7 +164,7 @@ func TestNewPatchJson6902FactoryMulti(t *testing.T) {
name: some-name name: some-name
path: /testpath/patch.yaml path: /testpath/patch.yaml
`) `)
var p []patch.PatchJson6902 var p []patch.Json6902
err = yaml.Unmarshal(jsonPatches, &p) err = yaml.Unmarshal(jsonPatches, &p)
if err != nil { if err != nil {
t.Fatalf("unexpected error : %v", err) t.Fatalf("unexpected error : %v", err)
@@ -278,7 +278,7 @@ func TestNewPatchJson6902FactoryMultiConflict(t *testing.T) {
name: some-name name: some-name
path: /testpath/patch.yaml path: /testpath/patch.yaml
`) `)
var p []patch.PatchJson6902 var p []patch.Json6902
err = yaml.Unmarshal(jsonPatches, &p) err = yaml.Unmarshal(jsonPatches, &p)
if err != nil { if err != nil {
t.Fatalf("unexpected error : %v", err) t.Fatalf("unexpected error : %v", err)

2
pkg/resmap/resmap.go
View File

@@ -156,7 +156,7 @@ func (m ResMap) FilterBy(inputId resource.ResId) ResMap {
// NewResourceSliceFromPatches returns a slice of resources given a patch path slice from a kustomization file. // NewResourceSliceFromPatches returns a slice of resources given a patch path slice from a kustomization file.
func NewResourceSliceFromPatches( func NewResourceSliceFromPatches(
loader loader.Loader, paths []patch.PatchStrategicMerge) ([]*resource.Resource, error) { loader loader.Loader, paths []patch.StrategicMerge) ([]*resource.Resource, error) {
var result []*resource.Resource var result []*resource.Resource
for _, path := range paths { for _, path := range paths {
content, err := loader.Load(string(path)) content, err := loader.Load(string(path))

12
pkg/target/kusttarget_test.go
View File

@@ -204,11 +204,11 @@ func TestResources1(t *testing.T) {
l := makeLoader1(t) l := makeLoader1(t)
fakeFs := fs.MakeFakeFS() fakeFs := fs.MakeFakeFS()
fakeFs.Mkdir("/") fakeFs.Mkdir("/")
target, err := NewKustTarget(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig()) kt, err := NewKustTarget(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig())
if err != nil { if err != nil {
t.Fatalf("Unexpected construction error %v", err) t.Fatalf("Unexpected construction error %v", err)
} }
actual, err := target.MakeCustomizedResMap() actual, err := kt.MakeCustomizedResMap()
if err != nil { if err != nil {
t.Fatalf("Unexpected Resources error %v", err) t.Fatalf("Unexpected Resources error %v", err)
} }
@@ -227,11 +227,11 @@ func TestResourceNotFound(t *testing.T) {
} }
fakeFs := fs.MakeFakeFS() fakeFs := fs.MakeFakeFS()
fakeFs.Mkdir("/") fakeFs.Mkdir("/")
target, err := NewKustTarget(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig()) kt, err := NewKustTarget(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig())
if err != nil { if err != nil {
t.Fatalf("Unexpected construction error %v", err) t.Fatalf("Unexpected construction error %v", err)
} }
_, err = target.MakeCustomizedResMap() _, err = kt.MakeCustomizedResMap()
if err == nil { if err == nil {
t.Fatalf("Didn't get the expected error for an unknown resource") t.Fatalf("Didn't get the expected error for an unknown resource")
} }
@@ -248,11 +248,11 @@ func TestSecretTimeout(t *testing.T) {
} }
fakeFs := fs.MakeFakeFS() fakeFs := fs.MakeFakeFS()
fakeFs.Mkdir("/") fakeFs.Mkdir("/")
target, err := NewKustTarget(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig()) kt, err := NewKustTarget(l, fakeFs, transformerconfig.MakeDefaultTransformerConfig())
if err != nil { if err != nil {
t.Fatalf("Unexpected construction error %v", err) t.Fatalf("Unexpected construction error %v", err)
} }
_, err = target.MakeCustomizedResMap() _, err = kt.MakeCustomizedResMap()
if err == nil { if err == nil {
t.Fatalf("Didn't get the expected error for an unknown resource") t.Fatalf("Didn't get the expected error for an unknown resource")
} }

4
pkg/types/kustomization.go
View File

@@ -62,12 +62,12 @@ type Kustomization struct {
// The patch files should be Stategic Merge Patch, the default patching behavior for kubectl. // The patch files should be Stategic Merge Patch, the default patching behavior for kubectl.
// https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md // https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md
Patches []string `json:"patches,omitempty" yaml:"patches,omitempty"` Patches []string `json:"patches,omitempty" yaml:"patches,omitempty"`
PatchesStrategicMerge []patch.PatchStrategicMerge `json:"patchesStrategicMerge,omitempty" yaml:"patchesStrategicMerge,omitempty"` PatchesStrategicMerge []patch.StrategicMerge `json:"patchesStrategicMerge,omitempty" yaml:"patchesStrategicMerge,omitempty"`
// JSONPatches is a list of JSONPatch for applying JSON patch. // JSONPatches is a list of JSONPatch for applying JSON patch.
// The JSON patch is documented at https://tools.ietf.org/html/rfc6902 // The JSON patch is documented at https://tools.ietf.org/html/rfc6902
// and http://jsonpatch.com/. // and http://jsonpatch.com/.
PatchesJson6902 []patch.PatchJson6902 `json:"patchesJson6902,omitempty" yaml:"patchesJson6902,omitempty"` PatchesJson6902 []patch.Json6902 `json:"patchesJson6902,omitempty" yaml:"patchesJson6902,omitempty"`
// List of configmaps to generate from configuration sources. // List of configmaps to generate from configuration sources.
// Base/overlay concept doesn't apply to this field. // Base/overlay concept doesn't apply to this field.