github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-08-08 15:25:26 +00:00
Code Issues Projects Releases Wiki Activity

Update structured-merge-diff version

Browse Source
This commit is contained in:
jennybuckley
2019-01-14 14:37:56 -08:00
parent eef827079f
commit 51b30d8e2c
15 changed files with 79 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@@ -4220,23 +4220,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json generated
View File

@@ -2608,23 +2608,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/apimachinery/Godeps/Godeps.json generated
View File

@@ -180,23 +180,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/apiserver/Godeps/Godeps.json generated
View File

@@ -2092,23 +2092,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/cli-runtime/Godeps/Godeps.json generated
View File

@@ -784,23 +784,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/client-go/Godeps/Godeps.json generated
View File

@@ -620,23 +620,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/cloud-provider/Godeps/Godeps.json generated
View File

@@ -976,23 +976,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/csi-api/Godeps/Godeps.json generated
View File

@@ -560,23 +560,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json generated
View File

@@ -1884,23 +1884,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/metrics/Godeps/Godeps.json generated
View File

@@ -532,23 +532,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/node-api/Godeps/Godeps.json generated
View File

@@ -560,23 +560,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json generated
View File

@@ -1836,23 +1836,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json generated
View File

@@ -800,23 +800,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

10
staging/src/k8s.io/sample-controller/Godeps/Godeps.json generated
View File

@@ -1180,23 +1180,23 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/merge",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/schema",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/typed",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/value",
"Rev": "d43a45b8663b01dd7d86e7cc1656dd8651280ed7"
"Rev": "6e488066a1c47f8c285006360b1b39fb3fa8bbbc"
},
{
"ImportPath": "sigs.k8s.io/yaml",

13
vendor/sigs.k8s.io/structured-merge-diff/merge/update.go generated vendored
View File

@@ -32,7 +32,7 @@ type Updater struct {
Converter Converter
}
func (s *Updater) update(oldObject, newObject typed.TypedValue, managers fieldpath.ManagedFields, workflow string, force bool) (fieldpath.ManagedFields, error) {
func (s *Updater) update(oldObject, newObject typed.TypedValue, version fieldpath.APIVersion, managers fieldpath.ManagedFields, workflow string, force bool) (fieldpath.ManagedFields, error) {
if managers == nil {
managers = fieldpath.ManagedFields{}
}
@@ -41,7 +41,12 @@ func (s *Updater) update(oldObject, newObject typed.TypedValue, managers fieldpa
oldObject typed.TypedValue
newObject typed.TypedValue
}
versions := map[fieldpath.APIVersion]Versioned{}
versions := map[fieldpath.APIVersion]Versioned{
version: Versioned{
oldObject: oldObject,
newObject: newObject,
},
}
for manager, managerSet := range managers {
if manager == workflow {
@@ -92,7 +97,7 @@ func (s *Updater) update(oldObject, newObject typed.TypedValue, managers fieldpa
// this is a CREATE call).
func (s *Updater) Update(liveObject, newObject typed.TypedValue, version fieldpath.APIVersion, managers fieldpath.ManagedFields, manager string) (fieldpath.ManagedFields, error) {
var err error
managers, err = s.update(liveObject, newObject, managers, manager, true)
managers, err = s.update(liveObject, newObject, version, managers, manager, true)
if err != nil {
return fieldpath.ManagedFields{}, err
}
@@ -118,7 +123,7 @@ func (s *Updater) Apply(liveObject, configObject typed.TypedValue, version field
if err != nil {
return typed.TypedValue{}, fieldpath.ManagedFields{}, fmt.Errorf("failed to merge config: %v", err)
}
managers, err = s.update(liveObject, newObject, managers, manager, force)
managers, err = s.update(liveObject, newObject, version, managers, manager, force)
if err != nil {
return typed.TypedValue{}, fieldpath.ManagedFields{}, err
}