Skip to content

Commit

Permalink
Format code
Browse files Browse the repository at this point in the history
Signed-off-by: Pavol Loffay <[email protected]>
  • Loading branch information
pavolloffay committed Dec 4, 2018
1 parent ce78f19 commit 3be05ea
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 11 deletions.
8 changes: 5 additions & 3 deletions pkg/cronjob/spark_dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ package cronjob

import (
"fmt"
"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"github.com/jaegertracing/jaeger-operator/pkg/storage"
"strconv"

"github.com/spf13/viper"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"strconv"

"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"github.com/jaegertracing/jaeger-operator/pkg/storage"
)

var supportedStorageTypes = map[string]bool{"elasticsearch": true, "cassandra": true}
Expand Down
6 changes: 4 additions & 2 deletions pkg/cronjob/spark_dependencies_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package cronjob

import (
"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"testing"

"github.com/stretchr/testify/assert"
"k8s.io/api/core/v1"
"testing"

"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
)

func TestApplyDefaults(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/strategy/all-in-one.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package strategy

import (
"context"
"github.com/jaegertracing/jaeger-operator/pkg/cronjob"

"github.com/sirupsen/logrus"
"github.com/spf13/viper"
Expand All @@ -13,6 +12,7 @@ import (
"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"github.com/jaegertracing/jaeger-operator/pkg/config/sampling"
"github.com/jaegertracing/jaeger-operator/pkg/config/ui"
"github.com/jaegertracing/jaeger-operator/pkg/cronjob"
"github.com/jaegertracing/jaeger-operator/pkg/deployment"
"github.com/jaegertracing/jaeger-operator/pkg/ingress"
"github.com/jaegertracing/jaeger-operator/pkg/inject"
Expand Down
2 changes: 1 addition & 1 deletion pkg/strategy/all-in-one_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
batchv1beta1 "k8s.io/api/batch/v1beta1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"github.com/jaegertracing/jaeger-operator/pkg/storage"
batchv1beta1 "k8s.io/api/batch/v1beta1"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion pkg/strategy/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import (
"reflect"
"testing"

"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
osv1 "github.com/openshift/api/route/v1"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/core/v1"
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
)

func TestNewControllerForAllInOneAsDefault(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/strategy/production.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package strategy

import (
"context"
"github.com/jaegertracing/jaeger-operator/pkg/cronjob"

"github.com/sirupsen/logrus"
"github.com/spf13/viper"
batchv1 "k8s.io/api/batch/v1"
Expand All @@ -12,6 +12,7 @@ import (
"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"github.com/jaegertracing/jaeger-operator/pkg/config/sampling"
"github.com/jaegertracing/jaeger-operator/pkg/config/ui"
"github.com/jaegertracing/jaeger-operator/pkg/cronjob"
"github.com/jaegertracing/jaeger-operator/pkg/deployment"
"github.com/jaegertracing/jaeger-operator/pkg/ingress"
"github.com/jaegertracing/jaeger-operator/pkg/inject"
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/spark_dependencies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ package e2e
import (
"context"
"fmt"
"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"testing"

framework "github.com/operator-framework/operator-sdk/pkg/test"
"github.com/operator-framework/operator-sdk/pkg/test/e2eutil"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"testing"

"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
)

func SparkDependenciesElasticsearch(t *testing.T) {
Expand Down

0 comments on commit 3be05ea

Please sign in to comment.