Change ES operator apiversion (#360)

* Change ES operator apiversion Signed-off-by: Gary Brown <[email protected]> * Fix unit tests Signed-off-by: Gary Brown <[email protected]>
jaegertracing · Apr 4, 2019 · 7f314b5 · 7f314b5
1 parent 67e6d0f
commit 7f314b5
Show file tree

Hide file tree

Showing 17 changed files with 175 additions and 144 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/apis/addtoscheme_jaegertracing_v1.go b/pkg/apis/addtoscheme_jaegertracing_v1.go
@@ -2,10 +2,10 @@ package apis
 
 import (
 	"github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1"
-	esv1alpha1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 )
 
 func init() {
 	// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
-	AddToSchemes = append(AddToSchemes, v1.SchemeBuilder.AddToScheme, esv1alpha1.SchemeBuilder.AddToScheme)
+	AddToSchemes = append(AddToSchemes, v1.SchemeBuilder.AddToScheme, esv1.SchemeBuilder.AddToScheme)
 }
diff --git a/pkg/apis/io/v1alpha1/jaeger_types.go b/pkg/apis/io/v1alpha1/jaeger_types.go
@@ -4,8 +4,7 @@ import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
-	esv1alpha1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 )
 
 // IngressSecurityType represents the possible values for the security type
@@ -160,11 +159,11 @@ type JaegerStorageSpec struct {
 
 // ElasticsearchSpec represents the ES configuration options that we pass down to the Elasticsearch operator
 type ElasticsearchSpec struct {
-	Resources        v1.ResourceRequirements             `json:"resources"`
-	NodeCount        int32                               `json:"nodeCount"`
-	NodeSelector     map[string]string                   `json:"nodeSelector,omitempty"`
-	Storage          esv1alpha1.ElasticsearchStorageSpec `json:"storage"`
-	RedundancyPolicy v1alpha1.RedundancyPolicyType       `json:"redundancyPolicy"`
+	Resources        v1.ResourceRequirements       `json:"resources"`
+	NodeCount        int32                         `json:"nodeCount"`
+	NodeSelector     map[string]string             `json:"nodeSelector,omitempty"`
+	Storage          esv1.ElasticsearchStorageSpec `json:"storage"`
+	RedundancyPolicy esv1.RedundancyPolicyType     `json:"redundancyPolicy"`
 }
 
 // JaegerCassandraCreateSchemaSpec holds the options related to the create-schema batch job

diff --git a/pkg/apis/jaegertracing/v1/jaeger_types.go b/pkg/apis/jaegertracing/v1/jaeger_types.go
@@ -4,7 +4,7 @@ import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 )
 
 // IngressSecurityType represents the possible values for the security type
