Wire machine actuator to use scope clients

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
kubernetes-sigs · Jan 26, 2019 · e8be0e9 · e8be0e9
1 parent 267a7c0
commit e8be0e9
Show file tree

Hide file tree

Showing 16 changed files with 867 additions and 227 deletions.
diff --git a/pkg/apis/azureprovider/v1alpha1/azureclusterproviderconfig_types.go b/pkg/apis/azureprovider/v1alpha1/azureclusterproviderconfig_types.go
@@ -30,6 +30,12 @@ type AzureClusterProviderSpec struct {
 
 	ResourceGroup string `json:"resourceGroup"`
 	Location      string `json:"location"`
+
+	// CACertificate is a PEM encoded CA Certificate for the control plane nodes.
+	CACertificate []byte `json:"caCertificate,omitempty"`
+
+	// CAPrivateKey is a PEM encoded PKCS1 CA PrivateKey for the control plane nodes.
+	CAPrivateKey []byte `json:"caKey,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/azureprovider/v1alpha1/types.go b/pkg/apis/azureprovider/v1alpha1/types.go
@@ -81,8 +81,11 @@ type Network struct {
 	// Subnets includes all the subnets defined inside the Vnet.
 	Subnets Subnets `json:"subnets,omitempty"`
 
-	// APIServerLB is the Kubernetes api server load balancer.
+	// APIServerLB is the Kubernetes API server load balancer.
 	APIServerLB LoadBalancer `json:"apiServerLb,omitempty"`
+
+	// APIServerIP is the Kubernetes API server public IP address.
+	APIServerIP PublicIPAddress `json:"apiServerIp,omitempty"`
 }
 
 // Vnet defines an Azure Virtual Network.
@@ -109,6 +112,12 @@ type Subnet struct {
 	RouteTableID *string `json:"routeTableId"`
 }
 
+// PublicIPAddress defines an Azure public IP address.
+type PublicIPAddress struct {
+	ID        string `json:"id"`
+	IPAddress string `json:"ipAddress"`
+}
+
 /*
 // TODO
 // String returns a string representation of the subnet.

diff --git a/pkg/apis/azureprovider/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/azureprovider/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/cloud/azure/actuators/clients.go b/pkg/cloud/azure/actuators/clients.go
@@ -21,7 +21,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-11-01/network"
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources"
 	"github.com/Azure/go-autorest/autorest"
-	azureconfigv1 "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1alpha1"
+	providerv1 "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 )
 
@@ -93,8 +93,8 @@ type AzureResourcesClient interface {
 	WaitForGroupsDeleteFuture(future resources.GroupsDeleteFuture) error
 
 	// Deployment Operations
-	CreateOrUpdateDeployment(machine *clusterv1.Machine, clusterConfig *azureconfigv1.AzureClusterProviderSpec, machineConfig *azureconfigv1.AzureMachineProviderSpec) (*resources.DeploymentsCreateOrUpdateFuture, error)
+	CreateOrUpdateDeployment(machine *clusterv1.Machine, clusterConfig *providerv1.AzureClusterProviderSpec, machineConfig *providerv1.AzureMachineProviderSpec) (*resources.DeploymentsCreateOrUpdateFuture, error)
 	GetDeploymentResult(future resources.DeploymentsCreateOrUpdateFuture) (de resources.DeploymentExtended, err error)
-	ValidateDeployment(machine *clusterv1.Machine, clusterConfig *azureconfigv1.AzureClusterProviderSpec, machineConfig *azureconfigv1.AzureMachineProviderSpec) error
+	ValidateDeployment(machine *clusterv1.Machine, clusterConfig *providerv1.AzureClusterProviderSpec, machineConfig *providerv1.AzureMachineProviderSpec) error
 	WaitForDeploymentsCreateOrUpdateFuture(future resources.DeploymentsCreateOrUpdateFuture) error
 }
diff --git a/pkg/cloud/azure/actuators/cluster/actuator.go b/pkg/cloud/azure/actuators/cluster/actuator.go
@@ -19,7 +19,7 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	azureconfigv1 "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1alpha1"
+	providerv1 "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1alpha1"
 	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 	client "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1"
@@ -112,8 +112,8 @@ func (azure *AzureClusterClient) Delete(cluster *clusterv1.Cluster) error {
 	return nil
 }
 
-func clusterProviderFromProviderSpec(providerSpec clusterv1.ProviderSpec) (*azureconfigv1.AzureClusterProviderSpec, error) {
-	var config azureconfigv1.AzureClusterProviderSpec
+func clusterProviderFromProviderSpec(providerSpec clusterv1.ProviderSpec) (*providerv1.AzureClusterProviderSpec, error) {
+	var config providerv1.AzureClusterProviderSpec
 	if err := yaml.Unmarshal(providerSpec.Value.Raw, &config); err != nil {
 		return nil, err
 	}

diff --git a/pkg/cloud/azure/actuators/cluster/actuator_test.go b/pkg/cloud/azure/actuators/cluster/actuator_test.go
@@ -18,7 +18,7 @@ import (
 
 	"github.com/imdario/mergo"
 
-	azureconfigv1 "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1alpha1"
+	providerv1 "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1alpha1"
 	"sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 
@@ -364,14 +364,14 @@ func TestClusterProviderFromProviderSpecParsingError(t *testing.T) {
 	}
 }
 
-func newClusterProviderSpec() azureconfigv1.AzureClusterProviderSpec {
-	return azureconfigv1.AzureClusterProviderSpec{
+func newClusterProviderSpec() providerv1.AzureClusterProviderSpec {
+	return providerv1.AzureClusterProviderSpec{
 		ResourceGroup: "resource-group-test",
 		Location:      "westus2",
 	}
 }
 
-func providerSpecFromCluster(in *azureconfigv1.AzureClusterProviderSpec) (*clusterv1.ProviderSpec, error) {
+func providerSpecFromCluster(in *providerv1.AzureClusterProviderSpec) (*clusterv1.ProviderSpec, error) {
 	bytes, err := yaml.Marshal(in)
 	if err != nil {
 		return nil, err