Merge pull request #871 from hidekazuna/use_logger_field

🏃 Refactor: use Service struct field more
kubernetes-sigs · May 25, 2021 · 5281717 · 5281717
2 parents 73f64b9 + c43f7c1
commit 5281717
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 157 deletions.
diff --git a/pkg/cloud/services/compute/bastion.go b/pkg/cloud/services/compute/bastion.go
@@ -33,7 +33,7 @@ func (s *Service) CreateBastion(openStackCluster *infrav1.OpenStackCluster, clus
 		RootVolume:    openStackCluster.Spec.Bastion.Instance.RootVolume,
 	}
 
-	securityGroups, err := getSecurityGroups(s, openStackCluster.Spec.Bastion.Instance.SecurityGroups)
+	securityGroups, err := s.getSecurityGroups(openStackCluster.Spec.Bastion.Instance.SecurityGroups)
 	if err != nil {
 		return nil, err
 	}
@@ -45,7 +45,7 @@ func (s *Service) CreateBastion(openStackCluster *infrav1.OpenStackCluster, clus
 	var nets []infrav1.Network
 	if len(openStackCluster.Spec.Bastion.Instance.Networks) > 0 {
 		var err error
-		nets, err = getServerNetworks(s.networkClient, openStackCluster.Spec.Bastion.Instance.Networks)
+		nets, err = s.getServerNetworks(openStackCluster.Spec.Bastion.Instance.Networks)
 		if err != nil {
 			return nil, err
 		}
@@ -59,7 +59,7 @@ func (s *Service) CreateBastion(openStackCluster *infrav1.OpenStackCluster, clus
 	}
 	input.Networks = &nets
 
-	out, err := createInstance(s, openStackCluster, clusterName, input)
+	out, err := s.createInstance(openStackCluster, clusterName, input)
 	if err != nil {
 		return nil, err
 	}