Update subnet test

kubernetes-sigs · Feb 24, 2022 · a1e3947 · a1e3947
1 parent e9c0c42
commit a1e3947
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/azure/services/subnets/subnets.go b/azure/services/subnets/subnets.go
@@ -81,8 +81,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 		} else {
 			subnet, ok := result.(network.Subnet)
 			if !ok {
-				resultErr = errors.Errorf("%T is not a network.Subnet", result)
-				break
+				return errors.Errorf("%T is not a network.Subnet", result)
 			}
 			var addresses []string
 			if subnet.SubnetPropertiesFormat != nil && subnet.SubnetPropertiesFormat.AddressPrefix != nil {
@@ -113,8 +112,6 @@ func (s *Service) Delete(ctx context.Context) error {
 
 	if !s.Scope.IsVnetManaged() {
 		log.V(4).Info("Skipping subnets deletion in custom vnet mode")
-
-		s.Scope.UpdateDeleteStatus(infrav1.SubnetsReadyCondition, serviceName, nil)
 		return nil
 	}
 

diff --git a/azure/services/subnets/subnets_test.go b/azure/services/subnets/subnets_test.go
@@ -214,7 +214,7 @@ func TestReconcileSubnets(t *testing.T) {
 				s.UpdateSubnetID(fakeSubnetSpec1.Name, to.String(fakeSubnet1.ID))
 				s.UpdateSubnetCIDRs(fakeSubnetSpec1.Name, []string{to.String(fakeSubnet1.AddressPrefix)})
 
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.UpdatePutStatus(infrav1.SubnetsReadyCondition, serviceName, nil)
 			},
 		},
@@ -232,7 +232,7 @@ func TestReconcileSubnets(t *testing.T) {
 				s.UpdateSubnetID(fakeSubnetSpec2.Name, to.String(fakeSubnet2.ID))
 				s.UpdateSubnetCIDRs(fakeSubnetSpec2.Name, []string{to.String(fakeSubnet2.AddressPrefix)})
 
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.UpdatePutStatus(infrav1.SubnetsReadyCondition, serviceName, nil)
 			},
 		},
@@ -246,7 +246,7 @@ func TestReconcileSubnets(t *testing.T) {
 				s.UpdateSubnetID(fakeSubnetSpecNotManaged.Name, to.String(fakeSubnetNotManaged.ID))
 				s.UpdateSubnetCIDRs(fakeSubnetSpecNotManaged.Name, []string{to.String(fakeSubnetNotManaged.AddressPrefix)})
 
-				s.IsVnetManaged().Return(false)
+				s.IsVnetManaged().AnyTimes().Return(false)
 			},
 		},
 		{
@@ -259,7 +259,7 @@ func TestReconcileSubnets(t *testing.T) {
 				s.UpdateSubnetID(fakeIpv6SubnetSpec.Name, to.String(fakeIpv6Subnet.ID))
 				s.UpdateSubnetCIDRs(fakeIpv6SubnetSpec.Name, to.StringSlice(fakeIpv6Subnet.AddressPrefixes))
 
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.UpdatePutStatus(infrav1.SubnetsReadyCondition, serviceName, nil)
 			},
 		},
@@ -277,7 +277,7 @@ func TestReconcileSubnets(t *testing.T) {
 				s.UpdateSubnetID(fakeIpv6SubnetSpecCP.Name, to.String(fakeIpv6SubnetCP.ID))
 				s.UpdateSubnetCIDRs(fakeIpv6SubnetSpecCP.Name, to.StringSlice(fakeIpv6SubnetCP.AddressPrefixes))
 
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.UpdatePutStatus(infrav1.SubnetsReadyCondition, serviceName, nil)
 			},
 		},
@@ -288,7 +288,7 @@ func TestReconcileSubnets(t *testing.T) {
 				s.SubnetSpecs().Return([]azure.ResourceSpecGetter{&fakeSubnetSpec1})
 				r.CreateResource(gomockinternal.AContext(), &fakeSubnetSpec1, serviceName).Return(nil, internalError)
 
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.UpdatePutStatus(infrav1.SubnetsReadyCondition, serviceName, internalError)
 			},
 		},
