mirror of
https://github.com/kubernetes/client-go.git
synced 2025-09-04 16:40:21 +00:00
Add support for type checking Unstructured via GVK in reflector
It was previously possible to instantiate `Reflector` with `*unstructured.Unstructured` as the expected type but this did not support checking that event objects were of the correct API type (e.g. if event object was `v1.Pod` in `Unstructured` form but `v1.Service` was expected). This commit adds support for providing a GVK via an `Unstructured` expected type to compare with the GVK of event objects. The GVK will also be used in reflector log output. Kubernetes-commit: 237dbfd8ad322dfcad4bd4d5345368480c22d82f
This commit is contained in:
committed by
Kubernetes Publisher
parent
0e97bf0202
commit
ab4e4fccf4
58
tools/cache/reflector_test.go
vendored
58
tools/cache/reflector_test.go
vendored
@@ -20,13 +20,16 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
)
|
||||
@@ -430,3 +433,58 @@ func TestReflectorWatchListPageSize(t *testing.T) {
|
||||
t.Errorf("Expected 10 results, got %d", len(results))
|
||||
}
|
||||
}
|
||||
|
||||
func TestReflectorSetExpectedType(t *testing.T) {
|
||||
obj := &unstructured.Unstructured{}
|
||||
gvk := schema.GroupVersionKind{
|
||||
Group: "mygroup",
|
||||
Version: "v1",
|
||||
Kind: "MyKind",
|
||||
}
|
||||
obj.SetGroupVersionKind(gvk)
|
||||
testCases := map[string]struct {
|
||||
inputType interface{}
|
||||
expectedTypeName string
|
||||
expectedType reflect.Type
|
||||
expectedGVK *schema.GroupVersionKind
|
||||
}{
|
||||
"Nil type": {
|
||||
expectedTypeName: defaultExpectedTypeName,
|
||||
},
|
||||
"Normal type": {
|
||||
inputType: &v1.Pod{},
|
||||
expectedTypeName: "*v1.Pod",
|
||||
expectedType: reflect.TypeOf(&v1.Pod{}),
|
||||
},
|
||||
"Unstructured type without GVK": {
|
||||
inputType: &unstructured.Unstructured{},
|
||||
expectedTypeName: "*unstructured.Unstructured",
|
||||
expectedType: reflect.TypeOf(&unstructured.Unstructured{}),
|
||||
},
|
||||
"Unstructured type with GVK": {
|
||||
inputType: obj,
|
||||
expectedTypeName: gvk.String(),
|
||||
expectedType: reflect.TypeOf(&unstructured.Unstructured{}),
|
||||
expectedGVK: &gvk,
|
||||
},
|
||||
}
|
||||
for testName, tc := range testCases {
|
||||
t.Run(testName, func(t *testing.T) {
|
||||
r := &Reflector{}
|
||||
r.setExpectedType(tc.inputType)
|
||||
if tc.expectedType != r.expectedType {
|
||||
t.Fatalf("Expected expectedType %v, got %v", tc.expectedType, r.expectedType)
|
||||
}
|
||||
if tc.expectedTypeName != r.expectedTypeName {
|
||||
t.Fatalf("Expected expectedTypeName %v, got %v", tc.expectedTypeName, r.expectedTypeName)
|
||||
}
|
||||
gvkNotEqual := (tc.expectedGVK == nil) != (r.expectedGVK == nil)
|
||||
if tc.expectedGVK != nil && r.expectedGVK != nil {
|
||||
gvkNotEqual = *tc.expectedGVK != *r.expectedGVK
|
||||
}
|
||||
if gvkNotEqual {
|
||||
t.Fatalf("Expected expectedGVK %v, got %v", tc.expectedGVK, r.expectedGVK)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user