Skip to content

Commit

Permalink
Reinstated the registration of ES types (#366)
Browse files Browse the repository at this point in the history
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
  • Loading branch information
jpkrohling authored and objectiser committed Apr 5, 2019
1 parent 390d5d4 commit 0a41d7d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions pkg/storage/elasticsearch/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,7 @@ const (
UpdateClusterSettings ClusterEvent = "UpdateClusterSettings"
NoEvent ClusterEvent = "NoEvent"
)

func init() {
SchemeBuilder.Register(&Elasticsearch{}, &ElasticsearchList{})
}
5 changes: 3 additions & 2 deletions test/e2e/suite_self_provisioned_elasticsearch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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",
},
}))

Expand Down

0 comments on commit 0a41d7d

Please sign in to comment.