@@ -187,12 +187,12 @@ type JaegerStorageSpec struct {
 // ElasticsearchSpec represents the ES configuration options that we pass down to the Elasticsearch operator
 // +k8s:openapi-gen=true
 type ElasticsearchSpec struct {
-	Image            string                            `json:"image"`
-	Resources        v1.ResourceRequirements           `json:"resources"`
-	NodeCount        int32                             `json:"nodeCount"`
-	NodeSelector     map[string]string                 `json:"nodeSelector,omitempty"`
-	Storage          v1alpha1.ElasticsearchStorageSpec `json:"storage"`
-	RedundancyPolicy v1alpha1.RedundancyPolicyType     `json:"redundancyPolicy"`
+	Image            string                        `json:"image"`
+	Resources        v1.ResourceRequirements       `json:"resources"`
+	NodeCount        int32                         `json:"nodeCount"`
+	NodeSelector     map[string]string             `json:"nodeSelector,omitempty"`
+	Storage          esv1.ElasticsearchStorageSpec `json:"storage"`
+	RedundancyPolicy esv1.RedundancyPolicyType     `json:"redundancyPolicy"`
 }
 
 // JaegerCassandraCreateSchemaSpec holds the options related to the create-schema batch job

diff --git a/pkg/controller/jaeger/elasticsearch.go b/pkg/controller/jaeger/elasticsearch.go
@@ -14,15 +14,15 @@ import (
 
 	"github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1"
 	"github.com/jaegertracing/jaeger-operator/pkg/inventory"
-	esv1alpha1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 )
 
-func (r *ReconcileJaeger) applyElasticsearches(jaeger v1.Jaeger, desired []esv1alpha1.Elasticsearch) error {
+func (r *ReconcileJaeger) applyElasticsearches(jaeger v1.Jaeger, desired []esv1.Elasticsearch) error {
 	opts := client.MatchingLabels(map[string]string{
 		"app.kubernetes.io/instance": jaeger.Name,
 		"app.kubernetes.io/part-of":  "jaeger",
 	})
-	list := &esv1alpha1.ElasticsearchList{}
+	list := &esv1.ElasticsearchList{}
 	if err := r.client.List(context.Background(), opts, list); err != nil {
 		return err
 	}
@@ -55,7 +55,7 @@ func (r *ReconcileJaeger) applyElasticsearches(jaeger v1.Jaeger, desired []esv1a
 	return nil
 }
 
-func waitForAvailableElastic(c client.Client, es esv1alpha1.Elasticsearch) error {
+func waitForAvailableElastic(c client.Client, es esv1.Elasticsearch) error {
 	var expectedSize int32
 	for _, n := range es.Spec.Nodes {
 		expectedSize += n.NodeCount

diff --git a/pkg/controller/jaeger/elasticsearch_test.go b/pkg/controller/jaeger/elasticsearch_test.go
@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1"
-	esv1alpha1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 	"github.com/jaegertracing/jaeger-operator/pkg/strategy"
 )
 
@@ -35,7 +35,7 @@ func TestElasticsearchesCreate(t *testing.T) {
 
 	r, cl := getReconciler(objs)
 	r.strategyChooser = func(jaeger *v1.Jaeger) strategy.S {
-		s := strategy.New().WithElasticsearches([]esv1alpha1.Elasticsearch{{
+		s := strategy.New().WithElasticsearches([]esv1.Elasticsearch{{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: nsn.Name,
 			},
@@ -50,7 +50,7 @@ func TestElasticsearchesCreate(t *testing.T) {
 	assert.NoError(t, err)
 	assert.False(t, res.Requeue, "We don't requeue for now")
 
-	persisted := &esv1alpha1.Elasticsearch{}
+	persisted := &esv1.Elasticsearch{}
 	persistedName := types.NamespacedName{
 		Name:      nsn.Name,
 		Namespace: nsn.Namespace,
@@ -69,7 +69,7 @@ func TestElasticsearchesUpdate(t *testing.T) {
 		Name: "TestElasticsearchesUpdate",
 	}
 
-	orig := esv1alpha1.Elasticsearch{}
+	orig := esv1.Elasticsearch{}
 	orig.Name = nsn.Name
 	orig.Annotations = map[string]string{"key": "value"}
 
@@ -80,11 +80,11 @@ func TestElasticsearchesUpdate(t *testing.T) {
 
 	r, cl := getReconciler(objs)
 	r.strategyChooser = func(jaeger *v1.Jaeger) strategy.S {
-		updated := esv1alpha1.Elasticsearch{}
+		updated := esv1.Elasticsearch{}
 		updated.Name = orig.Name
 		updated.Annotations = map[string]string{"key": "new-value"}
 
-		s := strategy.New().WithElasticsearches([]esv1alpha1.Elasticsearch{updated})
+		s := strategy.New().WithElasticsearches([]esv1.Elasticsearch{updated})
 		return s
 	}
 
@@ -93,7 +93,7 @@ func TestElasticsearchesUpdate(t *testing.T) {
 	assert.NoError(t, err)
 
 	// verify
-	persisted := &esv1alpha1.Elasticsearch{}
+	persisted := &esv1.Elasticsearch{}
 	persistedName := types.NamespacedName{
 		Name:      orig.Name,
 		Namespace: orig.Namespace,
@@ -112,7 +112,7 @@ func TestElasticsearchesDelete(t *testing.T) {
 		Name: "TestElasticsearchesDelete",
 	}
 
-	orig := esv1alpha1.Elasticsearch{}
+	orig := esv1.Elasticsearch{}
 	orig.Name = nsn.Name
 
 	objs := []runtime.Object{
@@ -130,7 +130,7 @@ func TestElasticsearchesDelete(t *testing.T) {
 	assert.NoError(t, err)
 
 	// verify
-	persisted := &esv1alpha1.Elasticsearch{}
+	persisted := &esv1.Elasticsearch{}
 	persistedName := types.NamespacedName{
 		Name:      orig.Name,
 		Namespace: orig.Namespace,

diff --git a/pkg/controller/jaeger/jaeger_controller_test.go b/pkg/controller/jaeger/jaeger_controller_test.go
@@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1"
-	esv1alpha1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 	"github.com/jaegertracing/jaeger-operator/pkg/strategy"
 )
 
@@ -99,7 +99,7 @@ func getReconciler(objs []runtime.Object) (*ReconcileJaeger, client.Client) {
 	s.AddKnownTypes(v1.SchemeGroupVersion, &v1.Jaeger{})
 
 	// Jaeger's Elasticsearch
-	s.AddKnownTypes(v1.SchemeGroupVersion, &esv1alpha1.Elasticsearch{}, &esv1alpha1.ElasticsearchList{})
+	s.AddKnownTypes(v1.SchemeGroupVersion, &esv1.Elasticsearch{}, &esv1.ElasticsearchList{})
 
 	cl := fake.NewFakeClient(objs...)
 	return &ReconcileJaeger{client: cl, scheme: s}, cl

diff --git a/pkg/inventory/elasticsearch.go b/pkg/inventory/elasticsearch.go
@@ -1,19 +1,19 @@
 package inventory
 
 import (
-	esv1alpha1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 )
 
 // Elasticsearch represents the elastic search inventory based on the current and desired states
 type Elasticsearch struct {
-	Create []esv1alpha1.Elasticsearch
-	Update []esv1alpha1.Elasticsearch
-	Delete []esv1alpha1.Elasticsearch
+	Create []esv1.Elasticsearch
+	Update []esv1.Elasticsearch
+	Delete []esv1.Elasticsearch
 }
 
 // ForElasticsearches builds a new elastic search inventory based on the existing and desired states
-func ForElasticsearches(existing []esv1alpha1.Elasticsearch, desired []esv1alpha1.Elasticsearch) Elasticsearch {
-	update := []esv1alpha1.Elasticsearch{}
+func ForElasticsearches(existing []esv1.Elasticsearch, desired []esv1.Elasticsearch) Elasticsearch {
+	update := []esv1.Elasticsearch{}
 	mcreate := esMap(desired)
 	mdelete := esMap(existing)
 
@@ -45,16 +45,16 @@ func ForElasticsearches(existing []esv1alpha1.Elasticsearch, desired []esv1alpha
 	}
 }
 
-func esMap(deps []esv1alpha1.Elasticsearch) map[string]esv1alpha1.Elasticsearch {
-	m := map[string]esv1alpha1.Elasticsearch{}
+func esMap(deps []esv1.Elasticsearch) map[string]esv1.Elasticsearch {
+	m := map[string]esv1.Elasticsearch{}
 	for _, d := range deps {
 		m[d.Name] = d
 	}
 	return m
 }
 
-func esList(m map[string]esv1alpha1.Elasticsearch) []esv1alpha1.Elasticsearch {
-	l := []esv1alpha1.Elasticsearch{}
+func esList(m map[string]esv1.Elasticsearch) []esv1.Elasticsearch {
+	l := []esv1.Elasticsearch{}
 	for _, v := range m {
 		l = append(l, v)
 	}

diff --git a/pkg/inventory/elasticsearch_test.go b/pkg/inventory/elasticsearch_test.go
@@ -6,47 +6,47 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	esv1alpha1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1alpha1"
+	esv1 "github.com/jaegertracing/jaeger-operator/pkg/storage/elasticsearch/v1"
 )
 
 func TestElasticsearchInventory(t *testing.T) {
-	toCreate := esv1alpha1.Elasticsearch{
+	toCreate := esv1.Elasticsearch{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "to-create",
 		},
 	}
-	toUpdate := esv1alpha1.Elasticsearch{
+	toUpdate := esv1.Elasticsearch{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "to-update",
 		},
-		Spec: esv1alpha1.ElasticsearchSpec{
-			ManagementState: esv1alpha1.ManagementStateManaged,
+		Spec: esv1.ElasticsearchSpec{
+			ManagementState: esv1.ManagementStateManaged,
 		},
 	}
-	updated := esv1alpha1.Elasticsearch{
+	updated := esv1.Elasticsearch{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "to-update",
 		},
-		Spec: esv1alpha1.ElasticsearchSpec{
-			ManagementState: esv1alpha1.ManagementStateUnmanaged,
+		Spec: esv1.ElasticsearchSpec{
+			ManagementState: esv1.ManagementStateUnmanaged,
 		},
 	}
-	toDelete := esv1alpha1.Elasticsearch{
+	toDelete := esv1.Elasticsearch{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "to-delete",
 		},
 	}
 
-	existing := []esv1alpha1.Elasticsearch{toUpdate, toDelete}
-	desired := []esv1alpha1.Elasticsearch{updated, toCreate}
+	existing := []esv1.Elasticsearch{toUpdate, toDelete}
+	desired := []esv1.Elasticsearch{updated, toCreate}
 
 	inv := ForElasticsearches(existing, desired)
 	assert.Len(t, inv.Create, 1)
 	assert.Equal(t, "to-create", inv.Create[0].Name)
 
 	assert.Len(t, inv.Update, 1)
 	assert.Equal(t, "to-update", inv.Update[0].Name)
-	assert.Equal(t, esv1alpha1.ManagementStateUnmanaged, inv.Update[0].Spec.ManagementState)
+	assert.Equal(t, esv1.ManagementStateUnmanaged, inv.Update[0].Spec.ManagementState)
 
 	assert.Len(t, inv.Delete, 1)
 	assert.Equal(t, "to-delete", inv.Delete[0].Name)