Update vendor, bazel files, tests

kubernetes-sigs · Apr 18, 2019 · d1eb077 · d1eb077
1 parent 3927603
commit d1eb077
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 30 deletions.
diff --git a/config/crds/azureprovider_v1alpha1_azureclusterproviderspec.yaml b/config/crds/azureprovider_v1alpha1_azureclusterproviderspec.yaml
@@ -489,9 +489,17 @@ spec:
           - cert
           - key
           type: object
+        sshPrivateKey:
+          description: SSHPrivateKey is the ssh private key for the bastion host
+          type: string
+        sshPublicKey:
+          description: SSHPublicKey is the ssh public key for the bastion host
+          type: string
       required:
       - resourceGroup
       - location
+      - sshPublicKey
+      - sshPrivateKey
   version: v1alpha1
 status:
   acceptedNames:

diff --git a/config/crds/azureprovider_v1alpha1_azureclusterproviderstatus.yaml b/config/crds/azureprovider_v1alpha1_azureclusterproviderstatus.yaml
@@ -113,6 +113,18 @@ spec:
                 sku:
                   type: string
               type: object
+            bastionIP:
+              description: BastionIP is the public ip address of the bastion host
+              properties:
+                dnsName:
+                  type: string
+                id:
+                  type: string
+                ipAddress:
+                  type: string
+                name:
+                  type: string
+              type: object
             securityGroups:
               description: SecurityGroups is a map from the role/kind of the security
                 group to its unique name, if any.

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/cluster/BUILD.bazel b/pkg/cloud/azure/actuators/cluster/BUILD.bazel
@@ -9,16 +9,19 @@ go_library(
     importpath = "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/cluster",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/apis/azureprovider/v1alpha1:go_default_library",
         "//pkg/cloud/azure:go_default_library",
         "//pkg/cloud/azure/actuators:go_default_library",
         "//pkg/cloud/azure/services/certificates:go_default_library",
         "//pkg/cloud/azure/services/groups:go_default_library",
         "//pkg/cloud/azure/services/internalloadbalancers:go_default_library",
+        "//pkg/cloud/azure/services/networkinterfaces:go_default_library",
         "//pkg/cloud/azure/services/publicips:go_default_library",
         "//pkg/cloud/azure/services/publicloadbalancers:go_default_library",
         "//pkg/cloud/azure/services/routetables:go_default_library",
         "//pkg/cloud/azure/services/securitygroups:go_default_library",
         "//pkg/cloud/azure/services/subnets:go_default_library",
+        "//pkg/cloud/azure/services/virtualmachines:go_default_library",
         "//pkg/cloud/azure/services/virtualnetworks:go_default_library",
         "//pkg/deployer:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",

diff --git a/pkg/cloud/azure/actuators/cluster/actuator_test.go b/pkg/cloud/azure/actuators/cluster/actuator_test.go
@@ -45,16 +45,18 @@ func TestReconcileSuccess(t *testing.T) {
 	fakeNotFoundSvc := &azure.FakeNotFoundService{}
 
 	fakeReconciler := &Reconciler{
-		scope:            newFakeScope(),
-		groupsSvc:        fakeSuccessSvc,
-		certificatesSvc:  fakeSuccessSvc,
-		vnetSvc:          fakeSuccessSvc,
-		securityGroupSvc: fakeSuccessSvc,
-		routeTableSvc:    fakeSuccessSvc,
-		subnetsSvc:       fakeSuccessSvc,
-		internalLBSvc:    fakeSuccessSvc,
-		publicIPSvc:      fakeSuccessSvc,
-		publicLBSvc:      fakeSuccessSvc,
+		scope:                newFakeScope(),
+		certificatesSvc:      fakeSuccessSvc,
+		groupsSvc:            fakeSuccessSvc,
+		vnetSvc:              fakeSuccessSvc,
+		securityGroupSvc:     fakeSuccessSvc,
+		routeTableSvc:        fakeSuccessSvc,
+		subnetsSvc:           fakeSuccessSvc,
+		internalLBSvc:        fakeSuccessSvc,
+		publicIPSvc:          fakeSuccessSvc,
+		publicLBSvc:          fakeSuccessSvc,
+		virtualMachineSvc:    fakeSuccessSvc,
+		networkInterfacesSvc: fakeSuccessSvc,
 	}
 
 	if err := fakeReconciler.Reconcile(); err != nil {
@@ -102,16 +104,18 @@ func TestPublicIPNonEmpty(t *testing.T) {
 	fakeSuccessSvc := &azure.FakeSuccessService{}
 
 	fakeReconciler := &Reconciler{
-		scope:            newFakeScope(),
-		groupsSvc:        fakeSuccessSvc,
-		certificatesSvc:  fakeSuccessSvc,
-		vnetSvc:          fakeSuccessSvc,
-		securityGroupSvc: fakeSuccessSvc,
-		routeTableSvc:    fakeSuccessSvc,
-		subnetsSvc:       fakeSuccessSvc,
-		internalLBSvc:    fakeSuccessSvc,
-		publicIPSvc:      fakeSuccessSvc,
-		publicLBSvc:      fakeSuccessSvc,
+		scope:                newFakeScope(),
+		certificatesSvc:      fakeSuccessSvc,
+		groupsSvc:            fakeSuccessSvc,
+		vnetSvc:              fakeSuccessSvc,
+		securityGroupSvc:     fakeSuccessSvc,
+		routeTableSvc:        fakeSuccessSvc,
+		subnetsSvc:           fakeSuccessSvc,
+		internalLBSvc:        fakeSuccessSvc,
+		publicIPSvc:          fakeSuccessSvc,
+		publicLBSvc:          fakeSuccessSvc,
+		virtualMachineSvc:    fakeSuccessSvc,
+		networkInterfacesSvc: fakeSuccessSvc,
 	}
 
 	if err := fakeReconciler.Reconcile(); err != nil {
@@ -138,16 +142,18 @@ func TestServicesCreatedCount(t *testing.T) {
 	fakeSuccessSvc := &azure.FakeCachedService{Cache: &cache}
 
 	fakeReconciler := &Reconciler{
-		scope:            newFakeScope(),
-		groupsSvc:        fakeSuccessSvc,
-		certificatesSvc:  fakeSuccessSvc,
-		vnetSvc:          fakeSuccessSvc,
-		securityGroupSvc: fakeSuccessSvc,
-		routeTableSvc:    fakeSuccessSvc,
-		subnetsSvc:       fakeSuccessSvc,
-		internalLBSvc:    fakeSuccessSvc,
-		publicIPSvc:      fakeSuccessSvc,
-		publicLBSvc:      fakeSuccessSvc,
+		scope:                newFakeScope(),
+		certificatesSvc:      fakeSuccessSvc,
+		groupsSvc:            fakeSuccessSvc,
+		vnetSvc:              fakeSuccessSvc,
+		securityGroupSvc:     fakeSuccessSvc,
+		routeTableSvc:        fakeSuccessSvc,
+		subnetsSvc:           fakeSuccessSvc,
+		internalLBSvc:        fakeSuccessSvc,
+		publicIPSvc:          fakeSuccessSvc,
+		publicLBSvc:          fakeSuccessSvc,
+		virtualMachineSvc:    fakeSuccessSvc,
+		networkInterfacesSvc: fakeSuccessSvc,
 	}
 
 	if err := fakeReconciler.Reconcile(); err != nil {

diff --git a/pkg/cloud/azure/services/certificates/BUILD.bazel b/pkg/cloud/azure/services/certificates/BUILD.bazel
@@ -13,6 +13,7 @@ go_library(
         "//pkg/cloud/azure:go_default_library",
         "//pkg/cloud/azure/actuators:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
+        "//vendor/golang.org/x/crypto/ssh:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",

diff --git a/pkg/cloud/azure/services/networkinterfaces/BUILD.bazel b/pkg/cloud/azure/services/networkinterfaces/BUILD.bazel
@@ -13,6 +13,7 @@ go_library(
         "//pkg/cloud/azure:go_default_library",
         "//pkg/cloud/azure/actuators:go_default_library",
         "//pkg/cloud/azure/services/internalloadbalancers:go_default_library",
+        "//pkg/cloud/azure/services/publicips:go_default_library",
         "//pkg/cloud/azure/services/publicloadbalancers:go_default_library",
         "//pkg/cloud/azure/services/subnets:go_default_library",
         "//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-12-01/network:go_default_library",