github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-25 14:35:43 +00:00
Code Issues Projects Releases Wiki Activity

Add new FieldsType to clarify the format of Fields

Browse Source
This commit is contained in:
Antoine Pelisse
2019-08-21 16:13:53 -07:00
parent 39724859b5
commit ff4e1f3592
13 changed files with 120 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/apiserver/apply/apply_test.go
View File

@@ -456,7 +456,8 @@ func TestApplyManagedFields(t *testing.T) {
"operation": "Apply",
"apiVersion": "v1",
"time": "` + accessor.GetManagedFields()[0].Time.UTC().Format(time.RFC3339) + `",
"fields": {
"fieldsType": "FieldsV1",
"fieldsV1": {
"f:metadata": {
"f:labels": {
"f:test-label": {}
@@ -469,7 +470,8 @@ func TestApplyManagedFields(t *testing.T) {
"operation": "Update",
"apiVersion": "v1",
"time": "` + accessor.GetManagedFields()[1].Time.UTC().Format(time.RFC3339) + `",
"fields": {
"fieldsType": "FieldsV1",
"fieldsV1": {
"f:data": {
"f:key": {},
"f:new-key": {}
@@ -684,7 +686,7 @@ func TestApplyRemoveContainerPort(t *testing.T) {
}
if len(deployment.Spec.Template.Spec.Containers[0].Ports) > 0 {
t.Fatalf("Expected no container ports but got: %v", deployment.Spec.Template.Spec.Containers[0].Ports)
t.Fatalf("Expected no container ports but got: %v, object: \n%#v", deployment.Spec.Template.Spec.Containers[0].Ports, deployment)
}
}
@@ -804,7 +806,7 @@ func TestApplyConvertsManagedFieldsVersion(t *testing.T) {
"manager": "sidecar_controller",
"operation": "Apply",
"apiVersion": "extensions/v1beta1",
"fields": {
"fieldsV1": {
"f:metadata": {
"f:labels": {
"f:sidecar_version": {}
@@ -918,7 +920,8 @@ func TestApplyConvertsManagedFieldsVersion(t *testing.T) {
Operation: metav1.ManagedFieldsOperationApply,
APIVersion: "apps/v1",
Time: actual.Time,
Fields: &metav1.Fields{
FieldsType: "FieldsV1",
FieldsV1: &metav1.FieldsV1{
Raw: []byte(`{"f:metadata":{"f:labels":{"f:sidecar_version":{}}},"f:spec":{"f:template":{"f:spec":{"f:containers":{"k:{\"name\":\"sidecar\"}":{".":{},"f:image":{},"f:name":{}}}}}}}`),
},
}