Kubernetes Submit Queue 99def0d9f9 Merge pull request #40666 from ymqytw/support_generic_merge_patch ...

Automatic merge from submit-queue (batch tested with PRs 40864, 40666, 38382, 40874)

apply falls back to generic JSON patch computation if no go struct is registered for the target GVK

This PR is the master version of #40096 which is target 1.4 branch.
This PR is based on #40260 

- [x] ensure subkey deletion works in CreateThreeWayJSONMergePatch
- [x] ensure type stomping works in CreateThreeWayJSONMergePatch
- [x] lots of tests for generic json patch computation
- [x] apply falls back to generic 3-way JSON merge patch if no go struct is registered for the target GVK
  - [x] prevent generic apply patch computation between different apiVersions and/or kinds
  - [x] make pruner generic (apply --prune works with TPR)

```release-note
apply falls back to generic 3-way JSON merge patch if no go struct is registered for the target GVK
```

2017-02-02 21:04:49 -08:00

..

boilerplate

Enable auto-generating sources rules

2017-01-05 14:14:13 -08:00

cmd/teststale

Remove "All rights reserved" from all the headers.

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

e2e-internal

Build release tarballs in bazel and add make bazel-release rule

2017-01-13 16:17:44 -08:00

gen-swagger-doc

change the relative links to definition in operations.html to satisfy the new path set in the kubernetes.io

2016-07-29 13:29:34 -07:00

jenkins

run unit tests with go, not just bazel

2017-01-27 10:00:01 -05:00

lib

Merge pull request #40551 from juanvallejo/jvallejo/only-output-no-resources-found-for-human-readable-printer

2017-01-30 19:14:41 -08:00

make-rules

add apply cmd tests for TPR

2017-02-02 15:20:45 -08:00

testdata

add apply cmd tests for TPR

2017-02-02 15:20:45 -08:00

verify-flags

Merge pull request #40525 from lucab/to-k8s/node-e2e-local-cri

2017-02-02 13:57:48 -08:00

.linted_packages

Update generated files

2017-02-02 20:28:45 +01:00

autogenerated_placeholder.txt

Revamp doc generation

2016-06-08 17:22:12 -07:00

benchmark-go.sh

unify newline format for benchmark-go.sh

2016-12-10 01:15:30 -08:00

benchmark-integration.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

BUILD

Add //hack:verify-boilerplate rule.

2017-01-19 11:10:48 -08:00

build-cross.sh

Make releases work

2016-07-12 21:52:54 -07:00

build-go.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

build-ui.sh

move swagger route to apiserver

2017-02-01 15:18:32 -05:00

cherry_pick_pull.sh

hack/cherry_pick_pull.sh: cleanup patch files

2016-12-14 14:33:17 -08:00

dev-build-and-push.sh

hack/dev-build-*: Run dev build instead of release build

2016-12-15 10:35:16 -07:00

dev-build-and-up.sh

hack/dev-build-*: Run dev build instead of release build

2016-12-15 10:35:16 -07:00

dev-push-hyperkube.sh

Rename build-tools/ back to build/

2016-12-14 13:42:15 -08:00

e2e-node-test.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

e2e.go

Merge pull request #36734 from YuPengZTE/devPunctuation

2017-02-01 02:55:48 -08:00

federated-ginkgo-e2e.sh

Remove "All rights reserved" from all the headers.

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

generate-bindata.sh

Run bindata generation from KUBE_ROOT

2017-01-10 14:28:19 -05:00

generate-docs.sh

Complete *-munge-docs.sh deprecation.

2017-01-12 15:34:03 -08:00

get-build.sh

Merge pull request #26755 from david-mcmahon/fix-headers

2016-06-29 18:46:07 -07:00

ginkgo-e2e.sh

[Federation][init-11] Switch federation e2e tests to use the new federation control plane bootstrap via the kubefed init command.

2016-12-16 11:22:44 +05:30

godep-save.sh

k8s.io/apimachinery scripts

2017-01-11 08:15:34 -05:00

grab-profiles.sh

Make all useage of sort deterministic

2016-10-20 16:47:20 -04:00

install-etcd.sh

Remove "All rights reserved" from all the headers.

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

list-feature-tests.sh

Make all useage of sort deterministic

2016-10-20 16:47:20 -04:00

local-up-cluster.sh

added warning message error about not running kubelet if not darwin/linux to my check

2017-01-26 13:11:27 -08:00

local-up-discovery.sh

rename kubernetes-discovery to kube-aggregator

2017-01-10 12:27:42 -05:00

lookup_pull.py

Remove "All rights reserved" from all the headers.

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

OWNERS

Remove spxtr from several owners files, add rmmh as test reviewer.

2017-01-30 13:45:21 -08:00

print-workspace-status.sh

bazel: save git version in kubernetes.tar.gz

2017-01-23 17:28:08 -08:00

run-in-gopath.sh

Allow make to run from outside GOPATH

2016-07-15 08:42:12 -07:00

test-cmd.sh

fix hack/test-cmd

2016-08-02 10:27:29 -04:00

test-go.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

test-integration.sh

choose a particular directory test-integration

2016-08-26 12:33:06 -04:00

test-update-storage-objects.sh

Removed HPA objects from extensions api group

2017-02-02 14:09:54 +01:00

update_owners.py

Remove girishkalele from most places

2016-12-05 19:29:34 -05:00

update-all.sh

