move cloud library into pkg

openshift · Oct 16, 2018 · 32adb86 · 32adb86
1 parent 5a149c6
commit 32adb86
Show file tree

Hide file tree

Showing 28 changed files with 33 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -51,14 +51,14 @@ test: generate-mocks unit
 gendeepcopy:
 	go build -o $$GOPATH/bin/deepcopy-gen sigs.k8s.io/cluster-api-provider-aws/vendor/k8s.io/code-generator/cmd/deepcopy-gen
 	deepcopy-gen \
-	  -i ./cloud/aws/providerconfig,./cloud/aws/providerconfig/v1alpha1 \
+	  -i ./pkg/cloud/aws/providerconfig,./pkg/cloud/aws/providerconfig/v1alpha1 \
 	  -O zz_generated.deepcopy \
 	  -h boilerplate.go.txt
 
 .PHONY: generate-mocks
 generate-mocks:
 	go build -o $$GOPATH/bin/mockgen sigs.k8s.io/cluster-api-provider-aws/vendor/github.com/golang/mock/mockgen/
-	go generate ./cloud/aws/client/
+	go generate ./pkg/cloud/aws/client/
 
 bin:
 	@mkdir $@
@@ -85,7 +85,7 @@ check: fmt vet lint test ## Check your code
 
 .PHONY: unit
 unit: # Run unit test
-	$(DOCKER_CMD) go test -race -cover ./cmd/... ./cloud/...
+	$(DOCKER_CMD) go test -race -cover ./cmd/... ./pkg/cloud/...
 
 .PHONY: integration
 integration: ## Run integration test

diff --git a/cmd/aws-actuator/main.go b/cmd/aws-actuator/main.go
@@ -35,7 +35,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 
 	"github.com/ghodss/yaml"
@@ -45,7 +45,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
 	kubernetesfake "k8s.io/client-go/kubernetes/fake"
-	machineactuator "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/actuators/machine"
+	machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/actuators/machine"
 	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
 
 	"text/template"

