Kubernetes Submit Queue 778da50811 Merge pull request #49259 from dixudx/fix_jsonpatch_nil_value_merge ...

Automatic merge from submit-queue (batch tested with PRs 49259, 49350)

update json-patch to fix nil value issue when creating mergepatch

**What this PR does / why we need it**:
When [creating a patch for merge](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/annotate.go#L255), nil value will be considered as different value. This has been fixed and merged in [evanphx/json-patch #45](https://github.com/evanphx/json-patch/pull/45).

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49044

**Special notes for your reviewer**:
/cc @MikeSpreitzer @mengqiy 

**Release note**:

```release-note
Fix nil value issue when creating json patch for merge
```

2017-07-25 20:01:27 -07:00

..

cmd

Merge pull request #49259 from dixudx/fix_jsonpatch_nil_value_merge

2017-07-25 20:01:27 -07:00

metricsutil

Merge pull request #45389 from monopole/isolation1

2017-05-15 19:34:52 -07:00

plugins

kubectl plugins have access config, global flags and environment

2017-05-19 19:17:43 -03:00

resource

add cronjobs to all

2017-07-21 10:56:26 -04:00

testing

Update generated code

2017-07-18 09:28:49 +02:00

util

fix cross build for windows

2017-07-05 12:42:41 -07:00

apply.go

kubectl: simplify code with help of linter

2017-06-23 09:49:30 -07:00

autoscale.go

…

bash_comp_utils.go

…

BUILD

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

cluster_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

cluster.go

run hack/update-all

2017-06-22 11:31:03 -07:00

clusterrolebinding.go

add validate in create rolebinding

2017-05-08 15:52:44 +08:00

configmap_test.go

create configmap from-env-file

2017-03-08 07:58:01 -08:00

configmap.go

fix comment of isDir

2017-06-02 09:26:13 +08:00

deployment_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

deployment.go

kubectl/deployment: add BaseDeploymentGenerator to reduce duplication

2017-07-18 13:17:45 -07:00

doc.go

kubectl: rewrite docstrings in several files

2017-06-23 09:49:30 -07:00

env_file_test.go

kubectl: refactor addFromEnvFile, write tests

2017-06-23 09:49:30 -07:00

env_file.go

kubectl: refactor addFromEnvFile, write tests

2017-06-23 09:49:30 -07:00

explain.go

Update go-restful dependency

2017-05-05 13:57:01 -07:00

generate_test.go

…

generate.go

kubectl: rewrite docstrings in several files

2017-06-23 09:49:30 -07:00

history.go

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

interfaces.go

…

kubectl_test.go

…

kubectl.go

kubectl: rewrite docstrings in several files

2017-06-23 09:49:30 -07:00

namespace_test.go

Add test case for namespace

2017-06-03 14:35:49 +08:00

namespace.go

…

OWNERS

…

pdb.go

PDB MaxUnavailable: kubectl changes

2017-05-23 07:18:44 -07:00

proxy_server_test.go

allow kubectl proxy to handle specified reject methods and default to allow all

2017-04-29 21:10:52 -05:00

proxy_server.go

eliminate kubectl dependency on k8s.io/kubernetes/pkg/util

2017-06-29 14:49:51 -07:00

quota_test.go

…

quota.go

…

resource_filter_test.go

Add test for kubectl resource filter.

2017-07-12 11:44:28 -07:00

resource_filter.go

Correctly filter terminated pods in kubectl

2017-07-11 17:32:56 -07:00

rolebinding_test.go

Supplement unit tests to kubectl create rolebinding command.

2017-03-29 16:36:22 +08:00

rolebinding.go

add validate in create rolebinding

2017-05-08 15:52:44 +08:00

rollback.go

split util/slice

2017-06-30 23:04:18 -07:00

rolling_updater_test.go

**What this PR does / why we need it**:

2017-05-21 20:44:21 -07:00

rolling_updater.go

kubectl: simplify code with help of linter

2017-06-23 09:49:30 -07:00

rollout_status_test.go

Update StatefulSet rollout status for parameterized RollingUpdate

2017-06-12 10:07:07 -07:00

rollout_status.go

Update StatefulSet rollout status for parameterized RollingUpdate

2017-06-12 10:07:07 -07:00

run_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

run.go

Allow setting service account with kubectl run

2017-07-15 12:37:10 -04:00

scale_test.go

…

scale.go

Deployments under apps/v1beta1 with new defaults

2017-03-01 15:14:41 +01:00

secret_for_docker_registry_test.go

Make 'docker-email' optional on dockercfg secrets

2017-02-27 17:13:08 -05:00

secret_for_docker_registry.go

Make 'docker-email' optional on dockercfg secrets

2017-02-27 17:13:08 -05:00

secret_for_tls_test.go

…

secret_for_tls.go

…

secret_test.go

create secret from-env-file

2017-03-08 07:58:01 -08:00

secret.go

modify the meassage in kubectl secret command when the envFile path is not an file path

2017-06-26 16:30:43 +08:00

service_basic_test.go

Populate endpoints and allow ports with headless service

2017-06-28 11:15:51 +08:00

service_basic.go

Populate endpoints and allow ports with headless service

2017-06-28 11:15:51 +08:00

service_test.go

Populate endpoints and allow ports with headless service

2017-06-28 11:15:51 +08:00

service.go

…

serviceaccount_test.go

…

serviceaccount.go

…

sorting_printer_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

sorting_printer.go

run hack/update-all

2017-06-22 11:31:03 -07:00

stop_test.go

Deleting ServiceReaper

2017-06-01 14:25:01 -07:00

stop.go

Merge pull request #46798 from nikhiljindal/servicesReaper

2017-07-08 05:16:33 -07:00

versioned_client.go

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00