github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Updated stripFieldsTest to be run with update instead of apply

Browse Source
This commit is contained in:
Josh Samuels
2019-08-30 00:28:13 -04:00
parent d61b833161
commit 2efc617a3c
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,9 +22,12 @@ import (
"net/http" "net/http"
"testing" "testing"
"time"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
@@ -76,37 +79,36 @@ func TestApplyStripsFields(t *testing.T) {
obj := &corev1.Pod{} obj := &corev1.Pod{}
newObj, err := f.Apply(obj, []byte(`{ newObj := &corev1.Pod{
"apiVersion": "apps/v1", TypeMeta: metav1.TypeMeta{
"kind": "Deployment", APIVersion: "apps/v1",
"metadata": { Kind: "Deployment",
"name": "b", },
"namespace": "b", ObjectMeta: metav1.ObjectMeta{
"creationTimestamp": "2016-05-19T09:59:00Z", Name: "b",
"selfLink": "b", Namespace: "b",
"uid": "b", CreationTimestamp: metav1.NewTime(time.Now()),
"clusterName": "b", SelfLink: "b",
"generation": 0, UID: "b",
"managedFields": [{ ClusterName: "b",
"manager": "apply", Generation: 0,
"operation": "Apply", ManagedFields: []metav1.ManagedFieldsEntry{
"apiVersion": "apps/v1", {
"fields": { Manager: "update",
"f:metadata": { Operation: metav1.ManagedFieldsOperationApply,
"f:labels": { APIVersion: "apps/v1",
"f:test-label": {} },
} },
} ResourceVersion: "b",
} },
}], }
"resourceVersion": "b"
} updatedObj, err := f.Update(obj, newObj, "fieldmanager_test")
}`), "fieldmanager_test", false)
if err != nil { if err != nil {
t.Fatalf("failed to apply object: %v", err) t.Fatalf("failed to apply object: %v", err)
} }
accessor, err := meta.Accessor(newObj) accessor, err := meta.Accessor(updatedObj)
if err != nil { if err != nil {
t.Fatalf("couldn't get accessor: %v", err) t.Fatalf("couldn't get accessor: %v", err)
} }