@@ -298,9 +298,6 @@ func TestReconcileSubnets(t *testing.T) {
 			expect: func(s *mock_subnets.MockSubnetScopeMockRecorder, r *mock_async.MockReconcilerMockRecorder) {
 				s.SubnetSpecs().Return([]azure.ResourceSpecGetter{&fakeSubnetSpec1})
 				r.CreateResource(gomockinternal.AContext(), &fakeSubnetSpec1, serviceName).Return(notASubnet, nil)
-
-				s.IsVnetManaged().Return(true)
-				s.UpdatePutStatus(infrav1.SubnetsReadyCondition, serviceName, notASubnetErr)
 			},
 		},
 		{
@@ -314,7 +311,7 @@ func TestReconcileSubnets(t *testing.T) {
 				s.UpdateSubnetID(fakeSubnetSpec2.Name, to.String(fakeSubnet2.ID))
 				s.UpdateSubnetCIDRs(fakeSubnetSpec2.Name, []string{to.String(fakeSubnet2.AddressPrefix)})
 
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.UpdatePutStatus(infrav1.SubnetsReadyCondition, serviceName, internalError)
 			},
 		},
@@ -359,15 +356,15 @@ func TestDeleteSubnets(t *testing.T) {
 			name:          "noop if no subnet specs are found",
 			expectedError: "",
 			expect: func(s *mock_subnets.MockSubnetScopeMockRecorder, r *mock_async.MockReconcilerMockRecorder) {
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.SubnetSpecs().Return([]azure.ResourceSpecGetter{})
 			},
 		},
 		{
 			name:          "subnets deleted successfully",
 			expectedError: "",
 			expect: func(s *mock_subnets.MockSubnetScopeMockRecorder, r *mock_async.MockReconcilerMockRecorder) {
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.SubnetSpecs().Return([]azure.ResourceSpecGetter{&fakeSubnetSpec1, &fakeSubnetSpec2})
 				r.DeleteResource(gomockinternal.AContext(), &fakeSubnetSpec1, serviceName).Return(nil)
 				r.DeleteResource(gomockinternal.AContext(), &fakeSubnetSpec2, serviceName).Return(nil)
@@ -378,7 +375,7 @@ func TestDeleteSubnets(t *testing.T) {
 			name:          "node subnet and controlplane subnet deleted successfully",
 			expectedError: "",
 			expect: func(s *mock_subnets.MockSubnetScopeMockRecorder, r *mock_async.MockReconcilerMockRecorder) {
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.SubnetSpecs().Return([]azure.ResourceSpecGetter{&fakeSubnetSpec1, &fakeCtrlPlaneSubnetSpec})
 				r.DeleteResource(gomockinternal.AContext(), &fakeSubnetSpec1, serviceName).Return(nil)
 				r.DeleteResource(gomockinternal.AContext(), &fakeCtrlPlaneSubnetSpec, serviceName).Return(nil)
@@ -389,14 +386,14 @@ func TestDeleteSubnets(t *testing.T) {
 			name:          "skip delete if vnet is not managed",
 			expectedError: "",
 			expect: func(s *mock_subnets.MockSubnetScopeMockRecorder, r *mock_async.MockReconcilerMockRecorder) {
-				s.IsVnetManaged().Return(false)
+				s.IsVnetManaged().AnyTimes().Return(false)
 			},
 		},
 		{
 			name:          "fail delete subnet",
 			expectedError: "#: Internal Server Error: StatusCode=500",
 			expect: func(s *mock_subnets.MockSubnetScopeMockRecorder, r *mock_async.MockReconcilerMockRecorder) {
-				s.IsVnetManaged().Return(true)
+				s.IsVnetManaged().AnyTimes().Return(true)
 				s.SubnetSpecs().Return([]azure.ResourceSpecGetter{&fakeSubnetSpec1})
 				r.DeleteResource(gomockinternal.AContext(), &fakeSubnetSpec1, serviceName).Return(internalError)
 				s.UpdateDeleteStatus(infrav1.SubnetsReadyCondition, serviceName, internalError)

diff --git a/controllers/azurecluster_controller.go b/controllers/azurecluster_controller.go
@@ -241,6 +241,7 @@ func (acr *AzureClusterReconciler) reconcileNormal(ctx context.Context, clusterS
 
 		wrappedErr := errors.Wrap(err, "failed to reconcile cluster services")
 		acr.Recorder.Eventf(azureCluster, corev1.EventTypeWarning, "ClusterReconcilerNormalFailed", wrappedErr.Error())
+		conditions.MarkFalse(azureCluster, infrav1.NetworkInfrastructureReadyCondition, infrav1.FailedReason, clusterv1.ConditionSeverityError, wrappedErr.Error())
 		return reconcile.Result{}, wrappedErr
 	}