diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go index cbe510eed53..759fdd8e6f0 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go @@ -57,6 +57,8 @@ import ( var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) +const validInitializerName = "test.k8s.io" + func init() { metav1.AddToGroupVersion(scheme, metav1.SchemeGroupVersion) example.AddToScheme(scheme) @@ -394,7 +396,7 @@ func TestStoreCreateInitialized(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "test", Initializers: &metav1.Initializers{ - Pending: []metav1.Initializer{{Name: "Test"}}, + Pending: []metav1.Initializer{{Name: validInitializerName}}, }, }, Spec: example.PodSpec{NodeName: "machine"}, @@ -422,7 +424,7 @@ func TestStoreCreateInitialized(t *testing.T) { defer w.Stop() event := <-w.ResultChan() pod := event.Object.(*example.Pod) - if event.Type != watch.Added || !hasInitializers(pod, "Test") { + if event.Type != watch.Added || !hasInitializers(pod, validInitializerName) { t.Fatalf("unexpected event: %s %#v", event.Type, event.Object) } @@ -497,7 +499,7 @@ func TestStoreCreateInitializedFailed(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "test", Initializers: &metav1.Initializers{ - Pending: []metav1.Initializer{{Name: "Test"}}, + Pending: []metav1.Initializer{{Name: validInitializerName}}, }, }, Spec: example.PodSpec{NodeName: "machine"}, @@ -519,7 +521,7 @@ func TestStoreCreateInitializedFailed(t *testing.T) { } event := <-w.ResultChan() pod := event.Object.(*example.Pod) - if event.Type != watch.Added || !hasInitializers(pod, "Test") { + if event.Type != watch.Added || !hasInitializers(pod, validInitializerName) { t.Fatalf("unexpected event: %s %#v", event.Type, event.Object) } pod.Initializers.Pending = nil @@ -849,7 +851,7 @@ func TestStoreDelete(t *testing.T) { func TestStoreDeleteUninitialized(t *testing.T) { podA := &example.Pod{ - ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: "Testing"}}}}, + ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: validInitializerName}}}}, Spec: example.PodSpec{NodeName: "machine"}, } @@ -993,7 +995,7 @@ func TestGracefulStoreHandleFinalizers(t *testing.T) { func TestFailedInitializationStoreUpdate(t *testing.T) { initialGeneration := int64(1) podInitializing := &example.Pod{ - ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: "Test"}}}, Generation: initialGeneration}, + ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: validInitializerName}}}, Generation: initialGeneration}, Spec: example.PodSpec{NodeName: "machine"}, } @@ -1608,7 +1610,7 @@ func TestStoreDeleteCollection(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "baz", Initializers: &metav1.Initializers{ - Pending: []metav1.Initializer{{Name: "Test"}}, + Pending: []metav1.Initializer{{Name: validInitializerName}}, }, }, } diff --git a/test/e2e/apimachinery/initializers.go b/test/e2e/apimachinery/initializers.go index 39f02528562..b2179eaf813 100644 --- a/test/e2e/apimachinery/initializers.go +++ b/test/e2e/apimachinery/initializers.go @@ -290,7 +290,7 @@ var _ = SIGDescribe("Initializers", func() { func newUninitializedPod(podName string) *v1.Pod { pod := newInitPod(podName) pod.Initializers = &metav1.Initializers{ - Pending: []metav1.Initializer{{Name: "Test"}}, + Pending: []metav1.Initializer{{Name: "test.k8s.io"}}, } return pod }