Sync update-all with verfiy targets

2016-12-05 12:43:54 +01:00

update-api-reference-docs.sh

update generation bash to handle vendor dir

2017-01-17 09:06:34 -05:00

update-bazel.sh

update repo local config to allow redirects from gopkg.in

2017-02-02 10:20:17 -08:00

update-codecgen.sh

Make all useage of sort deterministic

2016-10-20 16:47:20 -04:00

update-codegen.sh

[Federation] update client generation script to include autoscaling resources

2017-01-22 12:27:56 +05:30

update-federation-api-reference-docs.sh

update generation bash to handle vendor dir

2017-01-17 09:06:34 -05:00

update-federation-generated-swagger-docs.sh

update generation bash to handle vendor dir

2017-01-17 09:06:34 -05:00

update-federation-openapi-spec.sh

genericapiserver: move MasterCount and service options into master

2016-12-16 17:23:43 +01:00

update-federation-swagger-spec.sh

Federation does not generate swagger spec correctly

2017-01-06 23:45:04 -05:00

update-generated-docs.sh

Complete *-munge-docs.sh deprecation.

2017-01-12 15:34:03 -08:00

update-generated-protobuf-dockerized.sh

spell check for test/*

2016-12-14 06:03:00 -08:00

update-generated-protobuf.sh

Rename build-tools/ back to build/

2016-12-14 13:42:15 -08:00

update-generated-runtime-dockerized.sh

CRI: use more gogoprotobuf plugins

2017-01-25 13:52:24 -08:00

update-generated-runtime.sh

Rename build-tools/ back to build/

2016-12-14 13:42:15 -08:00

update-generated-swagger-docs.sh

update generation bash to handle vendor dir

2017-01-17 09:06:34 -05:00

update-godep-licenses.sh

make godep licenses/copyright check case insensitive

2016-10-24 18:00:08 -07:00

update-gofmt.sh

Merge pull request #31547 from mbohlool/fix2

2016-09-14 05:35:51 -07:00

update-openapi-spec.sh

Fix race in service IP allocation repair loop

2016-12-26 21:59:27 -08:00

update-staging-client-go.sh

add update-staging-client-go.sh and verify-staging-client-go.sh;

2016-10-29 14:20:39 -07:00

update-swagger-spec.sh

update generation scripts to share API group version constants

2016-09-22 13:30:41 -04:00

verify-all.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

verify-api-groups.sh

add script to check for updates to the files for generation

2016-11-01 15:59:50 -04:00

verify-api-reference-docs.sh

Remove "All rights reserved" from all the headers.

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

verify-bazel.sh

update repo local config to allow redirects from gopkg.in

2017-02-02 10:20:17 -08:00

verify-boilerplate.sh

Add a build rule for the boilerplate unit test.

2017-01-01 22:54:32 -08:00

verify-cli-conventions.sh

Tools for checking CLI conventions

2016-10-17 11:50:02 -02:00

verify-codecgen.sh

add apiregistration types

2016-12-06 13:45:10 -05:00

verify-codegen.sh

rename kubernetes-discovery to kube-aggregator

2017-01-10 12:27:42 -05:00

verify-description.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

verify-federation-openapi-spec.sh

Add verify script federation OpenAPI spec generation

2016-11-07 02:41:50 -08:00

verify-flags-underscore.py

ignore BUILD in the flags-underscore.py validation

2016-10-21 17:32:33 -07:00

verify-generated-docs.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

verify-generated-protobuf.sh

utils: Use macOS copatible copying method

2016-10-18 11:09:38 +02:00

verify-generated-runtime.sh

add update-staging-client-go.sh and verify-staging-client-go.sh;

2016-10-29 14:20:39 -07:00

verify-generated-swagger-docs.sh

docs generation: Use macos compatible copy method

2016-10-18 11:11:03 +02:00

verify-godep-licenses.sh

Remove "All rights reserved" from all the headers.

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

verify-godeps.sh

Fix undefined KEEP_TMP in verify-godeps.sh

2017-01-24 14:45:20 -05:00

verify-gofmt.sh

ignore staging in munge scripts

2016-08-24 13:09:13 -07:00

verify-golint.sh

hack/verify-golint: enforce cleanup of old packages

2017-01-24 08:34:06 +01:00

verify-govet.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

verify-import-boss.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

verify-linkcheck.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

verify-openapi-spec.sh

verify-openapi-spec.sh should not ignore extra file in the spec folder api/openapi-spec

2016-11-01 01:13:11 -07:00

verify-pkg-names.sh

Fix spelling in package naming linter error message

2016-12-20 15:48:14 -05:00

verify-readonly-packages.sh

Add more generated files as exceptions for readonly directories

2017-01-11 21:38:08 +01:00

verify-staging-client-go.sh

client-go: add staging/copy.sh testing

2017-02-02 20:28:33 +01:00

verify-staging-imports.sh

hack/verify-staging-imports.sh: print forbidden dependencies

2017-01-30 17:26:19 +01:00

verify-swagger-spec.sh

Use make as the main build tool

2016-07-12 21:52:00 -07:00

verify-symbols.sh

spell check for test/*

2016-12-14 06:03:00 -08:00

verify-test-images.sh

Make all useage of sort deterministic

2016-10-20 16:47:20 -04:00

verify-test-owners.sh

Disable verify-test-owners.sh and make go vet more obvious

2016-12-21 11:44:04 -08:00