github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

change all jsonmerge to strategicpatch

Browse Source 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update preconditions define

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
This commit is contained in:
PingWang
2016-09-08 19:15:36 +08:00
parent bf4e9e9db8
commit 121f6fb289
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 {