Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-grouping and re-ordering go imports #481

Merged
merged 1 commit into from
Mar 5, 2020
Merged

Re-grouping and re-ordering go imports #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/cluster-image-registry-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@ import (
"time"

"github.com/spf13/cobra"

_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"k8s.io/klog"

"github.com/openshift/library-go/pkg/operator/watchdog"

regopclient "github.com/openshift/cluster-image-registry-operator/pkg/client"
"github.com/openshift/cluster-image-registry-operator/pkg/metrics"
"github.com/openshift/cluster-image-registry-operator/pkg/operator"
"github.com/openshift/cluster-image-registry-operator/pkg/signals"
"github.com/openshift/cluster-image-registry-operator/version"
"github.com/openshift/library-go/pkg/operator/watchdog"

_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
)

const metricsPort = 60000
Expand Down
17 changes: 9 additions & 8 deletions pkg/client/fake/fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
package fake

import (
"github.com/openshift/cluster-image-registry-operator/pkg/client"

configv1 "github.com/openshift/api/config/v1"
regopv1 "github.com/openshift/api/imageregistry/v1"
routev1 "github.com/openshift/api/route/v1"
configv1listers "github.com/openshift/client-go/config/listers/config/v1"
regopv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
routev1listers "github.com/openshift/client-go/route/listers/route/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
Expand All @@ -18,6 +10,15 @@ import (
corev1listers "k8s.io/client-go/listers/core/v1"
rbacv1listers "k8s.io/client-go/listers/rbac/v1"
"k8s.io/client-go/tools/cache"

configv1 "github.com/openshift/api/config/v1"
regopv1 "github.com/openshift/api/imageregistry/v1"
routev1 "github.com/openshift/api/route/v1"
configv1listers "github.com/openshift/client-go/config/listers/config/v1"
regopv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
routev1listers "github.com/openshift/client-go/route/listers/route/v1"

"github.com/openshift/cluster-image-registry-operator/pkg/client"
)

// FixturesBuilder helps create an in-memory version of client.Listers.
Expand Down
1 change: 1 addition & 0 deletions pkg/metrics/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

"github.com/prometheus/client_golang/prometheus/promhttp"

"k8s.io/klog"
)

Expand Down
21 changes: 11 additions & 10 deletions pkg/operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@ import (
"crypto/rand"
"fmt"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"
"github.com/openshift/cluster-image-registry-operator/pkg/storage/pvc"
"github.com/openshift/cluster-image-registry-operator/pkg/storage/swift"

configapiv1 "github.com/openshift/api/config/v1"
imageregistryv1 "github.com/openshift/api/imageregistry/v1"
operatorapi "github.com/openshift/api/operator/v1"
regopset "github.com/openshift/client-go/imageregistry/clientset/versioned/typed/imageregistry/v1"
appsapi "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"

configapiv1 "github.com/openshift/api/config/v1"
imageregistryv1 "github.com/openshift/api/imageregistry/v1"
operatorapi "github.com/openshift/api/operator/v1"
regopset "github.com/openshift/client-go/imageregistry/clientset/versioned/typed/imageregistry/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"
"github.com/openshift/cluster-image-registry-operator/pkg/storage/pvc"
"github.com/openshift/cluster-image-registry-operator/pkg/storage/swift"
)

// randomSecretSize is the number of random bytes to generate
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/complete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package operator
import (
"fmt"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
)

func appendFinalizer(cr *imageregistryv1.Config) {
Expand Down
1 change: 1 addition & 0 deletions pkg/operator/finalizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
regopset "github.com/openshift/client-go/imageregistry/clientset/versioned/typed/imageregistry/v1"

"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
)

Expand Down
11 changes: 6 additions & 5 deletions pkg/operator/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ package operator

import (
"fmt"
"github.com/openshift/cluster-image-registry-operator/pkg/metrics"

"github.com/openshift/cluster-image-registry-operator/defaults"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
operatorapiv1 "github.com/openshift/api/operator/v1"
appsapi "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
batchapi "k8s.io/api/batch/v1beta1"
metaapi "k8s.io/apimachinery/pkg/apis/meta/v1"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
operatorapiv1 "github.com/openshift/api/operator/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/metrics"
)

func updateCondition(cr *imageregistryv1.Config, condtype string, condstate operatorapiv1.OperatorCondition) {
Expand Down
1 change: 1 addition & 0 deletions pkg/resource/caconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"k8s.io/klog"

configlisters "github.com/openshift/client-go/config/listers/config/v1"

"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
)

Expand Down
11 changes: 6 additions & 5 deletions pkg/resource/clusteroperator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ import (
"reflect"
"testing"

"github.com/openshift/cluster-image-registry-operator/defaults"

cfgapi "github.com/openshift/api/config/v1"
imregv1 "github.com/openshift/api/imageregistry/v1"
operatorapi "github.com/openshift/api/operator/v1"
appsv1 "k8s.io/api/apps/v1"
kerror "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"

cfgapi "github.com/openshift/api/config/v1"
imregv1 "github.com/openshift/api/imageregistry/v1"
operatorapi "github.com/openshift/api/operator/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
)

