Skip to content
This repository was archived by the owner on May 28, 2021. It is now read-only.

Fixes gofmt issues introduced to master #192

Merged
merged 1 commit into from
Aug 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/mysql-agent/app/mysql_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ import (
kubernetes "k8s.io/client-go/kubernetes"
rest "k8s.io/client-go/rest"

agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
cluster "github.com/oracle/mysql-operator/pkg/cluster"
backupcontroller "github.com/oracle/mysql-operator/pkg/controllers/backup"
clustermgr "github.com/oracle/mysql-operator/pkg/controllers/cluster/manager"
restorecontroller "github.com/oracle/mysql-operator/pkg/controllers/restore"
clientset "github.com/oracle/mysql-operator/pkg/generated/clientset/versioned"
informers "github.com/oracle/mysql-operator/pkg/generated/informers/externalversions"
agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
metrics "github.com/oracle/mysql-operator/pkg/util/metrics"
signals "github.com/oracle/mysql-operator/pkg/util/signals"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mysql-operator/app/mysql_operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"

operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
backupcontroller "github.com/oracle/mysql-operator/pkg/controllers/backup"
backupschedule "github.com/oracle/mysql-operator/pkg/controllers/backup/schedule"
cluster "github.com/oracle/mysql-operator/pkg/controllers/cluster"
restorecontroller "github.com/oracle/mysql-operator/pkg/controllers/restore"
clientset "github.com/oracle/mysql-operator/pkg/generated/clientset/versioned"
informers "github.com/oracle/mysql-operator/pkg/generated/informers/externalversions"
operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
metrics "github.com/oracle/mysql-operator/pkg/util/metrics"
signals "github.com/oracle/mysql-operator/pkg/util/signals"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/cluster/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ import (
"k8s.io/client-go/kubernetes/fake"
cache "k8s.io/client-go/tools/cache"

operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
"github.com/oracle/mysql-operator/pkg/apis/mysql/v1alpha1"
"github.com/oracle/mysql-operator/pkg/constants"
"github.com/oracle/mysql-operator/pkg/controllers/util"
mysqlfake "github.com/oracle/mysql-operator/pkg/generated/clientset/versioned/fake"
informerfactory "github.com/oracle/mysql-operator/pkg/generated/informers/externalversions"
informersv1alpha1 "github.com/oracle/mysql-operator/pkg/generated/informers/externalversions/mysql/v1alpha1"
operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
"github.com/oracle/mysql-operator/pkg/resources/secrets"
statefulsets "github.com/oracle/mysql-operator/pkg/resources/statefulsets"
buildversion "github.com/oracle/mysql-operator/pkg/version"
Expand Down
4 changes: 2 additions & 2 deletions pkg/resources/statefulsets/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/intstr"

agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
"github.com/oracle/mysql-operator/pkg/apis/mysql/v1alpha1"
"github.com/oracle/mysql-operator/pkg/constants"
agentopts "github.com/oracle/mysql-operator/pkg/options/agent"
operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
"github.com/oracle/mysql-operator/pkg/resources/secrets"
"github.com/oracle/mysql-operator/pkg/version"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/resources/statefulsets/statefulset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
"github.com/oracle/mysql-operator/pkg/apis/mysql/v1alpha1"
operatoropts "github.com/oracle/mysql-operator/pkg/options/operator"
)

func mockOperatorConfig() operatoropts.MySQLOperatorOpts {
Expand Down