Merge from main

maxdrib · maxdrib · commit 8df26159aa4a · 2022-01-12T15:46:55.000-05:00
diff --git a/PROJECT b/PROJECT
@@ -2,7 +2,7 @@ domain: cluster.x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 projectName: cluster-api-provider-capc
-repo: github.com/aws/cluster-api-provider-cloudstack-staging
+repo: github.com/aws/cluster-api-provider-cloudstack
 resources:
 - api:
     crdVersion: v1
@@ -11,7 +11,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackCluster
-  path: github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3
+  path: github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3
   version: v1alpha3
   webhooks:
     defaulting: true
@@ -24,7 +24,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachine
-  path: github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3
+  path: github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3
   version: v1alpha3
   webhooks:
     defaulting: true
@@ -37,7 +37,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachineTemplate
-  path: github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3
+  path: github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3
   version: v1alpha3
   webhooks:
     defaulting: true
diff --git a/api/v1alpha3/cloudstackcluster_webhook.go b/api/v1alpha3/cloudstackcluster_webhook.go
@@ -18,7 +18,7 @@ package v1alpha3
 
 import (
 	"fmt"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/webhook_utilities"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/webhook_utilities"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
diff --git a/api/v1alpha3/cloudstackmachine_webhook.go b/api/v1alpha3/cloudstackmachine_webhook.go
@@ -18,7 +18,7 @@ package v1alpha3
 
 import (
 	"fmt"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/webhook_utilities"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/webhook_utilities"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
diff --git a/api/v1alpha3/cloudstackmachinetemplate_webhook.go b/api/v1alpha3/cloudstackmachinetemplate_webhook.go
@@ -18,7 +18,7 @@ package v1alpha3
 
 import (
 	"fmt"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/webhook_utilities"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/webhook_utilities"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
diff --git a/controllers/cloudstackcluster_controller.go b/controllers/cloudstackcluster_controller.go
@@ -37,8 +37,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 )
 
 // CloudStackClusterReconciler reconciles a CloudStackCluster object.
diff --git a/controllers/cloudstackcluster_controller_test.go b/controllers/cloudstackcluster_controller_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"time"
 
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/controllers/cloudstackmachine_controller.go b/controllers/cloudstackmachine_controller.go
@@ -40,8 +40,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 )
 
diff --git a/controllers/controllers_suite_test.go b/controllers/controllers_suite_test.go
@@ -41,9 +41,9 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	csReconcilers "github.com/aws/cluster-api-provider-cloudstack-staging/controllers"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/mocks"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	csReconcilers "github.com/aws/cluster-api-provider-cloudstack/controllers"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/mocks"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	//+kubebuilder:scaffold:imports
 )
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/aws/cluster-api-provider-cloudstack-staging
+module github.com/aws/cluster-api-provider-cloudstack
 
 go 1.16
 
diff --git a/main.go b/main.go
@@ -18,7 +18,7 @@ package main
 
 import (
 	"flag"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 	"os"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	"strings"
@@ -34,8 +34,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/controllers"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/aws/cluster-api-provider-cloudstack/controllers"
 	//+kubebuilder:scaffold:imports
 )
 
diff --git a/pkg/cloud/client.go b/pkg/cloud/client.go
@@ -20,13 +20,13 @@ import (
 	"strings"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
 	"github.com/pkg/errors"
 	"gopkg.in/ini.v1"
 	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 )
 
