Skip to content

Commit

Permalink
Merge pull request #38 from soorena776/remove_redundant_directories
Browse files Browse the repository at this point in the history 
Remove redundant gcp folders
  • Loading branch information
@jbw976
jbw976 authored Sep 30, 2019
2 parents a83c882 + 327102b commit bb47431
Show file tree
Hide file tree
Showing 98 changed files with 116 additions and 116 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ NPROCS ?= 1
# to half the number of CPU cores.
GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))

GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/crossplane
GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/stack
GO_LDFLAGS += -X $(GO_PROJECT)/pkg/version.Version=$(VERSION)
GO_SUBDIRS += cmd pkg gcp
GO_SUBDIRS += cmd pkg apis
-include build/makelib/golang.mk

# ====================================================================================
Expand Down
0 gcp/apis/cache/cache.go → apis/cache/cache.go
View file
File renamed without changes.
0 ...alpha2/cloudmemorystore_instance_types.go → ...alpha2/cloudmemorystore_instance_types.go
View file
File renamed without changes.
0 ...2/cloudmemorystore_instance_types_test.go → ...2/cloudmemorystore_instance_types_test.go
View file
File renamed without changes.
0 gcp/apis/cache/v1alpha2/doc.go → apis/cache/v1alpha2/doc.go
View file
File renamed without changes.
0 gcp/apis/cache/v1alpha2/register.go → apis/cache/v1alpha2/register.go
View file
File renamed without changes.
0 ...s/cache/v1alpha2/zz_generated.deepcopy.go → apis/cache/v1alpha2/zz_generated.deepcopy.go
View file
File renamed without changes.
0 gcp/apis/compute/compute.go → apis/compute/compute.go
View file
File renamed without changes.
0 gcp/apis/compute/v1alpha2/doc.go → apis/compute/v1alpha2/doc.go
View file
File renamed without changes.
0 ...apis/compute/v1alpha2/gkecluster_types.go → apis/compute/v1alpha2/gkecluster_types.go
View file
File renamed without changes.
0 ...compute/v1alpha2/gkecluster_types_test.go → ...compute/v1alpha2/gkecluster_types_test.go
View file
File renamed without changes.
0 ...s/compute/v1alpha2/globaladdress_types.go → apis/compute/v1alpha2/globaladdress_types.go
View file
File renamed without changes.
0 gcp/apis/compute/v1alpha2/network_types.go → apis/compute/v1alpha2/network_types.go
View file
File renamed without changes.
0 ...is/compute/v1alpha2/network_types_test.go → apis/compute/v1alpha2/network_types_test.go
View file
File renamed without changes.
0 gcp/apis/compute/v1alpha2/register.go → apis/compute/v1alpha2/register.go
View file
File renamed without changes.
0 ...apis/compute/v1alpha2/subnetwork_types.go → apis/compute/v1alpha2/subnetwork_types.go
View file
File renamed without changes.
0 ...compute/v1alpha2/subnetwork_types_test.go → ...compute/v1alpha2/subnetwork_types_test.go
View file
File renamed without changes.
0 ...compute/v1alpha2/zz_generated.deepcopy.go → ...compute/v1alpha2/zz_generated.deepcopy.go
View file
File renamed without changes.
0 gcp/apis/database/database.go → apis/database/database.go
View file
File renamed without changes.
0 ...abase/v1alpha2/cloudsql_instance_types.go → ...abase/v1alpha2/cloudsql_instance_types.go
View file
File renamed without changes.
0 .../v1alpha2/cloudsql_instance_types_test.go → .../v1alpha2/cloudsql_instance_types_test.go
View file
File renamed without changes.
0 gcp/apis/database/v1alpha2/doc.go → apis/database/v1alpha2/doc.go
View file
File renamed without changes.
0 gcp/apis/database/v1alpha2/register.go → apis/database/v1alpha2/register.go
View file
File renamed without changes.
0 ...atabase/v1alpha2/zz_generated.deepcopy.go → ...atabase/v1alpha2/zz_generated.deepcopy.go
View file
File renamed without changes.
14 changes: 7 additions & 7 deletions gcp/apis/gcp.go → apis/gcp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ limitations under the License.
*/

// Generate deepcopy for apis
//go:generate go run ../../vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=../../hack/boilerplate.go.txt paths=./...
//go:generate go run ../vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=../hack/boilerplate.go.txt paths=./...

// Package apis contains Kubernetes API for GCP cloud provider.
package apis

