scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107515 from MikeSpreitzer/explain-reset-fields-failure

Browse Source 
Make TestApplyResetFields exhibit surprising object
This commit is contained in:
Kubernetes Prow Robot
2022-09-07 07:14:37 -07:00
committed by GitHub
parent cae4c036c8 d3081b378a
commit a488f4b95c
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/integration/apiserver/apply/reset_fields_test.go
View File

@@ -19,6 +19,7 @@ package apiserver
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"reflect" "reflect"
"strings" "strings"
"testing" "testing"
@@ -268,24 +269,28 @@ func TestApplyResetFields(t *testing.T) {
// skip checking for conflicts on resources // skip checking for conflicts on resources
// that will never have conflicts // that will never have conflicts
if _, ok = noConflicts[mapping.Resource.Resource]; !ok { if _, ok = noConflicts[mapping.Resource.Resource]; !ok {
var objRet *unstructured.Unstructured
// reapply second object to the spec endpoint // reapply second object to the spec endpoint
// that should fail with a conflict // that should fail with a conflict
_, err = dynamicClient. objRet, err = dynamicClient.
Resource(mapping.Resource). Resource(mapping.Resource).
Namespace(namespace). Namespace(namespace).
Apply(context.TODO(), name, obj2, metav1.ApplyOptions{FieldManager: "fieldmanager2"}) Apply(context.TODO(), name, obj2, metav1.ApplyOptions{FieldManager: "fieldmanager2"})
if err == nil || !strings.Contains(err.Error(), "conflict") { err = expectConflict(objRet, err, dynamicClient, mapping.Resource, namespace, name)
t.Fatalf("expected conflict, got error %v", err) if err != nil {
t.Fatalf("Did not get expected conflict in spec of %s %s/%s: %v", mapping.Resource, namespace, name, err)
} }
// reapply first object to the status endpoint // reapply first object to the status endpoint
// that should fail with a conflict // that should fail with a conflict
_, err = dynamicClient. objRet, err = dynamicClient.
Resource(mapping.Resource). Resource(mapping.Resource).
Namespace(namespace). Namespace(namespace).
ApplyStatus(context.TODO(), name, &obj1, metav1.ApplyOptions{FieldManager: "fieldmanager1"}) ApplyStatus(context.TODO(), name, &obj1, metav1.ApplyOptions{FieldManager: "fieldmanager1"})
if err == nil || !strings.Contains(err.Error(), "conflict") { err = expectConflict(objRet, err, dynamicClient, mapping.Resource, namespace, name)
t.Fatalf("expected conflict, got error %v", err) if err != nil {
t.Fatalf("Did not get expected conflict in status of %s %s/%s: %v", mapping.Resource, namespace, name, err)
} }
} }
@@ -298,3 +303,30 @@ func TestApplyResetFields(t *testing.T) {
} }
} }
} }
func expectConflict(objRet *unstructured.Unstructured, err error, dynamicClient dynamic.Interface, resource schema.GroupVersionResource, namespace, name string) error {
if err != nil && strings.Contains(err.Error(), "conflict") {
return nil
}
which := "returned"
// something unexpected is going on here, let's not assume that objRet==nil if any only if err!=nil
if objRet == nil {
which = "subsequently fetched"
var err2 error
objRet, err2 = dynamicClient.
Resource(resource).
Namespace(namespace).
Get(context.TODO(), name, metav1.GetOptions{})
if err2 != nil {
return fmt.Errorf("instead got error %w, and failed to Get object: %v", err, err2)
}
}
marshBytes, marshErr := json.Marshal(objRet)
var gotten string
if marshErr == nil {
gotten = string(marshBytes)
} else {
gotten = fmt.Sprintf("<failed to json.Marshall(%#+v): %v>", objRet, marshErr)
}
return fmt.Errorf("instead got error %w; %s object is %s", err, which, gotten)
}