Production-Grade Container Scheduling and Management
Go to file
Kubernetes Submit Queue 7aed663051
Merge pull request #53558 from nikhita/cr-strategic-merge-patch
Automatic merge from submit-queue (batch tested with PRs 54800, 53898, 54812, 54921, 53558). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix error for strategic merge patch of custom resources

Fixes #50037.

We need the go struct tags `patchMergeKey` and `patchStrategy` for fields that support a strategic merge patch. For native resources, we can easily figure out these tags since we know the fields.

Because custom resources are decoded as Unstructured and because we're missing the metadata about how to handle each field in a strategic merge patch, we can't find the go struct tags. Hence, we can't easily  do a strategic merge for custom resources.

So we should fail fast and return an error.

**Release note**:

```release-note
NONE
```

/cc @sttts @deads2k @ncdc
2017-11-02 03:14:27 -07:00
.github Merge pull request #54114 from xiangpengzhao/fix-pr-template 2017-10-30 18:37:06 -07:00
api Improve deleteOptions doc (generated) 2017-11-02 11:48:40 +08:00
build Merge pull request #53553 from bsteciuk/kubeadm-windows 2017-11-01 14:58:58 -07:00
cluster Merge pull request #54947 from hyperbolic2346/lb 2017-11-01 18:45:35 -07:00
cmd Merge pull request #54926 from zhangxiaoyu-zidif/fix-kubelet-args 2017-11-01 17:52:24 -07:00
docs Improve deleteOptions doc (generated) 2017-11-02 11:48:40 +08:00
examples examples/podsecuritypolicy/rbac: fix names in comments and sync with examples repository. 2017-10-27 16:15:19 +02:00
Godeps Merge pull request #53561 from justinsb/update_aws_sdk_go_1_12_7 2017-11-01 03:44:22 -07:00
hack Merge pull request #54449 from smarterclayton/get_with_options 2017-11-01 21:25:12 -07:00
logo Don't use strokes in the logo SVG 2017-10-12 09:38:56 -07:00
pkg Merge pull request #54921 from weiwei04/fix_reflector_last_resource_version 2017-11-02 03:14:24 -07:00
plugin Merge pull request #54812 from aveshagarwal/master-pod-toleration-restrictions-issues 2017-11-02 03:14:21 -07:00
staging Merge pull request #53558 from nikhita/cr-strategic-merge-patch 2017-11-02 03:14:27 -07:00
test Merge pull request #54787 from guangxuli/fix-apps-e2e-test 2017-11-02 00:43:14 -07:00
third_party Merge pull request #47699 from supereagle/fix-typos 2017-10-17 02:35:52 -07:00
translations Merge pull request #51463 from lucab85/i18n-Italian 2017-09-23 04:02:51 -07:00
vendor Merge pull request #53561 from justinsb/update_aws_sdk_go_1_12_7 2017-11-01 03:44:22 -07:00
.bazelrc
.generated_files
.gitattributes Don't hide proto files 2017-11-01 15:51:54 -07:00
.gitignore
.kazelcfg.json
BUILD.bazel
CHANGELOG-1.2.md Update TOC of CHANGELOG 2017-09-09 13:38:29 +08:00
CHANGELOG-1.3.md Move 1.3.* release notes out of CHANGELOG.md 2017-09-15 11:21:25 +08:00
CHANGELOG-1.4.md Update invalid TOC anchor of 1.4 CHANGELOG 2017-10-26 17:25:23 +08:00
CHANGELOG-1.5.md Regenerate CHANGELOG TOCs 2017-10-11 17:04:47 -04:00
CHANGELOG-1.6.md Update invalid TOC anchor of 1.6 CHANGELOG 2017-10-26 17:25:34 +08:00
CHANGELOG-1.7.md Add some indent in CHANGELOG-1.7 2017-10-23 09:45:35 +08:00
CHANGELOG-1.8.md Merge pull request #54128 from jianglingxia/jlx-changelog 2017-10-25 18:22:04 -07:00
CHANGELOG-1.9.md Update CHANGELOG-1.9.md for v1.9.0-alpha.2. 2017-11-01 15:32:46 -07:00
CHANGELOG.md Move 1.8.x release notes 2017-10-11 22:41:36 -04:00
code-of-conduct.md
CONTRIBUTING.md
labels.yaml Merge pull request #51848 from xiangpengzhao/milestone-label 2017-09-05 15:46:19 -07:00
LICENSE
Makefile
Makefile.generated_files
OWNERS
OWNERS_ALIASES Add bsalamat to milestone maintainers 2017-10-26 10:25:42 -07:00
README.md
SUPPORT.md
Vagrantfile
WORKSPACE

Kubernetes

Submit Queue Widget GoDoc Widget CII Best Practices


Kubernetes is an open source system for managing containerized applications across multiple hosts, providing basic mechanisms for deployment, maintenance, and scaling of applications.

Kubernetes builds upon a decade and a half of experience at Google running production workloads at scale using a system called Borg, combined with best-of-breed ideas and practices from the community.

Kubernetes is hosted by the Cloud Native Computing Foundation (CNCF). If you are a company that wants to help shape the evolution of technologies that are container-packaged, dynamically-scheduled and microservices-oriented, consider joining the CNCF. For details about who's involved and how Kubernetes plays a role, read the CNCF announcement.


To start using Kubernetes

See our documentation on kubernetes.io.

Try our interactive tutorial.

Take a free course on Scalable Microservices with Kubernetes.

To start developing Kubernetes

The community repository hosts all information about building Kubernetes from source, how to contribute code and documentation, who to contact about what, etc.

If you want to build Kubernetes right away there are two options:

You have a working Go environment.
$ go get -d k8s.io/kubernetes
$ cd $GOPATH/src/k8s.io/kubernetes
$ make
You have a working Docker environment.
$ git clone https://github.com/kubernetes/kubernetes
$ cd kubernetes
$ make quick-release

If you are less impatient, head over to the developer's documentation.

Support

If you need support, start with the troubleshooting guide and work your way through the process that we've outlined.

That said, if you have questions, reach out to us one way or another.

Analytics