Refactor logging

kubernetes-sigs · May 22, 2024 · 27f93eb · 27f93eb
1 parent 4c5b9da
commit 27f93eb
Show file tree

Hide file tree

Showing 7 changed files with 232 additions and 219 deletions.
diff --git a/api/v1beta2/ibmpowervscluster_types.go b/api/v1beta2/ibmpowervscluster_types.go
@@ -80,7 +80,7 @@ type IBMPowerVSClusterSpec struct {
 	// resourceGroup name under which the resources will be created.
 	// when powervs.cluster.x-k8s.io/create-infra=true annotation is set on IBMPowerVSCluster resource,
 	// 1. it is expected to set the ResourceGroup.Name, not setting will result in webhook error.
-	// ServiceInstance.ID and ServiceInstance.Regex is not yet supported and system will ignore the value.
+	// ResourceGroup.ID and ResourceGroup.Regex is not yet supported and system will ignore the value.
 	// +optional
 	ResourceGroup *IBMPowerVSResourceReference `json:"resourceGroup,omitempty"`
 

diff --git a/cloud/scope/powervs_cluster.go b/cloud/scope/powervs_cluster.go
diff --git a/cloud/scope/powervs_machine.go b/cloud/scope/powervs_machine.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml
@@ -338,7 +338,7 @@ spec:
                   resourceGroup name under which the resources will be created.
                   when powervs.cluster.x-k8s.io/create-infra=true annotation is set on IBMPowerVSCluster resource,
                   1. it is expected to set the ResourceGroup.Name, not setting will result in webhook error.
-                  ServiceInstance.ID and ServiceInstance.Regex is not yet supported and system will ignore the value.
+                  ResourceGroup.ID and ResourceGroup.Regex is not yet supported and system will ignore the value.
                 properties:
                   id:
                     description: ID of resource

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclustertemplates.yaml
@@ -369,7 +369,7 @@ spec:
                           resourceGroup name under which the resources will be created.
                           when powervs.cluster.x-k8s.io/create-infra=true annotation is set on IBMPowerVSCluster resource,
                           1. it is expected to set the ResourceGroup.Name, not setting will result in webhook error.
-                          ServiceInstance.ID and ServiceInstance.Regex is not yet supported and system will ignore the value.
+                          ResourceGroup.ID and ResourceGroup.Regex is not yet supported and system will ignore the value.
                         properties:
                           id:
                             description: ID of resource

diff --git a/controllers/ibmpowervscluster_controller.go b/controllers/ibmpowervscluster_controller.go
@@ -179,8 +179,8 @@ func (r *IBMPowerVSClusterReconciler) reconcile(clusterScope *scope.PowerVSClust
 
 	// reconcile VPC Subnet
 	clusterScope.Info("Reconciling VPC subnets")
-	if requeue, err := clusterScope.ReconcileVPCSubnet(); err != nil {
-		clusterScope.Error(err, "failed to reconcile VPC subnet")
+	if requeue, err := clusterScope.ReconcileVPCSubnets(); err != nil {
+		clusterScope.Error(err, "failed to reconcile VPC subnets")
 		conditions.MarkFalse(powerVSCluster, infrav1beta2.VPCSubnetReadyCondition, infrav1beta2.VPCSubnetReconciliationFailedReason, capiv1beta1.ConditionSeverityError, err.Error())
 		return reconcile.Result{}, err
 	} else if requeue {
@@ -192,7 +192,7 @@ func (r *IBMPowerVSClusterReconciler) reconcile(clusterScope *scope.PowerVSClust
 	// reconcile VPC security group
 	clusterScope.Info("Reconciling VPC security group")
 	if err := clusterScope.ReconcileVPCSecurityGroups(); err != nil {
-		clusterScope.Error(err, "failed to reconcile VPC security group")
+		clusterScope.Error(err, "failed to reconcile VPC security groups")
 		conditions.MarkFalse(powerVSCluster, infrav1beta2.VPCSecurityGroupReadyCondition, infrav1beta2.VPCSecurityGroupReconciliationFailedReason, capiv1beta1.ConditionSeverityError, err.Error())
 		return reconcile.Result{}, err
 	}
@@ -212,8 +212,8 @@ func (r *IBMPowerVSClusterReconciler) reconcile(clusterScope *scope.PowerVSClust
 
 	// reconcile LoadBalancer
 	clusterScope.Info("Reconciling VPC load balancers")
-	if requeue, err := clusterScope.ReconcileLoadBalancer(); err != nil {
-		clusterScope.Error(err, "failed to reconcile VPC load balancer")
+	if requeue, err := clusterScope.ReconcileLoadBalancers(); err != nil {
+		clusterScope.Error(err, "failed to reconcile VPC load balancers")
 		conditions.MarkFalse(powerVSCluster, infrav1beta2.LoadBalancerReadyCondition, infrav1beta2.LoadBalancerReconciliationFailedReason, capiv1beta1.ConditionSeverityError, err.Error())
 		return reconcile.Result{}, err
 	} else if requeue {
@@ -330,6 +330,7 @@ func (r *IBMPowerVSClusterReconciler) reconcileDelete(ctx context.Context, clust
 	}
 
 	if len(allErrs) > 0 {
+		clusterScope.Error(kerrors.NewAggregate(allErrs), "failed to delete IBMPowerVSCluster")
 		return ctrl.Result{}, kerrors.NewAggregate(allErrs)
 	}
 

diff --git a/controllers/ibmpowervsmachine_controller.go b/controllers/ibmpowervsmachine_controller.go
@@ -287,7 +287,7 @@ func (r *IBMPowerVSMachineReconciler) reconcileNormal(machineScope *scope.PowerV
 	machineScope.Info("updating loadbalancer for machine", "name", machineScope.IBMPowerVSMachine.Name)
 	internalIP := machineScope.GetMachineInternalIP()
 	if internalIP == "" {
-		machineScope.Info("Not able to update the LoadBalancer, Machine internal IP not yet set", "machine name", machineScope.IBMPowerVSMachine.Name)
+		machineScope.Info("Unable to update the LoadBalancer, Machine internal IP not yet set", "machine name", machineScope.IBMPowerVSMachine.Name)
 		return ctrl.Result{}, nil
 	}
 	poolMember, err := machineScope.CreateVPCLoadBalancerPoolMember()