github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32274 from ping035627/ping035627-patch-0908

Browse Source 
Automatic merge from submit-queue

Change all jsonmerge to strategicpatch

Implement all jsonmerge changed to strategicpatch in edit.go.
This commit is contained in:
Kubernetes Submit Queue
2016-09-13 01:15:52 -07:00
committed by GitHub
parent ba3ab80b09 121f6fb289
commit 630c7532c6
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/util/jsonmerge/jsonmerge.go
View File

@@ -67,7 +67,7 @@ func RequireKeyUnchanged(key string) PreconditionFunc {
}
}
// RequireKeyUnchanged creates a precondition function that fails
// RequireMetadataKeyUnchanged creates a precondition function that fails
// if the metadata.key is present in the diff (indicating its value
// has changed).
func RequireMetadataKeyUnchanged(key string) PreconditionFunc {