github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79391 from danwinship/nodeaddresses-update-fix

Browse Source 
Don't use strategic merge patch on Node.Status.Addresses
This commit is contained in:
Kubernetes Prow Robot
2019-07-02 21:08:29 -07:00
committed by GitHub
parent 5f83eb721b 05a9634fb3
commit c8cee54240
7 changed files with 232 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/swagger.json generated
View File

@@ -8438,7 +8438,7 @@
"description": "NodeStatus is information about the current status of a node.",
"properties": {
"addresses": {
"description": "List of addresses reachable to the node. Queried from cloud provider, if available. More info: https://kubernetes.io/docs/concepts/nodes/node/#addresses",
"description": "List of addresses reachable to the node. Queried from cloud provider, if available. More info: https://kubernetes.io/docs/concepts/nodes/node/#addresses Note: This field is declared as mergeable, but the merge key is not sufficiently unique, which can cause data corruption when it is merged. Callers should instead use a full-replacement patch. See http://pr.k8s.io/79391 for an example.",
"items": {
"$ref": "#/definitions/io.k8s.api.core.v1.NodeAddress"
},