github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74206 from kwiesmueller/add-strip-fields 

add more fields to be stripped from managedFields
pull/564/head
Kubernetes Prow Robot 2019-02-26 18:11:58 -08:00 committed by GitHub
parent 4fa5ece62c 8a6a2883f9
commit b9569559ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/BUILD
View File

@ -42,7 +42,6 @@ go_test(
deps = [ deps = [
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
], ],

3
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go
View File

@ -235,6 +235,9 @@ var stripSet = fieldpath.NewSet(
fieldpath.MakePathOrDie("metadata", "creationTimestamp"), fieldpath.MakePathOrDie("metadata", "creationTimestamp"),
fieldpath.MakePathOrDie("metadata", "selfLink"), fieldpath.MakePathOrDie("metadata", "selfLink"),
fieldpath.MakePathOrDie("metadata", "uid"), fieldpath.MakePathOrDie("metadata", "uid"),
fieldpath.MakePathOrDie("metadata", "clusterName"),
fieldpath.MakePathOrDie("metadata", "generation"),
fieldpath.MakePathOrDie("metadata", "managedFields"),
fieldpath.MakePathOrDie("metadata", "resourceVersion"), fieldpath.MakePathOrDie("metadata", "resourceVersion"),
) )

34
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go
View File

@ -19,11 +19,9 @@ package fieldmanager_test
import ( import (
"errors" "errors"
"testing" "testing"
"time"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager" "k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager"
@ -71,14 +69,7 @@ func TestFieldManagerCreation(t *testing.T) {
func TestApplyStripsFields(t *testing.T) { func TestApplyStripsFields(t *testing.T) {
f := NewTestFieldManager(t) f := NewTestFieldManager(t)
obj := &corev1.Pod{ obj := &corev1.Pod{}
ObjectMeta: metav1.ObjectMeta{
Name: "a",
Namespace: "a",
CreationTimestamp: metav1.Time{Time: time.Time{}},
SelfLink: "a",
},
}
newObj, err := f.Apply(obj, []byte(`{ newObj, err := f.Apply(obj, []byte(`{
"apiVersion": "v1", "apiVersion": "v1",
@ -89,6 +80,20 @@ func TestApplyStripsFields(t *testing.T) {
"creationTimestamp": "2016-05-19T09:59:00Z", "creationTimestamp": "2016-05-19T09:59:00Z",
"selfLink": "b", "selfLink": "b",
"uid": "b", "uid": "b",
"clusterName": "b",
"generation": 0,
"managedFields": [{
"manager": "apply",
"operation": "Apply",
"apiVersion": "v1",
"fields": {
"f:metadata": {
"f:labels": {
"f:test-label": {}
}
}
}
}],
"resourceVersion": "b" "resourceVersion": "b"
} }
}`), false) }`), false)
@ -108,14 +113,7 @@ func TestApplyStripsFields(t *testing.T) {
func TestApplyDoesNotStripLabels(t *testing.T) { func TestApplyDoesNotStripLabels(t *testing.T) {
f := NewTestFieldManager(t) f := NewTestFieldManager(t)
obj := &corev1.Pod{ obj := &corev1.Pod{}
ObjectMeta: metav1.ObjectMeta{
Name: "a",
Namespace: "a",
CreationTimestamp: metav1.Time{Time: time.Time{}},
SelfLink: "a",
},
}
newObj, err := f.Apply(obj, []byte(`{ newObj, err := f.Apply(obj, []byte(`{
"apiVersion": "v1", "apiVersion": "v1",