From 0a41d7d7a4144b9717aa6ef0cdc059ffd514dd81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Fri, 5 Apr 2019 18:02:29 +0200 Subject: [PATCH] Reinstated the registration of ES types (#366) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling --- pkg/storage/elasticsearch/v1/types.go | 4 ++++ test/e2e/suite_self_provisioned_elasticsearch_test.go | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/storage/elasticsearch/v1/types.go b/pkg/storage/elasticsearch/v1/types.go index 4aaa74394..718ee798c 100644 --- a/pkg/storage/elasticsearch/v1/types.go +++ b/pkg/storage/elasticsearch/v1/types.go @@ -208,3 +208,7 @@ const ( UpdateClusterSettings ClusterEvent = "UpdateClusterSettings" NoEvent ClusterEvent = "NoEvent" ) + +func init() { + SchemeBuilder.Register(&Elasticsearch{}, &ElasticsearchList{}) +} diff --git a/test/e2e/suite_self_provisioned_elasticsearch_test.go b/test/e2e/suite_self_provisioned_elasticsearch_test.go index 5e2814b71..b5f8b2b49 100644 --- a/test/e2e/suite_self_provisioned_elasticsearch_test.go +++ b/test/e2e/suite_self_provisioned_elasticsearch_test.go @@ -11,6 +11,7 @@ import ( "github.com/jaegertracing/jaeger-operator/pkg/apis" "github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1" + esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1" ) func TestSelfProvisionedES(t *testing.T) { @@ -24,10 +25,10 @@ func TestSelfProvisionedES(t *testing.T) { APIVersion: "jaegertracing.io/v1", }, })) - assert.NoError(t, framework.AddToFrameworkScheme(apis.AddToScheme, &v1.JaegerList{ + assert.NoError(t, framework.AddToFrameworkScheme(apis.AddToScheme, &esv1.ElasticsearchList{ TypeMeta: metav1.TypeMeta{ Kind: "Elasticsearch", - APIVersion: "logging.openshift.io/v1alpha1", + APIVersion: "logging.openshift.io/v1", }, }))