import (
"k8s.io/apimachinery/pkg/runtime"

cachev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
databasev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2"
servicenetworkingv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2"
storagev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2"
cachev1alpha2 "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
databasev1alpha2 "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2"
servicenetworkingv1alpha2 "github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2"
storagev1alpha2 "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2"
)

func init() {
Expand Down
10 changes: 5 additions & 5 deletions gcp/apis/gcp_test.go → apis/gcp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ package apis
import (
"testing"

cachev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
databasev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2"
storagev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2"
cachev1alpha2 "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
databasev1alpha2 "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2"
storagev1alpha2 "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2"

"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
0 ...is/servicenetworking/servicenetworking.go → apis/servicenetworking/servicenetworking.go
View file
File renamed without changes.
0 ...cenetworking/v1alpha2/connection_types.go → ...cenetworking/v1alpha2/connection_types.go
View file
File renamed without changes.
0 gcp/apis/servicenetworking/v1alpha2/doc.go → apis/servicenetworking/v1alpha2/doc.go
View file
File renamed without changes.
0 ...is/servicenetworking/v1alpha2/register.go → apis/servicenetworking/v1alpha2/register.go
View file
File renamed without changes.
0 ...working/v1alpha2/zz_generated.deepcopy.go → ...working/v1alpha2/zz_generated.deepcopy.go
View file
File renamed without changes.
0 gcp/apis/storage/storage.go → apis/storage/storage.go
View file
File renamed without changes.
0 gcp/apis/storage/v1alpha2/doc.go → apis/storage/v1alpha2/doc.go
View file
File renamed without changes.
0 gcp/apis/storage/v1alpha2/register.go → apis/storage/v1alpha2/register.go
View file
File renamed without changes.
0 gcp/apis/storage/v1alpha2/types.go → apis/storage/v1alpha2/types.go
View file
File renamed without changes.
0 gcp/apis/storage/v1alpha2/types_test.go → apis/storage/v1alpha2/types_test.go
View file
File renamed without changes.
0 ...storage/v1alpha2/zz_generated.deepcopy.go → ...storage/v1alpha2/zz_generated.deepcopy.go
View file
File renamed without changes.
0 gcp/apis/v1alpha2/doc.go → apis/v1alpha2/doc.go
View file
File renamed without changes.
0 gcp/apis/v1alpha2/register.go → apis/v1alpha2/register.go
View file
File renamed without changes.
0 gcp/apis/v1alpha2/types.go → apis/v1alpha2/types.go
View file
File renamed without changes.
0 gcp/apis/v1alpha2/types_test.go → apis/v1alpha2/types_test.go
View file
File renamed without changes.
0 gcp/apis/v1alpha2/zz_generated.deepcopy.go → apis/v1alpha2/zz_generated.deepcopy.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions cluster/images/stack-gcp/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ RUN apk --no-cache add ca-certificates bash
ARG ARCH
ARG TINI_VERSION

ADD crossplane /usr/local/bin/
ADD stack /usr/local/bin/crossplane-gcp-stack

COPY stack-package /

EXPOSE 8080
ENTRYPOINT ["crossplane"]
ENTRYPOINT ["crossplane-gcp-stack"]
2 changes: 1 addition & 1 deletion cluster/images/stack-gcp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include ../../../build/makelib/image.mk
img.build:
@$(INFO) docker build $(IMAGE)
@cp Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL)
@cp $(OUTPUT_DIR)/bin/$(OS)_$(ARCH)/crossplane $(IMAGE_TEMP_DIR) || $(FAIL)
@cp $(OUTPUT_DIR)/bin/$(OS)_$(ARCH)/stack $(IMAGE_TEMP_DIR) || $(FAIL)
@cp -R ../../../$(STACK_PACKAGE) $(IMAGE_TEMP_DIR) || $(FAIL)
@cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL)
@docker build $(BUILD_ARGS) \
Expand Down
12 changes: 6 additions & 6 deletions cmd/crossplane/main.go → cmd/stack/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
runtimelog "sigs.k8s.io/controller-runtime/pkg/runtime/log"
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"

"github.com/crossplaneio/crossplane-runtime/pkg/logging"
"github.com/crossplaneio/crossplane/apis"
"github.com/crossplaneio/stack-gcp/apis"
"github.com/crossplaneio/stack-gcp/pkg/controller"

