Skip to content

Commit

Permalink
Merge pull request #17393 from juanvallejo/jvallejo/move-diagnostics-…
Browse files Browse the repository at this point in the history
…pkg-oc

Automatic merge from submit-queue.

move pkg/diagnostices -> pkg/oc/admin/diagnostics

This patch is a part of pull/17356 - it aims to break all dependencies
between packages outside of pkg/oc and the clientcmd package.

This patch also partially solves a few of the items (currently checked) from #17309.
By moving `pkg/diagnostics` to the `pkg/oc` subtree, we are eliminating package
dependencies on `pkg/oc/...` in packages outside of that subtree.

cc @liggitt @deads2k @openshift/cli-review @sosiouxme
  • Loading branch information
openshift-merge-robot authored Nov 27, 2017
2 parents 33c21b7 + 8e9aaf4 commit 32e0704
Show file tree
Hide file tree
Showing 73 changed files with 85 additions and 85 deletions.
6 changes: 3 additions & 3 deletions pkg/oc/admin/diagnostics/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"

clientdiags "github.com/openshift/origin/pkg/diagnostics/client"
networkdiags "github.com/openshift/origin/pkg/diagnostics/network"
"github.com/openshift/origin/pkg/diagnostics/types"
clientdiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/client"
networkdiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/network"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions pkg/oc/admin/diagnostics/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
appsclient "github.com/openshift/origin/pkg/apps/generated/internalclientset"
oauthorizationclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset"
osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
clustdiags "github.com/openshift/origin/pkg/diagnostics/cluster"
agldiags "github.com/openshift/origin/pkg/diagnostics/cluster/aggregated_logging"
"github.com/openshift/origin/pkg/diagnostics/types"
imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset"
clustdiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster"
agldiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/aggregated_logging"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset"
routeclient "github.com/openshift/origin/pkg/route/generated/internalclientset"
securityclient "github.com/openshift/origin/pkg/security/generated/internalclientset"
Expand Down
4 changes: 2 additions & 2 deletions pkg/oc/admin/diagnostics/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

clientcmdapi "k8s.io/client-go/tools/clientcmd/api"

clientdiagnostics "github.com/openshift/origin/pkg/diagnostics/client"
"github.com/openshift/origin/pkg/diagnostics/types"
clientdiagnostics "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/client"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
"github.com/openshift/origin/pkg/oc/cli/config"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/oc/admin/diagnostics/diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/openshift/origin/pkg/cmd/flagtypes"
osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
"github.com/openshift/origin/pkg/cmd/util/variable"
"github.com/openshift/origin/pkg/diagnostics/log"
netutil "github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
netutil "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/options"
"github.com/openshift/origin/pkg/oc/cli/config"
)
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
kclientcmdapi "k8s.io/client-go/tools/clientcmd/api"

osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

// ConfigContext diagnostics (one per context) validate that the client config context is complete and has connectivity to the master.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
flag "github.com/spf13/pflag"
"k8s.io/client-go/tools/clientcmd"

"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/diagnostics/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/util"
"github.com/openshift/origin/pkg/oc/cli/config"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
"github.com/openshift/origin/pkg/cmd/util/variable"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"k8s.io/kubernetes/pkg/apis/rbac"

authapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
)

type fakeRoleBindingDiagnostic struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
kapi "k8s.io/kubernetes/pkg/api"
kapisext "k8s.io/kubernetes/pkg/apis/extensions"

"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
kapi "k8s.io/kubernetes/pkg/api"

deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
authapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
oauthorizationtypedclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset/typed/authorization/internalversion"
configapi "github.com/openshift/origin/pkg/cmd/server/api"
hostdiag "github.com/openshift/origin/pkg/diagnostics/host"
"github.com/openshift/origin/pkg/diagnostics/types"
oauthtypedclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
hostdiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/host"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
projecttypedclient "github.com/openshift/origin/pkg/project/generated/internalclientset/typed/project/internalversion"
routesapi "github.com/openshift/origin/pkg/route/apis/route"
routetypedclient "github.com/openshift/origin/pkg/route/generated/internalclientset/typed/route/internalversion"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package aggregated_logging

import (
"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
"testing"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
kapi "k8s.io/kubernetes/pkg/api"
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

"github.com/openshift/origin/pkg/diagnostics/types"
oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
oauthtypedclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
routetypedclient "github.com/openshift/origin/pkg/route/generated/internalclientset/typed/route/internalversion"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kapi "k8s.io/kubernetes/pkg/api"

"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
routesapi "github.com/openshift/origin/pkg/route/apis/route"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"testing"

"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"

securityapi "github.com/openshift/origin/pkg/security/apis/security"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kapi "k8s.io/kubernetes/pkg/api"

"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
)

type mockServiceAccountDiagnostic struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"testing"

"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kapi "k8s.io/kubernetes/pkg/api"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"bytes"

"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

// EtcdWriteVolume is a Diagnostic to check the writes occurring against etcd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/network"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const masterNotRunningAsANode = `Unable to find a node matching the cluster server IP.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

// MetricsApiProxy is a Diagnostic for diagnosing the API proxy and HPA/metrics.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"k8s.io/kubernetes/pkg/apis/authorization"
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

"github.com/openshift/origin/pkg/diagnostics/log"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/log"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"k8s.io/kubernetes/pkg/apis/authorization"
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

"github.com/openshift/origin/pkg/diagnostics/types"
osapi "github.com/openshift/origin/pkg/image/apis/image"
imagetypedclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

// ClusterRegistry is a Diagnostic to check that there is a working Docker registry.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
oauthorizationtypedclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset/typed/authorization/internalversion"
"github.com/openshift/origin/pkg/authorization/registry/util"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
policycmd "github.com/openshift/origin/pkg/oc/admin/policy"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
oauthorizationtypedclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset/typed/authorization/internalversion"
"github.com/openshift/origin/pkg/authorization/registry/util"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
policycmd "github.com/openshift/origin/pkg/oc/admin/policy"
rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"k8s.io/kubernetes/pkg/apis/authorization"
authorizationtypedclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion"

"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
routeapi "github.com/openshift/origin/pkg/route/apis/route"
"github.com/openshift/origin/pkg/route/apis/route/validation"
clientset "github.com/openshift/origin/pkg/route/generated/internalclientset"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
appstypedclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
"k8s.io/kubernetes/pkg/apis/authorization"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

hostdiag "github.com/openshift/origin/pkg/diagnostics/host"
"github.com/openshift/origin/pkg/diagnostics/types"
hostdiag "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/host"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
"github.com/openshift/origin/pkg/service/admission"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

configvalidation "github.com/openshift/origin/pkg/cmd/server/api/validation"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

// MasterConfigCheck is a Diagnostic to check that the master config file is valid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
configvalidation "github.com/openshift/origin/pkg/cmd/server/api/validation"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

// NodeConfigCheck is a Diagnostic to check that the node config file is valid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

configapi "github.com/openshift/origin/pkg/cmd/server/api"
configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

// this would be bad practice if there were ever a need to load more than one master config for diagnostics.
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
kclientcmd "k8s.io/client-go/tools/clientcmd"
kapi "k8s.io/kubernetes/pkg/api"

"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
kerrs "k8s.io/apimachinery/pkg/util/errors"
kapi "k8s.io/kubernetes/pkg/api"

"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
)

func (d *NetworkDiagnostic) CollectNetworkPodLogs() error {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/diagnostics/types"
networktypedclient "github.com/openshift/origin/pkg/network/generated/internalclientset/typed/network/internalversion"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
kclientcmd "k8s.io/client-go/tools/clientcmd"
kapi "k8s.io/kubernetes/pkg/api"

"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
diagutil "github.com/openshift/origin/pkg/diagnostics/util"
"github.com/openshift/origin/pkg/network"
networkapi "github.com/openshift/origin/pkg/network/apis/network"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
diagutil "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/util"
"github.com/openshift/origin/pkg/oc/cli/config"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

kexec "k8s.io/utils/exec"

"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
kcontainer "k8s.io/kubernetes/pkg/kubelet/container"
kexec "k8s.io/utils/exec"

"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
kcontainer "k8s.io/kubernetes/pkg/kubelet/container"
kexec "k8s.io/utils/exec"

"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/network"
networktypedclient "github.com/openshift/origin/pkg/network/generated/internalclientset/typed/network/internalversion"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
kcontainer "k8s.io/kubernetes/pkg/kubelet/container"
kexec "k8s.io/utils/exec"

"github.com/openshift/origin/pkg/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/diagnostics/types"
"github.com/openshift/origin/pkg/network"
networktypedclient "github.com/openshift/origin/pkg/network/generated/internalclientset/typed/network/internalversion"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/networkpod/util"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
)

const (
Expand Down
Loading

0 comments on commit 32e0704

Please sign in to comment.