diff --git a/internal/k8sdeps/factory.go b/internal/k8sdeps/factory.go index e6276b617..dcd1b036e 100644 --- a/internal/k8sdeps/factory.go +++ b/internal/k8sdeps/factory.go @@ -11,6 +11,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// Package k8sdeps provides kustomize factory with k8s dependencies package k8sdeps import ( diff --git a/internal/k8sdeps/transformer/factory.go b/internal/k8sdeps/transformer/factory.go index f80f6e5ab..6863e439a 100644 --- a/internal/k8sdeps/transformer/factory.go +++ b/internal/k8sdeps/transformer/factory.go @@ -24,20 +24,20 @@ import ( "sigs.k8s.io/kustomize/pkg/transformers" ) -// factoryImpl makes patch transformer and name hash transformer -type factoryImpl struct{} +// FactoryImpl makes patch transformer and name hash transformer +type FactoryImpl struct{} // NewFactoryImpl makes a new factoryImpl instance -func NewFactoryImpl() *factoryImpl { - return &factoryImpl{} +func NewFactoryImpl() *FactoryImpl { + return &FactoryImpl{} } // MakePatchTransformer makes a new patch transformer -func (p *factoryImpl) MakePatchTransformer(slice []*resource.Resource, rf *resource.Factory) (transformers.Transformer, error) { +func (p *FactoryImpl) MakePatchTransformer(slice []*resource.Resource, rf *resource.Factory) (transformers.Transformer, error) { return patch.NewPatchTransformer(slice, rf) } // MakeHashTransformer makes a new name hash transformer -func (p *factoryImpl) MakeHashTransformer() transformers.Transformer { +func (p *FactoryImpl) MakeHashTransformer() transformers.Transformer { return hash.NewNameHashTransformer() } diff --git a/internal/k8sdeps/transformer/patch/patchconflictdetector.go b/internal/k8sdeps/transformer/patch/patchconflictdetector.go index 1879171ea..10353c77f 100644 --- a/internal/k8sdeps/transformer/patch/patchconflictdetector.go +++ b/internal/k8sdeps/transformer/patch/patchconflictdetector.go @@ -131,7 +131,7 @@ func (smp *strategicMergePatch) findConflict( } func (smp *strategicMergePatch) mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error) { - mergeJsonMap, err := strategicpatch.MergeStrategicMergeMapPatchUsingLookupPatchMeta( + mergeJSONMap, err := strategicpatch.MergeStrategicMergeMapPatchUsingLookupPatchMeta( smp.lookupPatchMeta, patch1.Map(), patch2.Map()) - return smp.rf.FromMap(mergeJsonMap), err + return smp.rf.FromMap(mergeJSONMap), err }