Skip to content

K
k3s
Commit 82245a1f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45980 from mengqiy/setElementOrder

Automatic merge from submit-queue support setElementOrder Implement [proposal](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/preserve-order-in-strategic-merge-patch.md). Fixes #40373 ```release-note kubectl edit and kubectl apply will keep the ordering of elements in merged lists ```
parents d3554ac0 c3481b07
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 42 deletions
pkg/kubectl/cmd/testdata/edit/testcase-edit-error-reedit/4.request
View file @ 82245a1f
{
"spec": {
"ports": [
"$setElementOrder/ports": [
{
"$patch": "delete",
"port": 81
},
"port": 82
}
],
"ports": [
{
"name": "80",
"port": 82,
"protocol": "TCP",
"targetPort": 80
},
{
"$patch": "delete",
"port": 81
}
]
}
......
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/3.request
View file @ 82245a1f
{
"spec": {
"$setElementOrder/ports": [
{
"port": 82
}
],
"clusterIP": "10.0.0.10",
"ports": [
{
......
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/6.request
View file @ 82245a1f
......@@ -5,16 +5,21 @@
}
},
"spec": {
"ports": [
"$setElementOrder/ports": [
{
"$patch": "delete",
"port": 82
},
"port": 83
}
],
"ports": [
{
"name": "80",
"port": 83,
"protocol": "VHF",
"targetPort": 81
},
{
"$patch": "delete",
"port": 82
}
]
}
......
pkg/kubectl/cmd/testdata/edit/testcase-list-errors/9.request
View file @ 82245a1f
......@@ -5,16 +5,21 @@
}
},
"spec": {
"ports": [
"$setElementOrder/ports": [
{
"$patch": "delete",
"port": 82
},
"port": 83
}
],
"ports": [
{
"name": "80",
"port": 83,
"protocol": "TCP",
"targetPort": 81
},
{
"$patch": "delete",
"port": 82
}
]
}
......
pkg/kubectl/cmd/testdata/edit/testcase-list-record/4.request
View file @ 82245a1f
......@@ -8,16 +8,21 @@
}
},
"spec": {
"ports": [
"$setElementOrder/ports": [
{
"$patch": "delete",
"port": 81
},
"port": 82
}
],
"ports": [
{
"name": "80",
"port": 82,
"protocol": "TCP",
"targetPort": 81
},
{
"$patch": "delete",
"port": 81
}
]
}
......
pkg/kubectl/cmd/testdata/edit/testcase-list/4.request
View file @ 82245a1f
......@@ -5,16 +5,21 @@
}
},
"spec": {
"ports": [
"$setElementOrder/ports": [
{
"$patch": "delete",
"port": 81
},
"port": 82
}
],
"ports": [
{
"name": "80",
"port": 82,
"protocol": "TCP",
"targetPort": 81
},
{
"$patch": "delete",
"port": 81
}
]
}
......
pkg/kubectl/cmd/testdata/edit/testcase-not-update-annotation/2.request
View file @ 82245a1f
{
"metadata": {
"labels": {
"new-label": "new-value"
}
}
"metadata": {
"labels": {
"new-label": "new-value"
}
}
}
\ No newline at end of file
pkg/kubectl/cmd/testdata/edit/testcase-single-service/2.request
View file @ 82245a1f
......@@ -5,16 +5,21 @@
}
},
"spec": {
"ports": [
"$setElementOrder/ports": [
{
"$patch": "delete",
"port": 80
},
"port": 81
}
],
"ports": [
{
"name": "80",
"port": 81,
"protocol": "TCP",
"targetPort": 80
},
{
"$patch": "delete",
"port": 80
}
]
}
......
pkg/kubectl/cmd/testdata/edit/testcase-update-annotation/2.request
View file @ 82245a1f
{
"metadata": {
"annotations": {
"kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"creationTimestamp\":\"2017-02-27T19:40:53Z\",\"labels\":{\"app\":\"svc1\",\"new-label\":\"new-value\"},\"name\":\"svc1\",\"namespace\":\"edit-test\",\"resourceVersion\":\"670\",\"selfLink\":\"/api/v1/namespaces/edit-test/services/svc1\",\"uid\":\"a6c11186-fd24-11e6-b53c-480fcf4a5275\"},\"spec\":{\"clusterIP\":\"10.0.0.204\",\"ports\":[{\"name\":\"80\",\"port\":80,\"protocol\":\"TCP\",\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"sessionAffinity\":\"None\",\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n"
},
"labels": {
"new-label": "new-value"
}
}
"metadata": {
"annotations": {
"kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"creationTimestamp\":\"2017-02-27T19:40:53Z\",\"labels\":{\"app\":\"svc1\",\"new-label\":\"new-value\"},\"name\":\"svc1\",\"namespace\":\"edit-test\",\"resourceVersion\":\"670\",\"selfLink\":\"/api/v1/namespaces/edit-test/services/svc1\",\"uid\":\"a6c11186-fd24-11e6-b53c-480fcf4a5275\"},\"spec\":{\"clusterIP\":\"10.0.0.204\",\"ports\":[{\"name\":\"80\",\"port\":80,\"protocol\":\"TCP\",\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"sessionAffinity\":\"None\",\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n"
},
"labels": {
"new-label": "new-value"
}
}
}
\ No newline at end of file
staging/src/k8s.io/apimachinery/pkg/util/mergepatch/errors.go
View file @ 82245a1f
......@@ -23,11 +23,12 @@ import (
)
var (
ErrBadJSONDoc = errors.New("invalid JSON document")
ErrNoListOfLists = errors.New("lists of lists are not supported")
ErrBadPatchFormatForPrimitiveList = errors.New("invalid patch format of primitive list")
ErrBadPatchFormatForRetainKeys = errors.New("invalid patch format of retainKeys")
ErrPatchContentNotMatchRetainKeys = errors.New("patch content doesn't match retainKeys list")
ErrBadJSONDoc = errors.New("invalid JSON document")
ErrNoListOfLists = errors.New("lists of lists are not supported")
ErrBadPatchFormatForPrimitiveList = errors.New("invalid patch format of primitive list")
ErrBadPatchFormatForRetainKeys = errors.New("invalid patch format of retainKeys")
ErrBadPatchFormatForSetElementOrderList = errors.New("invalid patch format of setElementOrder list")
ErrPatchContentNotMatchRetainKeys = errors.New("patch content doesn't match retainKeys list")
)
func ErrNoMergeKey(m map[string]interface{}, k string) error {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment