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

Simplify package layout #665

Merged
merged 1 commit into from Nov 20, 2019
Merged

Simplify package layout #665

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
8 changes: 4 additions & 4 deletions controllers/vspherecluster_controller.go
View file
Open in desktop
Expand Up @@ -32,10 +32,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/config"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/cloudprovider"
infrautilv1 "sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/util"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/config"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/cloudprovider"
infrautilv1 "sigs.k8s.io/cluster-api-provider-vsphere/pkg/util"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions controllers/vspheremachine_controller.go
View file
Open in desktop
Expand Up @@ -35,10 +35,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/source"

infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/config"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/config"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi"
)

// VSphereMachineReconciler reconciles a VSphereMachine object
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ import (

infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/controllers"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/config"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/config"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/record"
)

Expand Down
0 pkg/cloud/vsphere/config/config.go → pkg/config/config.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloud/vsphere/constants/constants.go → pkg/constants/constants.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloud/vsphere/context/cluster_context.go → pkg/context/cluster_context.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloud/vsphere/context/machine_context.go → pkg/context/machine_context.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloud/vsphere/context/session.go → pkg/context/session.go
View file
Open in desktop
File renamed without changes.
0 ...cloudprovider/cloud-controller-manager.go → ...cloudprovider/cloud-controller-manager.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...oud/vsphere/services/cloudprovider/csi.go → pkg/services/cloudprovider/csi.go
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2/cloudprovider"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
)

// NOTE: the contents of this file are derived from https://github.com/kubernetes-sigs/vsphere-csi-driver/tree/master/manifests/1.14
Expand Down
0 ...oud/vsphere/services/govmomi/constants.go → pkg/services/govmomi/constants.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/cloud/vsphere/services/govmomi/create.go → pkg/services/govmomi/create.go
View file
Open in desktop
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package govmomi

import (
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/esxi"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/vcenter"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/esxi"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/vcenter"
)

func createVM(ctx *context.MachineContext, bootstrapData []byte) error {
Expand Down
2 changes: 1 addition & 1 deletion ...d/vsphere/services/govmomi/create_test.go → pkg/services/govmomi/create_test.go
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ import (
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2"

infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion ...ud/vsphere/services/govmomi/esxi/clone.go → pkg/services/govmomi/esxi/clone.go
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ package esxi
import (
"github.com/pkg/errors"

"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
)

// Clone kicks off a clone operation on ESXi to create a new virtual machine.
Expand Down
0 .../vsphere/services/govmomi/extra/config.go → pkg/services/govmomi/extra/config.go
View file
Open in desktop
File renamed without changes.
0 ...cloud/vsphere/services/govmomi/net/net.go → pkg/services/govmomi/net/net.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../vsphere/services/govmomi/net/net_test.go → pkg/services/govmomi/net/net_test.go
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ package net_test
import (
"testing"

"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/net"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/net"
)

func TestErrOnLocalOnlyIPAddr(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions ...cloud/vsphere/services/govmomi/service.go → pkg/services/govmomi/service.go
View file
Open in desktop
Expand Up @@ -26,10 +26,10 @@ import (
"github.com/vmware/govmomi/vim25/types"

infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/extra"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/net"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/util"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/extra"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/net"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/util"
)

// VMService provdes API to interact with the VMs using govmomi
Expand Down
2 changes: 1 addition & 1 deletion ...ere/services/govmomi/template/template.go → pkg/services/govmomi/template/template.go
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
"github.com/vmware/govmomi/object"

"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
)

type tplContext interface {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloud/vsphere/services/govmomi/util.go → pkg/services/govmomi/util.go
View file
Open in desktop
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/vmware/govmomi/vim25/mo"
"github.com/vmware/govmomi/vim25/types"

"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/net"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/net"
)

func sanitizeIPAddrs(ctx *context.MachineContext, ipAddrs []string) []string {
Expand Down
6 changes: 3 additions & 3 deletions ...vsphere/services/govmomi/vcenter/clone.go → pkg/services/govmomi/vcenter/clone.go
View file
Open in desktop
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/vmware/govmomi/object"
"github.com/vmware/govmomi/vim25/types"

"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/extra"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/services/govmomi/template"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/extra"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/services/govmomi/template"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/vsphere/services/interfaces.go → pkg/services/interfaces.go
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ package services

import (
infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/context"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
)

// VirtualMachineService is a service for creating/updating/deleting virtual
Expand Down
0 pkg/cloud/vsphere/util/constants.go → pkg/util/constants.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloud/vsphere/util/kubeadm.go → pkg/util/kubeadm.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/cloud/vsphere/util/kubeadm_test.go → pkg/util/kubeadm_test.go
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"

infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/util"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/util"
)

func TestGetAPIEndpointForControlPlaneEndpoint(t *testing.T) {
Expand Down
0 pkg/cloud/vsphere/util/kubeclient.go → pkg/util/kubeclient.go
View file
Open in desktop
File renamed without changes.
0 pkg/cloud/vsphere/util/machines.go → pkg/util/machines.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/cloud/vsphere/util/machines_test.go → pkg/util/machines_test.go
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ import (
corev1 "k8s.io/api/core/v1"

"sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha2"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/cloud/vsphere/util"
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/util"
)

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