mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-16 03:59:10 +00:00
df5fc7a2df
Major changes: - Don't generate a patch, instead generate the merged object so it can be used with PUT - Separate tree parsing logic to collate items in a list from the delete / merge / replace / add logic when merging - Use openapi for merge strategy metadata so it works with extensions and version skew - Support multi-field mergekeys when merging lists - Support replace strategy for maps - Reduce complexity of generating order when merging lists - keep the locally defined order and append remote only-items Continue to support: - Explicitly setting fields to null - Merging lists of primitives - Don't randomize ordering when merging lists TODO: - Retain keys - Conflict detection
87 lines
2.6 KiB
Go
87 lines
2.6 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package parse
|
|
|
|
import (
|
|
"k8s.io/kubernetes/pkg/kubectl/apply"
|
|
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
|
|
)
|
|
|
|
// mapElement builds a new mapElement from a mapItem
|
|
func (v ElementBuildingVisitor) mapElement(meta apply.FieldMetaImpl, item *mapItem) (*apply.MapElement, error) {
|
|
// Function to return schema type of the map values
|
|
var fn schemaFn = func(string) openapi.Schema {
|
|
// All map values share the same schema
|
|
if item.Map != nil && item.Map.SubType != nil {
|
|
return item.Map.SubType
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Collect same fields from multiple maps into a map of elements
|
|
values, err := v.createMapValues(fn, meta, item.HasElementData, item.MapElementData)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Return the result
|
|
return &apply.MapElement{
|
|
FieldMetaImpl: meta,
|
|
HasElementData: item.HasElementData,
|
|
MapElementData: item.MapElementData,
|
|
Values: values,
|
|
}, nil
|
|
}
|
|
|
|
// schemaFn returns the schema for a field or map value based on its name or key
|
|
type schemaFn func(key string) openapi.Schema
|
|
|
|
// createMapValues combines the recorded, local and remote values from
|
|
// data into a map of elements.
|
|
func (v ElementBuildingVisitor) createMapValues(
|
|
schemaFn schemaFn,
|
|
meta apply.FieldMetaImpl,
|
|
hasData apply.HasElementData,
|
|
data apply.MapElementData) (map[string]apply.Element, error) {
|
|
|
|
// Collate each key in the map
|
|
values := map[string]apply.Element{}
|
|
for _, key := range keysUnion(data.Recorded, data.Local, data.Remote) {
|
|
recorded, recordedSet := nilSafeLookup(key, data.Recorded)
|
|
local, localSet := nilSafeLookup(key, data.Local)
|
|
remote, remoteSet := nilSafeLookup(key, data.Remote)
|
|
|
|
// Create an item for the field
|
|
field, err := v.getItem(schemaFn(key), key,
|
|
apply.RawElementData{recorded, local, remote},
|
|
apply.HasElementData{recordedSet, localSet, remoteSet})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Build the element for this field
|
|
element, err := field.CreateElement(v)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Add the field element to the map
|
|
values[key] = element
|
|
}
|
|
return values, nil
|
|
}
|