package utils => names

kubernetes-sigs · May 25, 2021 · f3088d8 · f3088d8
1 parent 76b25dd
commit f3088d8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go
@@ -46,8 +46,8 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
-	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils"
 	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names"
 )
 
 const (
@@ -162,7 +162,7 @@ func (s *Service) createInstance(eventObject runtime.Object, clusterName string,
 		}
 
 		if i.Trunk {
-			trunk, err := getOrCreateTrunk(eventObject, clusterName, i.Name, port.ID)
+			trunk, err := s.getOrCreateTrunk(eventObject, clusterName, i.Name, port.ID)
 			if err != nil {
 				return nil, err
 			}
@@ -396,7 +396,7 @@ func (s *Service) getOrCreatePort(eventObject runtime.Object, clusterName string
 		Name:           portName,
 		NetworkID:      net.ID,
 		SecurityGroups: securityGroups,
-		Description:    utils.GetDescription(clusterName),
+		Description:    names.GetDescription(clusterName),
 	}
 	if net.Subnet.ID != "" {
 		portCreateOpts.FixedIPs = []ports.IP{{SubnetID: net.Subnet.ID}}
@@ -411,7 +411,7 @@ func (s *Service) getOrCreatePort(eventObject runtime.Object, clusterName string
 	return port, nil
 }
 
-func getOrCreateTrunk(eventObject runtime.Object, clusterName, trunkName, portID string) (*trunks.Trunk, error) {
+func (s *Service) getOrCreateTrunk(eventObject runtime.Object, clusterName, trunkName, portID string) (*trunks.Trunk, error) {
 	allPages, err := trunks.List(s.networkClient, trunks.ListOpts{
 		Name:   trunkName,
 		PortID: portID,
@@ -431,7 +431,7 @@ func getOrCreateTrunk(eventObject runtime.Object, clusterName, trunkName, portID
 	trunkCreateOpts := trunks.CreateOpts{
 		Name:        trunkName,
 		PortID:      portID,
-		Description: utils.GetDescription(clusterName),
+		Description: names.GetDescription(clusterName),
 	}
 	trunk, err := trunks.Create(s.networkClient, trunkCreateOpts).Extract()
 	if err != nil {

diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go
@@ -31,7 +31,7 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
-	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names"
 )
 
 const (
@@ -53,7 +53,7 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 		lbCreateOpts := loadbalancers.CreateOpts{
 			Name:        loadBalancerName,
 			VipSubnetID: openStackCluster.Status.Network.Subnet.ID,
-			Description: utils.GetDescription(clusterName),
+			Description: names.GetDescription(clusterName),
 		}
 
 		lb, err = loadbalancers.Create(s.loadbalancerClient, lbCreateOpts).Extract()

diff --git a/pkg/cloud/services/networking/network.go b/pkg/cloud/services/networking/network.go
@@ -28,7 +28,7 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
-	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names"
 )
 
 type createOpts struct {
@@ -195,7 +195,7 @@ func (s *Service) ReconcileSubnet(openStackCluster *infrav1.OpenStackCluster, cl
 	var subnet *subnets.Subnet
 	if len(subnetList) == 0 {
 		var err error
-		subnet, err = createSubnet(openStackCluster, clusterName, subnetName)
+		subnet, err = s.createSubnet(openStackCluster, clusterName, subnetName)
 		if err != nil {
 			return err
 		}
@@ -213,14 +213,14 @@ func (s *Service) ReconcileSubnet(openStackCluster *infrav1.OpenStackCluster, cl
 	return nil
 }
 
-func createSubnet(openStackCluster *infrav1.OpenStackCluster, clusterName string, name string) (*subnets.Subnet, error) {
+func (s *Service) createSubnet(openStackCluster *infrav1.OpenStackCluster, clusterName string, name string) (*subnets.Subnet, error) {
 	opts := subnets.CreateOpts{
 		NetworkID:      openStackCluster.Status.Network.ID,
 		Name:           name,
 		IPVersion:      4,
 		CIDR:           openStackCluster.Spec.NodeCIDR,
 		DNSNameservers: openStackCluster.Spec.DNSNameservers,
-		Description:    utils.GetDescription(clusterName),
+		Description:    names.GetDescription(clusterName),
 	}
 	subnet, err := subnets.Create(s.client, opts).Extract()
 	if err != nil {

diff --git a/pkg/cloud/services/networking/router.go b/pkg/cloud/services/networking/router.go
@@ -26,8 +26,8 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
-	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils"
 	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names"
 )
 
 func (s *Service) ReconcileRouter(openStackCluster *infrav1.OpenStackCluster, clusterName string) error {
@@ -66,7 +66,7 @@ func (s *Service) ReconcileRouter(openStackCluster *infrav1.OpenStackCluster, cl
 	var router *routers.Router
 	if len(routerList) == 0 {
 		var err error
-		router, err = createRouter(openStackCluster, clusterName, routerName)
+		router, err = s.createRouter(openStackCluster, clusterName, routerName)
 		if err != nil {
 			return err
 		}
@@ -120,7 +120,7 @@ INTERFACE_LOOP:
 
 func (s *Service) createRouter(openStackCluster *infrav1.OpenStackCluster, clusterName, name string) (*routers.Router, error) {
 	opts := routers.CreateOpts{
-		Description: utils.GetDescription(clusterName),
+		Description: names.GetDescription(clusterName),
 		Name:        name,
 	}
 	// only set the GatewayInfo right now when no externalIPs

diff --git a/pkg/utils/utils.go → pkg/utils/names/names.go b/pkg/utils/utils.go → pkg/utils/names/names.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package utils
+package names
 
 import (
 	"fmt"