-//go:generate mockgen -destination=../mocks/mock_client.go -package=mocks github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud Client
+//go:generate mockgen -destination=../mocks/mock_client.go -package=mocks github.com/aws/cluster-api-provider-cloudstack/pkg/cloud Client
 
 type Client interface {
 	GetOrCreateCluster(*infrav1.CloudStackCluster) error
diff --git a/pkg/cloud/cluster.go b/pkg/cloud/cluster.go
@@ -17,8 +17,8 @@ limitations under the License.
 package cloud
 
 import (
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	multierror "github.com/hashicorp/go-multierror"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/cloud/cluster_test.go b/pkg/cloud/cluster_test.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/pkg/cloud/helpers_test.go b/pkg/cloud/helpers_test.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/pkg/cloud/instance.go b/pkg/cloud/instance.go
@@ -25,8 +25,8 @@ import (
 	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	multierror "github.com/hashicorp/go-multierror"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/utils/pointer"
@@ -40,7 +40,7 @@ func setMachineDataFromVMMetrics(vmResponse *cloudstack.VirtualMachinesMetric, c
 	csMachine.Status.InstanceState = infrav1.InstanceState(vmResponse.State)
 }
 
-// Retrieves VM instance details by csMachine.Spec.InstanceID or csMachine.Name, and
+// ResolveVMInstanceDetails Retrieves VM instance details by csMachine.Spec.InstanceID or csMachine.Name, and
 // sets infrastructure machine spec and status if VM instance is found.
 func (c *client) ResolveVMInstanceDetails(csMachine *infrav1.CloudStackMachine) error {
 	// Attempt to fetch by ID.
@@ -121,7 +121,7 @@ func (c *client) ResolveTemplate(csCluster *infrav1.CloudStackCluster, csMachine
 	return templateID, nil
 }
 
-// CreateVMInstance will fetch or create a VM instance, and
+// GetOrCreateVMInstance CreateVMInstance will fetch or create a VM instance, and
 // sets the infrastructure machine spec and status accordingly.
 func (c *client) GetOrCreateVMInstance(
 	csMachine *infrav1.CloudStackMachine,
@@ -179,7 +179,7 @@ func (c *client) GetOrCreateVMInstance(
 
 }
 
-// Destroy a VM instane. Assumes machine has been fetched prior and has an instance ID.
+// DestroyVMInstance Destroy a VM instane. Assumes machine has been fetched prior and has an instance ID.
 func (c *client) DestroyVMInstance(csMachine *infrav1.CloudStackMachine) error {
 
 	p := c.cs.VirtualMachine.NewDestroyVirtualMachineParams(*csMachine.Spec.InstanceID)
diff --git a/pkg/cloud/instance_test.go b/pkg/cloud/instance_test.go
@@ -22,8 +22,8 @@ import (
 	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/pkg/cloud/network.go b/pkg/cloud/network.go
@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	multierror "github.com/hashicorp/go-multierror"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 )
 
@@ -102,7 +102,7 @@ func (c *client) ResolvePublicIPDetails(csCluster *infrav1.CloudStackCluster) (*
 	}
 }
 
-// Gets a PublicIP and associates it.
+// AssociatePublicIpAddress Gets a PublicIP and associates it.
 func (c *client) AssociatePublicIpAddress(csCluster *infrav1.CloudStackCluster) (retErr error) {
 	publicAddress, err := c.ResolvePublicIPDetails(csCluster)
 	if err != nil {
@@ -152,7 +152,7 @@ func (c *client) ResolveLoadBalancerRuleDetails(csCluster *infrav1.CloudStackClu
 	return errors.New("no load balancer rule found")
 }
 
-// Create a load balancer rule that can be assigned to instances.
+// GetOrCreateLoadBalancerRule Create a load balancer rule that can be assigned to instances.
 func (c *client) GetOrCreateLoadBalancerRule(csCluster *infrav1.CloudStackCluster) (retErr error) {
 	// Check if rule exists.
 	if err := c.ResolveLoadBalancerRuleDetails(csCluster); err == nil ||
diff --git a/pkg/cloud/network_test.go b/pkg/cloud/network_test.go
@@ -18,8 +18,8 @@ package cloud_test
 
 import (
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
-	"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
+	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"
+	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/pkg/mocks/mock_client.go b/pkg/mocks/mock_client.go

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ import (`
`37`	`37`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`38`	`38`	`"sigs.k8s.io/controller-runtime/pkg/source"`
`39`	`39`
`40`		`- infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"`
`41`		`- "github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"`
	`40`	`+ infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"`
	`41`	`+ "github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`// CloudStackClusterReconciler reconciles a CloudStackCluster object.`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ import (`
`40`	`40`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`41`	`41`	`"sigs.k8s.io/controller-runtime/pkg/source"`
`42`	`42`
`43`		`- infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"`
`44`		`- "github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"`
	`43`	`+ infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1alpha3"`
	`44`	`+ "github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"`
`45`	`45`	`capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"`
`46`	`46`	`)`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/aws/cluster-api-provider-cloudstack-staging`
	`1`	`+module github.com/aws/cluster-api-provider-cloudstack`
`2`	`2`
`3`	`3`	`go 1.16`
`4`	`4`