mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	fix error where we can't use patch and add cmd-test for patch and file
update
This commit is contained in:
		| @@ -159,9 +159,14 @@ for version in "${kube_api_versions[@]}"; do | ||||
|           "apiVersion": "v1beta1", | ||||
|           "id": "service-${version}-test", | ||||
|           "port": 80, | ||||
|           "protocol": "TCP" | ||||
|           "protocol": "TCP", | ||||
|           "selector": { | ||||
|               "version": "old" | ||||
|           } | ||||
|       } | ||||
| __EOF__ | ||||
|   kubectl update service service-${version}-test --patch="{\"selector\":{\"version\":\"${version}\"},\"apiVersion\":\"${version}\"}"  | ||||
|   kubectl get service service-${version}-test -o json | kubectl update -f - | ||||
|   kubectl get services "${kube_flags[@]}" | ||||
|   kubectl get services "service-${version}-test" "${kube_flags[@]}" | ||||
|   kubectl delete service frontend "${kube_flags[@]}" | ||||
|   | ||||
| @@ -54,15 +54,6 @@ Examples: | ||||
| 			cmdNamespace, err := f.DefaultNamespace(cmd) | ||||
| 			checkErr(err) | ||||
|  | ||||
| 			mapper, typer := f.Object(cmd) | ||||
| 			r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand(cmd)). | ||||
| 				ContinueOnError(). | ||||
| 				NamespaceParam(cmdNamespace).RequireNamespace(). | ||||
| 				FilenameParam(flags.Filenames...). | ||||
| 				Flatten(). | ||||
| 				Do() | ||||
| 			checkErr(r.Err()) | ||||
|  | ||||
| 			patch := cmdutil.GetFlagString(cmd, "patch") | ||||
| 			if len(flags.Filenames) == 0 && len(patch) == 0 { | ||||
| 				usageError(cmd, "Must specify --filename or --patch to update") | ||||
| @@ -78,6 +69,15 @@ Examples: | ||||
| 				return | ||||
| 			} | ||||
|  | ||||
| 			mapper, typer := f.Object(cmd) | ||||
| 			r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand(cmd)). | ||||
| 				ContinueOnError(). | ||||
| 				NamespaceParam(cmdNamespace).RequireNamespace(). | ||||
| 				FilenameParam(flags.Filenames...). | ||||
| 				Flatten(). | ||||
| 				Do() | ||||
| 			checkErr(r.Err()) | ||||
|  | ||||
| 			err = r.Visit(func(info *resource.Info) error { | ||||
| 				data, err := info.Mapping.Codec.Encode(info.Object) | ||||
| 				if err != nil { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user