gcpapis "github.com/crossplaneio/stack-gcp/gcp/apis"
"github.com/crossplaneio/stack-gcp/pkg/controller/gcp"
"github.com/crossplaneio/crossplane-runtime/pkg/logging"
crossplaneapis "github.com/crossplaneio/crossplane/apis"
)

func main() {
Expand Down Expand Up @@ -105,7 +105,7 @@ func main() {
}

func controllerSetupWithManager(mgr manager.Manager) error {
if err := (&gcp.Controllers{}).SetupWithManager(mgr); err != nil {
if err := (&controller.Controllers{}).SetupWithManager(mgr); err != nil {
return err
}

Expand All @@ -118,7 +118,7 @@ func addToScheme(scheme *runtime.Scheme) error {
return err
}

if err := gcpapis.AddToScheme(scheme); err != nil {
if err := crossplaneapis.AddToScheme(scheme); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion .../gcp/cloudmemorystore/cloudmemorystore.go → ...ents/cloudmemorystore/cloudmemorystore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
)

// NamePrefix is the prefix for all created CloudMemorystore instances.
Expand Down
2 changes: 1 addition & 1 deletion ...cloudmemorystore/cloudmemorystore_test.go → ...cloudmemorystore/cloudmemorystore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/google/go-cmp/cmp"

"github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...clients/gcp/cloudmemorystore/fake/fake.go → pkg/clients/cloudmemorystore/fake/fake.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
gax "github.com/googleapis/gax-go"
redisv1pb "google.golang.org/genproto/googleapis/cloud/redis/v1"

"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore"
"github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore"
)

var _ cloudmemorystore.Client = &MockClient{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gcp/cloudsql/fake/instance.go → pkg/clients/cloudsql/fake/instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

sqladmin "google.golang.org/api/sqladmin/v1beta4"

"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql"
"github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql"
)

// MockInstanceClient for testing purposes
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gcp/cloudsql/fake/user.go → pkg/clients/cloudsql/fake/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package fake
import (
"context"

"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql"
"github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql"

sqladmin "google.golang.org/api/sqladmin/v1beta4"
)
Expand Down
0 pkg/clients/gcp/cloudsql/instance.go → pkg/clients/cloudsql/instance.go
View file
File renamed without changes.
0 pkg/clients/gcp/cloudsql/user.go → pkg/clients/cloudsql/user.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/clients/gcp/connection/connection.go → pkg/clients/connection/connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"

"github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2"
)

// VPC Network peering states.
Expand Down
2 changes: 1 addition & 1 deletion ...clients/gcp/connection/connection_test.go → pkg/clients/connection/connection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"
"github.com/crossplaneio/crossplane-runtime/pkg/test"

"github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2"
)