diff --git a/cmd/cluster-controller/main.go b/cmd/cluster-controller/main.go
@@ -24,8 +24,8 @@ import (
 	"k8s.io/apiserver/pkg/util/logs"
 	"sigs.k8s.io/cluster-api/pkg/controller/config"
 
-	"sigs.k8s.io/cluster-api-provider-aws/cloud/aws/controllers/cluster"
-	"sigs.k8s.io/cluster-api-provider-aws/cloud/aws/controllers/cluster/options"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/controllers/cluster"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/controllers/cluster/options"
 )
 
 func init() {

diff --git a/cmd/machine-controller/main.go b/cmd/machine-controller/main.go
@@ -26,8 +26,8 @@ import (
 	"github.com/spf13/pflag"
 	"k8s.io/apiserver/pkg/util/logs"
 	"k8s.io/client-go/kubernetes"
-	machineactuator "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/actuators/machine"
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
+	machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/actuators/machine"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
 	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
 	"sigs.k8s.io/cluster-api/pkg/controller/config"
 	"sigs.k8s.io/cluster-api/pkg/controller/machine"

diff --git a/cloud/aws/actuators/cluster/actuator.go → pkg/cloud/aws/actuators/cluster/actuator.go b/cloud/aws/actuators/cluster/actuator.go → pkg/cloud/aws/actuators/cluster/actuator.go
diff --git a/cloud/aws/actuators/machine/actuator.go → pkg/cloud/aws/actuators/machine/actuator.go b/cloud/aws/actuators/machine/actuator.go → pkg/cloud/aws/actuators/machine/actuator.go
@@ -29,16 +29,16 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 
-	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig/v1alpha1"
+	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 	clusterclient "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
 	clustererror "sigs.k8s.io/cluster-api/pkg/controller/error"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
-	clustoplog "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/logging"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
+	clustoplog "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/logging"
 )
 
 const (

diff --git a/cloud/aws/actuators/machine/actuator_test.go → ...ud/aws/actuators/machine/actuator_test.go b/cloud/aws/actuators/machine/actuator_test.go → ...ud/aws/actuators/machine/actuator_test.go
@@ -24,17 +24,16 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
-	mockaws "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client/mock"
-	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig/v1alpha1"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
+	mockaws "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client/mock"
+	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 
 	"sigs.k8s.io/cluster-api-provider-aws/test/utils"
 )
 
 const (
 	controllerLogName = "awsMachine"
-	defaultLogLevel   = "info"
 
 	defaultNamespace         = "default"
 	defaultAvailabilityZone  = "us-east-1a"

diff --git a/cloud/aws/actuators/machine/utils.go → pkg/cloud/aws/actuators/machine/utils.go b/cloud/aws/actuators/machine/utils.go → pkg/cloud/aws/actuators/machine/utils.go
@@ -28,8 +28,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	jsonserializer "k8s.io/apimachinery/pkg/runtime/serializer/json"
 
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
-	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig/v1alpha1"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
+	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 
 	"github.com/aws/aws-sdk-go/aws"

diff --git a/cloud/aws/client/client.go → pkg/cloud/aws/client/client.go b/cloud/aws/client/client.go → pkg/cloud/aws/client/client.go
diff --git a/cloud/aws/client/fake/fake.go → pkg/cloud/aws/client/fake/fake.go b/cloud/aws/client/fake/fake.go → pkg/cloud/aws/client/fake/fake.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/elb"
 	"k8s.io/client-go/kubernetes"
-	"sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
 )
 
 type awsClient struct {

diff --git a/cloud/aws/client/mock/client_generated.go → ...cloud/aws/client/mock/client_generated.go b/cloud/aws/client/mock/client_generated.go → ...cloud/aws/client/mock/client_generated.go
diff --git a/cloud/aws/controllers/cluster/controller.go → ...oud/aws/controllers/cluster/controller.go b/cloud/aws/controllers/cluster/controller.go → ...oud/aws/controllers/cluster/controller.go
@@ -37,8 +37,8 @@ import (
 	"sigs.k8s.io/cluster-api/pkg/controller/config"
 	"sigs.k8s.io/cluster-api/pkg/controller/sharedinformers"
 
-	clusteractuator "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/actuators/cluster"
-	"sigs.k8s.io/cluster-api-provider-aws/cloud/aws/controllers/cluster/options"
+	clusteractuator "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/actuators/cluster"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/controllers/cluster/options"
 )
 
 const (

diff --git a/...ws/controllers/cluster/options/options.go → ...ws/controllers/cluster/options/options.go b/...ws/controllers/cluster/options/options.go → ...ws/controllers/cluster/options/options.go
diff --git a/cloud/aws/controllers/machine/controller.go → ...oud/aws/controllers/machine/controller.go b/cloud/aws/controllers/machine/controller.go → ...oud/aws/controllers/machine/controller.go
@@ -37,11 +37,11 @@ import (
 	machinecontroller "sigs.k8s.io/cluster-api/pkg/controller/machine"
 	"sigs.k8s.io/cluster-api/pkg/controller/sharedinformers"
 
-	machineactuator "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/actuators/machine"
-	"sigs.k8s.io/cluster-api-provider-aws/cloud/aws/controllers/machine/options"
+	machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/actuators/machine"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/controllers/machine/options"
 
 	log "github.com/sirupsen/logrus"
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
 )
 
 const (

diff --git a/...ws/controllers/machine/options/options.go → ...ws/controllers/machine/options/options.go b/...ws/controllers/machine/options/options.go → ...ws/controllers/machine/options/options.go
diff --git a/cloud/aws/logging/logging.go → pkg/cloud/aws/logging/logging.go b/cloud/aws/logging/logging.go → pkg/cloud/aws/logging/logging.go
diff --git a/cloud/aws/providerconfig/doc.go → pkg/cloud/aws/providerconfig/doc.go b/cloud/aws/providerconfig/doc.go → pkg/cloud/aws/providerconfig/doc.go
@@ -12,7 +12,7 @@
 // limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig
+// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
 

diff --git a/cloud/aws/providerconfig/register.go → pkg/cloud/aws/providerconfig/register.go b/cloud/aws/providerconfig/register.go → pkg/cloud/aws/providerconfig/register.go
diff --git a/cloud/aws/providerconfig/types.go → pkg/cloud/aws/providerconfig/types.go b/cloud/aws/providerconfig/types.go → pkg/cloud/aws/providerconfig/types.go
diff --git a/cloud/aws/providerconfig/v1alpha1/doc.go → pkg/cloud/aws/providerconfig/v1alpha1/doc.go b/cloud/aws/providerconfig/v1alpha1/doc.go → pkg/cloud/aws/providerconfig/v1alpha1/doc.go
@@ -12,7 +12,7 @@
 // limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig
+// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
 

diff --git a/...d/aws/providerconfig/v1alpha1/register.go → ...d/aws/providerconfig/v1alpha1/register.go b/...d/aws/providerconfig/v1alpha1/register.go → ...d/aws/providerconfig/v1alpha1/register.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 
-	"sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig"
 )
 
 // AWSProviderConfigCodec carries AWS provider configuration encoder/decoder

diff --git a/cloud/aws/providerconfig/v1alpha1/types.go → ...loud/aws/providerconfig/v1alpha1/types.go b/cloud/aws/providerconfig/v1alpha1/types.go → ...loud/aws/providerconfig/v1alpha1/types.go
diff --git a/...rconfig/v1alpha1/zz_generated.deepcopy.go → ...rconfig/v1alpha1/zz_generated.deepcopy.go b/...rconfig/v1alpha1/zz_generated.deepcopy.go → ...rconfig/v1alpha1/zz_generated.deepcopy.go
diff --git a/...s/providerconfig/zz_generated.deepcopy.go → ...s/providerconfig/zz_generated.deepcopy.go b/...s/providerconfig/zz_generated.deepcopy.go → ...s/providerconfig/zz_generated.deepcopy.go
diff --git a/test/integration/create_update_delete_test.go b/test/integration/create_update_delete_test.go
@@ -16,8 +16,8 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	machineactuator "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/actuators/machine"
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
+	machineactuator "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/actuators/machine"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 
 	"github.com/ghodss/yaml"

diff --git a/test/machines/awsclient.go b/test/machines/awsclient.go
@@ -3,8 +3,8 @@ package machines
 import (
 	"fmt"
 
-	machineutils "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/actuators/machine"
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
+	machineutils "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/actuators/machine"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
 	clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 )
 

diff --git a/test/machines/machines_test.go b/test/machines/machines_test.go
@@ -21,7 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
 )
 
 const (

diff --git a/test/utils/manifests.go b/test/utils/manifests.go
@@ -8,8 +8,8 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
-	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig/v1alpha1"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/client"
+	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig/v1alpha1"
 	clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 )