mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-07-01 18:30:15 +00:00
a7df00c07a
[doc]: https://github.com/golang/go/wiki/Modules#releasing-modules-v2-or-higher Per this Go modules [doc] a repo or branch that's already tagged v2 or higher should increment the major version (e.g. go to v3) when releasing their first Go module-based packages. At the moment, the kustomize repo has these top level packages in the sigs.k8s.io/kustomize module: - `cmd` - holds main program for kustomize Conceivably someone can depend on this package for integration tests. - `internal` - intentionally unreleased subpackages - `k8sdeps` - an adapter wrapping k8s dependencies This exists only for use in pre-Go-modules kustomize-into-kubectl integration and won't live much longer (as everything involved is switching to Go modules). - `pkg` - kustomize packages for export This should shrink in later versions, since the surface area is too large, containing sub-packages that should be in 'internal'. - `plugin` - holds main programs for plugins This PR changes the top level go.mod file from ``` module sigs.k8s.io/kustomize ``` to ``` module sigs.k8s.io/kustomize/v3 ``` and adjusts all import statements to reflect the change.
125 lines
3.3 KiB
Go
125 lines
3.3 KiB
Go
// Copyright 2019 The Kubernetes Authors.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package patch
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/evanphx/json-patch"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/util/mergepatch"
|
|
"k8s.io/apimachinery/pkg/util/strategicpatch"
|
|
"sigs.k8s.io/kustomize/v3/pkg/resource"
|
|
)
|
|
|
|
type conflictDetector interface {
|
|
hasConflict(patch1, patch2 *resource.Resource) (bool, error)
|
|
findConflict(conflictingPatchIdx int, patches []*resource.Resource) (*resource.Resource, error)
|
|
mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error)
|
|
}
|
|
|
|
type jsonMergePatch struct {
|
|
rf *resource.Factory
|
|
}
|
|
|
|
var _ conflictDetector = &jsonMergePatch{}
|
|
|
|
func newJMPConflictDetector(rf *resource.Factory) conflictDetector {
|
|
return &jsonMergePatch{rf: rf}
|
|
}
|
|
|
|
func (jmp *jsonMergePatch) hasConflict(
|
|
patch1, patch2 *resource.Resource) (bool, error) {
|
|
return mergepatch.HasConflicts(patch1.Map(), patch2.Map())
|
|
}
|
|
|
|
func (jmp *jsonMergePatch) findConflict(
|
|
conflictingPatchIdx int, patches []*resource.Resource) (*resource.Resource, error) {
|
|
for i, patch := range patches {
|
|
if i == conflictingPatchIdx {
|
|
continue
|
|
}
|
|
if !patches[conflictingPatchIdx].OrgId().GvknEquals(patch.OrgId()) {
|
|
continue
|
|
}
|
|
conflict, err := mergepatch.HasConflicts(
|
|
patch.Map(),
|
|
patches[conflictingPatchIdx].Map())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if conflict {
|
|
return patch, nil
|
|
}
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (jmp *jsonMergePatch) mergePatches(
|
|
patch1, patch2 *resource.Resource) (*resource.Resource, error) {
|
|
baseBytes, err := json.Marshal(patch1.Map())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
patchBytes, err := json.Marshal(patch2.Map())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
mergedBytes, err := jsonpatch.MergeMergePatches(baseBytes, patchBytes)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
mergedMap := make(map[string]interface{})
|
|
err = json.Unmarshal(mergedBytes, &mergedMap)
|
|
return jmp.rf.FromMap(mergedMap), err
|
|
}
|
|
|
|
type strategicMergePatch struct {
|
|
lookupPatchMeta strategicpatch.LookupPatchMeta
|
|
rf *resource.Factory
|
|
}
|
|
|
|
var _ conflictDetector = &strategicMergePatch{}
|
|
|
|
func newSMPConflictDetector(
|
|
versionedObj runtime.Object,
|
|
rf *resource.Factory) (conflictDetector, error) {
|
|
lookupPatchMeta, err := strategicpatch.NewPatchMetaFromStruct(versionedObj)
|
|
return &strategicMergePatch{lookupPatchMeta: lookupPatchMeta, rf: rf}, err
|
|
}
|
|
|
|
func (smp *strategicMergePatch) hasConflict(p1, p2 *resource.Resource) (bool, error) {
|
|
return strategicpatch.MergingMapsHaveConflicts(
|
|
p1.Map(), p2.Map(), smp.lookupPatchMeta)
|
|
}
|
|
|
|
func (smp *strategicMergePatch) findConflict(
|
|
conflictingPatchIdx int, patches []*resource.Resource) (*resource.Resource, error) {
|
|
for i, patch := range patches {
|
|
if i == conflictingPatchIdx {
|
|
continue
|
|
}
|
|
if !patches[conflictingPatchIdx].OrgId().GvknEquals(patch.OrgId()) {
|
|
continue
|
|
}
|
|
conflict, err := strategicpatch.MergingMapsHaveConflicts(
|
|
patch.Map(),
|
|
patches[conflictingPatchIdx].Map(),
|
|
smp.lookupPatchMeta)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if conflict {
|
|
return patch, nil
|
|
}
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (smp *strategicMergePatch) mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error) {
|
|
mergeJSONMap, err := strategicpatch.MergeStrategicMergeMapPatchUsingLookupPatchMeta(
|
|
smp.lookupPatchMeta, patch1.Map(), patch2.Map())
|
|
return smp.rf.FromMap(mergeJSONMap), err
|
|
}
|