github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/pkg/kubectl
History
Kubernetes Submit Queue 43fec5afb5 Merge pull request #41685 from liggitt/edit-refactor-unknown-field 
Automatic merge from submit-queue (batch tested with PRs 41709, 41685, 41754, 41759, 37237)

Tolerate unknown fields in strategic merge patch

When using `apply` or `edit` with an object that has a compiled-in struct, if an unknown server-side field is sent, or is present in a provided file, the strategic merge patch computation fails looking up type info from the go struct

If the field only exists in one side of the patch (is being added or removed), or is identical in both sides of the patch, we should tolerate missing type info, since it doesn't affect the patch.
 		2017-02-21 04:27:46 -08:00
..
cmd Merge pull request #41685 from liggitt/edit-refactor-unknown-field 2017-02-21 04:27:46 -08:00
metricsutil Update generated files 2017-01-29 21:41:45 +01:00
resource Revert "Use watch param instead of deprecated /watch/ prefix" 2017-02-21 08:37:51 +01:00
testing refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
BUILD Update kubectl to work with new HPA objects 2017-02-07 22:25:28 -05:00
OWNERS Revert "update kubectl approvers" 2017-01-25 17:32:22 -08:00
apply.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
autoscale.go Update kubectl to work with new HPA objects 2017-02-07 22:25:28 -05:00
bash_comp_utils.go
…
cluster.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
cluster_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
clusterrolebinding.go Switch RBAC subject apiVersion to apiGroup in v1beta1 2017-02-13 15:33:09 -05:00
configmap.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
configmap_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
custom_column_printer.go move authoritative client-go utils out of pkg 2017-01-24 08:59:18 -05:00
custom_column_printer_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
deployment.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
deployment_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
describe.go Merge pull request #34664 from ymqytw/filter_annotation_for_describe_secret 2017-02-16 17:05:10 -08:00
describe_test.go Update kubectl to work with new HPA objects 2017-02-07 22:25:28 -05:00
doc.go
…
explain.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
generate.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
generate_test.go
…
history.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
interfaces.go find and replace 2017-01-20 08:04:53 -05:00
kubectl.go deprecate and disconnect --output-version 2017-02-16 13:23:59 -05:00
kubectl_test.go
…
namespace.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
namespace_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
pdb.go move util/intstr to apimachinery 2017-01-30 12:46:59 -05:00
proxy_server.go find and replace 2017-01-20 08:04:53 -05:00
proxy_server_test.go Merge pull request #38789 from jessfraz/cleanup-temp-dirs 2017-01-20 12:34:58 -08:00
quota.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
quota_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
resource_filter.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
resource_printer.go Update kubectl to work with new HPA objects 2017-02-07 22:25:28 -05:00
resource_printer_test.go Update kubectl to work with new HPA objects 2017-02-07 22:25:28 -05:00
rolebinding.go Switch RBAC subject apiVersion to apiGroup in v1beta1 2017-02-13 15:33:09 -05:00
rollback.go refactor: move ListOptions references to metav1 2017-01-23 17:52:46 -05:00
rolling_updater.go Remove redundant pod helper 2017-02-10 17:58:59 +01:00
rolling_updater_test.go move util/intstr to apimachinery 2017-01-30 12:46:59 -05:00
rollout_status.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
rollout_status_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
run.go pkg/api/resource: move to apimachinery 2017-01-29 21:41:44 +01:00
run_test.go pkg/api/resource: move to apimachinery 2017-01-29 21:41:44 +01:00
scale.go refactor: move ListOptions references to metav1 2017-01-23 17:52:46 -05:00
scale_test.go move testing/core to client-go 2017-01-26 13:54:40 -05:00
secret.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
secret_for_docker_registry.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
secret_for_docker_registry_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
secret_for_tls.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
secret_for_tls_test.go move authoritative client-go utils out of pkg 2017-01-24 08:59:18 -05:00
secret_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
service.go Merge pull request #38183 from tianshapjq/remove-create-external-load-balancer 2017-02-07 11:33:41 -08:00
service_basic.go move util/intstr to apimachinery 2017-01-30 12:46:59 -05:00
service_basic_test.go move util/intstr to apimachinery 2017-01-30 12:46:59 -05:00
service_test.go Merge pull request #38183 from tianshapjq/remove-create-external-load-balancer 2017-02-07 11:33:41 -08:00
serviceaccount.go start the apimachinery repo 2017-01-11 09:09:48 -05:00
serviceaccount_test.go refactor: use metav1.ObjectMeta in other types 2017-01-17 16:17:19 -05:00
sorted_resource_name_list.go
…
sorted_resource_name_list_test.go
…
sorting_printer.go Fix sorting printer with missing fields 2017-01-28 19:56:53 -02:00
sorting_printer_test.go Fix sorting printer with missing fields 2017-01-28 19:56:53 -02:00
stop.go pkg/util: move uuid and strategicpatch into k8s.io/apimachinery 2017-01-25 19:45:09 +01:00
stop_test.go move testing/core to client-go 2017-01-26 13:54:40 -05:00
versioned_client.go run hack/update-codegen.sh 2016-12-14 12:39:49 -08:00