mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
e8381db778
* Update Kubernetes to v1.21.0 * Update to golang v1.16.2 * Update dependent modules to track with upstream * Switch to upstream flannel * Track changes to upstream cloud-controller-manager and FeatureGates Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
46 lines
1.1 KiB
Go
46 lines
1.1 KiB
Go
// Copyright 2019 The Kubernetes Authors.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Package merge contains libraries for merging fields from one RNode to another
|
|
// RNode
|
|
package merge3
|
|
|
|
import (
|
|
"sigs.k8s.io/kustomize/kyaml/yaml"
|
|
"sigs.k8s.io/kustomize/kyaml/yaml/walk"
|
|
)
|
|
|
|
func Merge(dest, original, update *yaml.RNode) (*yaml.RNode, error) {
|
|
// if update == nil && original != nil => declarative deletion
|
|
|
|
return walk.Walker{
|
|
Visitor: Visitor{},
|
|
VisitKeysAsScalars: true,
|
|
Sources: []*yaml.RNode{dest, original, update}}.Walk()
|
|
}
|
|
|
|
func MergeStrings(dest, original, update string, infer bool) (string, error) {
|
|
srcOriginal, err := yaml.Parse(original)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
srcUpdated, err := yaml.Parse(update)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
d, err := yaml.Parse(dest)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
result, err := walk.Walker{
|
|
InferAssociativeLists: infer,
|
|
Visitor: Visitor{},
|
|
VisitKeysAsScalars: true,
|
|
Sources: []*yaml.RNode{d, srcOriginal, srcUpdated}}.Walk()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return result.String()
|
|
}
|