k8s-merge-robot f50bb73ed6 Merge pull request #26136 from AdoHe/kubectl_apply_overwrite ...

Automatic merge from submit-queue

kubectl apply add --overwrite flag

```release-note
Add "kubectl --overwrite" flag to automatically resolve conflicts between the modified and live configuration using values from the modified configuration.
```
fixes #17238

This PR just add the `--overwrite` flag, pkg/strategicpatch has already support overwrite. @bgrant0607 @jackgr ptal.

2016-07-18 10:47:53 -07:00

..

cmd

kubectl apply add --overwrite flag

2016-07-18 00:32:13 -04:00

resource

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

testing

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

apply.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

autoscale.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

bash_comp_utils.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

configmap_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

configmap.go

Move IsSecretKey into util/validation

2016-07-03 02:19:09 -07:00

custom_column_printer_test.go

24133 fix: --no-headers works with custom columns now

2016-07-07 10:04:09 +02:00

custom_column_printer.go

24133 fix: --no-headers works with custom columns now

2016-07-07 10:04:09 +02:00

describe_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

describe.go

Move deployment utilities to there own package

2016-07-08 09:46:56 +02:00

doc.go

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

explain.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

generate_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

generate.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

history.go

kubectl: refactor rollout history to be more configurable

2016-07-12 10:36:14 +02:00

interfaces.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubectl_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubectl.go

Implement a RESTMappings method

2016-07-13 21:18:53 -04:00

namespace_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

namespace.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

OWNERS

Remove bgrant from pkg/OWNERS and pkg/kubectl/OWNERS since he has plenty to do.

2016-06-16 08:21:27 -07:00

proxy_server_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

proxy_server.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

resource_printer_test.go

Refactor Printer arguments

2016-07-14 16:23:02 +03:00

resource_printer.go

Refactor Printer arguments

2016-07-14 16:23:02 +03:00

rollback.go

Move deployment utilities to there own package

2016-07-08 09:46:56 +02:00

rolling_updater_test.go

Remove Codec from ContentConfig.

2016-07-08 13:53:09 +02:00

rolling_updater.go

Move deployment utilities to there own package

2016-07-08 09:46:56 +02:00

rollout_status.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

run_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

run.go

Make CIdentifier return error strings

2016-07-02 17:32:05 -07:00

scale_test.go

Merge pull request #27048 from kargakis/ignore-only-409-in-scaler

2016-07-02 21:28:37 -07:00

scale.go

Merge pull request #27048 from kargakis/ignore-only-409-in-scaler

2016-07-02 21:28:37 -07:00

secret_for_docker_registry_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

secret_for_docker_registry.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

secret_for_tls_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

secret_for_tls.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

secret_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

secret.go

Move IsSecretKey into util/validation

2016-07-03 02:19:09 -07:00

service_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

service.go

Merge pull request #26554 from kargakis/fix-expose-container-port

2016-07-12 13:12:53 -07:00

serviceaccount_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

serviceaccount.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

sorted_event_list_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

sorted_event_list.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

sorted_resource_name_list_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

sorted_resource_name_list.go

Merge pull request #28110 from mfojtik/describe-volume-mounts

2016-06-30 17:15:05 -07:00

sorting_printer_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

sorting_printer.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

stop_test.go

Move deployment utilities to there own package

2016-07-08 09:46:56 +02:00

stop.go

Move deployment utilities to there own package

2016-07-08 09:46:56 +02:00

version.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

watchloop.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00