type deployLister struct {
Expand Down
21 changes: 11 additions & 10 deletions pkg/resource/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,24 @@ import (
"fmt"
"os"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/resource/strategy"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
operatorv1 "github.com/openshift/api/operator/v1"
configlisters "github.com/openshift/client-go/config/listers/config/v1"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
appsapi "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
appsset "k8s.io/client-go/kubernetes/typed/apps/v1"
coreset "k8s.io/client-go/kubernetes/typed/core/v1"
appslisters "k8s.io/client-go/listers/apps/v1"
corelisters "k8s.io/client-go/listers/core/v1"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
operatorv1 "github.com/openshift/api/operator/v1"
configlisters "github.com/openshift/client-go/config/listers/config/v1"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/resource/strategy"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"
)

var _ Mutator = &generatorDeployment{}
Expand Down
17 changes: 9 additions & 8 deletions pkg/resource/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ import (
"reflect"
"time"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/client"
"github.com/openshift/cluster-image-registry-operator/pkg/metrics"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/resource/object"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
"k8s.io/apimachinery/pkg/api/errors"
metaapi "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/rest"
"k8s.io/client-go/util/retry"
"k8s.io/klog"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/client"
"github.com/openshift/cluster-image-registry-operator/pkg/metrics"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/resource/object"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"
)

func ApplyMutator(gen Mutator) error {
Expand Down
9 changes: 5 additions & 4 deletions pkg/resource/generatorimagepruner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ package resource
import (
"fmt"

"github.com/openshift/cluster-image-registry-operator/pkg/client"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
"k8s.io/apimachinery/pkg/api/errors"
metaapi "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
"k8s.io/klog"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"

"github.com/openshift/cluster-image-registry-operator/pkg/client"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
)

func NewImagePrunerGenerator(kubeconfig *rest.Config, clients *client.Clients, listers *client.ImagePrunerControllerListers, params *parameters.Globals) *ImagePrunerGenerator {
Expand Down
15 changes: 8 additions & 7 deletions pkg/resource/imageconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ import (
"sort"
"strings"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"

configapi "github.com/openshift/api/config/v1"
configset "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
configlisters "github.com/openshift/client-go/config/listers/config/v1"
routelisters "github.com/openshift/client-go/route/listers/route/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
kcorelisters "k8s.io/client-go/listers/core/v1"

configapi "github.com/openshift/api/config/v1"
configset "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
configlisters "github.com/openshift/client-go/config/listers/config/v1"
routelisters "github.com/openshift/client-go/route/listers/route/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
)

var _ Mutator = &generatorImageConfig{}
Expand Down
15 changes: 8 additions & 7 deletions pkg/resource/podtemplatespec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,20 @@ import (
"strconv"
"strings"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"

configapiv1 "github.com/openshift/api/config/v1"
v1 "github.com/openshift/api/imageregistry/v1"
configlisters "github.com/openshift/client-go/config/listers/config/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
coreset "k8s.io/client-go/kubernetes/typed/core/v1"

configapiv1 "github.com/openshift/api/config/v1"
v1 "github.com/openshift/api/imageregistry/v1"
configlisters "github.com/openshift/client-go/config/listers/config/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"
)

func generateLogLevel(cr *v1.Config) string {
Expand Down
9 changes: 5 additions & 4 deletions pkg/resource/podtemplatespec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ package resource
import (
"testing"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

v1 "github.com/openshift/api/imageregistry/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
cirofake "github.com/openshift/cluster-image-registry-operator/pkg/client/fake"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/storage/emptydir"

v1 "github.com/openshift/api/imageregistry/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

type volumeMount struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/resource/prunercronjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

imageregistryapiv1 "github.com/openshift/api/imageregistry/v1"
operatorapi "github.com/openshift/api/operator/v1"

imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
)
Expand Down
5 changes: 3 additions & 2 deletions pkg/resource/pullsecret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package resource

import (
"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
coreset "k8s.io/client-go/kubernetes/typed/core/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
)

var _ Mutator = &generatorPullSecret{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/resource/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"k8s.io/apimachinery/pkg/runtime"
corelisters "k8s.io/client-go/listers/core/v1"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
routeapi "github.com/openshift/api/route/v1"
routeset "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
routelisters "github.com/openshift/client-go/route/listers/route/v1"

imageregistryv1 "github.com/openshift/api/imageregistry/v1"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/resource/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ package resource
import (
"fmt"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
coreset "k8s.io/client-go/kubernetes/typed/core/v1"
corelisters "k8s.io/client-go/listers/core/v1"

"github.com/openshift/cluster-image-registry-operator/defaults"
"github.com/openshift/cluster-image-registry-operator/pkg/parameters"
"github.com/openshift/cluster-image-registry-operator/pkg/storage"
)

var _ Mutator = &generatorSecret{}
Expand Down