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

fix lint errors in internal (#469)

Browse Source
This commit is contained in:
Jingfang Liu
2018-10-15 13:38:32 -07:00
committed by GitHub
parent 808df20cdb
commit 9d804ba3a8
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/k8sdeps/factory.go
View File

@@ -11,6 +11,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package k8sdeps provides kustomize factory with k8s dependencies
package k8sdeps package k8sdeps
import ( import (

12
internal/k8sdeps/transformer/factory.go
View File

@@ -24,20 +24,20 @@ import (
"sigs.k8s.io/kustomize/pkg/transformers" "sigs.k8s.io/kustomize/pkg/transformers"
) )
// factoryImpl makes patch transformer and name hash transformer // FactoryImpl makes patch transformer and name hash transformer
type factoryImpl struct{} type FactoryImpl struct{}
// NewFactoryImpl makes a new factoryImpl instance // NewFactoryImpl makes a new factoryImpl instance
func NewFactoryImpl() *factoryImpl { func NewFactoryImpl() *FactoryImpl {
return &factoryImpl{} return &FactoryImpl{}
} }
// MakePatchTransformer makes a new patch transformer // 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) return patch.NewPatchTransformer(slice, rf)
} }
// MakeHashTransformer makes a new name hash transformer // MakeHashTransformer makes a new name hash transformer
func (p *factoryImpl) MakeHashTransformer() transformers.Transformer { func (p *FactoryImpl) MakeHashTransformer() transformers.Transformer {
return hash.NewNameHashTransformer() return hash.NewNameHashTransformer()
} }

4
internal/k8sdeps/transformer/patch/patchconflictdetector.go
View File

@@ -131,7 +131,7 @@ func (smp *strategicMergePatch) findConflict(
} }
func (smp *strategicMergePatch) mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error) { 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()) smp.lookupPatchMeta, patch1.Map(), patch2.Map())
return smp.rf.FromMap(mergeJsonMap), err return smp.rf.FromMap(mergeJSONMap), err
} }