func TestFromParameters(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gcp/fake/fake.go → pkg/clients/fake/fake.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package fake
import (
"google.golang.org/api/container/v1"

computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

// GKEClient for mocking.
Expand Down
0 pkg/clients/gcp/gcp.go → pkg/clients/gcp.go
View file
File renamed without changes.
0 pkg/clients/gcp/gcp_test.go → pkg/clients/gcp_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/clients/gcp/gke/gke.go → pkg/clients/gke/gke.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"google.golang.org/api/container/v1"
"google.golang.org/api/option"

computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp"
computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
gcp "github.com/crossplaneio/stack-gcp/pkg/clients"
)

const (
Expand Down
0 pkg/clients/gcp/gke/gke_test.go → pkg/clients/gke/gke_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...lients/gcp/globaladdress/globaladdress.go → pkg/clients/globaladdress/globaladdress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
gcp "github.com/crossplaneio/stack-gcp/pkg/clients"
)

// Known Address statuses.
Expand Down
2 changes: 1 addition & 1 deletion ...s/gcp/globaladdress/globaladdress_test.go → ...ients/globaladdress/globaladdress_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"
"github.com/crossplaneio/crossplane-runtime/pkg/test"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

func TestFromParameters(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...ients/gcp/integration/integration_test.go → pkg/clients/integration/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

. "github.com/onsi/gomega"

. "github.com/crossplaneio/stack-gcp/pkg/clients/gcp"
. "github.com/crossplaneio/stack-gcp/pkg/clients"
)

func TestProject(t *testing.T) {
Expand Down
0 ...ts/gcp/integration/integration_testing.go → ...lients/integration/integration_testing.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/clients/gcp/network/network.go → pkg/clients/network/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package network
import (
googlecompute "google.golang.org/api/compute/v1"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

// GenerateNetwork takes a *NetworkParameters and returns *googlecompute.Network.
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gcp/network/network_test.go → pkg/clients/network/network_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/google/go-cmp/cmp"
"google.golang.org/api/compute/v1"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

const (
Expand Down
0 pkg/clients/gcp/storage/bucket.go → pkg/clients/storage/bucket.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/clients/gcp/storage/fake/fake.go → pkg/clients/storage/fake/fake.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"cloud.google.com/go/storage"

gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/storage"
gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/storage"
)

// MockBucketClient Client interface implementation
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gcp/subnetwork/subnetwork.go → pkg/clients/subnetwork/subnetwork.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package subnetwork
import (
"google.golang.org/api/compute/v1"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

// GenerateSubnetwork creates a *googlecompute.Subnetwork object using SubnetworkParameters.
Expand Down
2 changes: 1 addition & 1 deletion ...clients/gcp/subnetwork/subnetwork_test.go → pkg/clients/subnetwork/subnetwork_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"google.golang.org/api/compute/v1"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/gcp/cache/claim.go → pkg/controller/cache/claim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/resource"
cachev1alpha1 "github.com/crossplaneio/crossplane/apis/cache/v1alpha1"

"github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
)

// CloudMemorystoreInstanceClaimController is responsible for adding the Cloud Memorystore
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/gcp/cache/claim_test.go → pkg/controller/cache/claim_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/test"
cachev1alpha1 "github.com/crossplaneio/crossplane/apis/cache/v1alpha1"

"github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
)

var _ resource.ManagedConfigurator = resource.ManagedConfiguratorFn(ConfigureCloudMemorystoreInstance)
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/gcp/cache/managed.go → pkg/controller/cache/managed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/meta"
"github.com/crossplaneio/crossplane-runtime/pkg/resource"

"github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore"
"github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore"
)

// Error strings.
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/gcp/cache/managed_test.go → pkg/controller/cache/managed_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/resource"
"github.com/crossplaneio/crossplane-runtime/pkg/test"

"github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore/fake"
"github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore"
"github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore/fake"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/gcp/compute/claim.go → pkg/controller/compute/claim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/resource"
computev1alpha1 "github.com/crossplaneio/crossplane/apis/compute/v1alpha1"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

// GKEClusterClaimController is responsible for adding the GKECluster
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/gcp/compute/claim_test.go → pkg/controller/compute/claim_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/test"
computev1alpha1 "github.com/crossplaneio/crossplane/apis/compute/v1alpha1"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
)

var _ resource.ManagedConfigurator = resource.ManagedConfiguratorFn(ConfigureGKECluster)
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/gcp/compute/gke.go → pkg/controller/compute/gke.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/resource"
"github.com/crossplaneio/crossplane-runtime/pkg/util"

gcpcomputev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/gke"
gcpcomputev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2"
gcp "github.com/crossplaneio/stack-gcp/pkg/clients"
"github.com/crossplaneio/stack-gcp/pkg/clients/gke"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/gcp/compute/gke_test.go → pkg/controller/compute/gke_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"testing"

"github.com/crossplaneio/stack-gcp/gcp/apis"
"github.com/crossplaneio/stack-gcp/apis"

"github.com/google/go-cmp/cmp"
. "github.com/onsi/gomega"
Expand All @@ -39,9 +39,9 @@ import (
runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"
"github.com/crossplaneio/crossplane-runtime/pkg/test"

. "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/fake"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/gke"
. "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/fake"
"github.com/crossplaneio/stack-gcp/pkg/clients/gke"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/gcp/compute/globaladdress.go → pkg/controller/compute/globaladdress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/meta"
"github.com/crossplaneio/crossplane-runtime/pkg/resource"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp"
"github.com/crossplaneio/stack-gcp/pkg/clients/gcp/globaladdress"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2"
gcp "github.com/crossplaneio/stack-gcp/pkg/clients"
"github.com/crossplaneio/stack-gcp/pkg/clients/globaladdress"
)

// Error strings.
Expand Down
4 changes: 2 additions & 2 deletions ...troller/gcp/compute/globaladdress_test.go → pkg/controller/compute/globaladdress_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"github.com/crossplaneio/crossplane-runtime/pkg/resource"
"github.com/crossplaneio/crossplane-runtime/pkg/test"

"github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2"
"github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2"
gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2"
)

var (
Expand Down
Loading

0 comments on commit bb47431

Please sign in to comment.