@@ -25,6 +25,7 @@ import (
25
25
26
26
corev1 "k8s.io/api/core/v1"
27
27
apierrors "k8s.io/apimachinery/pkg/api/errors"
28
+ kerrors "k8s.io/apimachinery/pkg/util/errors"
28
29
"k8s.io/client-go/tools/record"
29
30
"k8s.io/utils/pointer"
30
31
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -69,7 +70,7 @@ type OpenStackClusterReconciler struct {
69
70
// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=openstackclusters/status,verbs=get;update;patch
70
71
// +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters;clusters/status,verbs=get;list;watch
71
72
72
- func (r * OpenStackClusterReconciler ) Reconcile (ctx context.Context , req ctrl.Request ) (_ ctrl.Result , reterr error ) {
73
+ func (r * OpenStackClusterReconciler ) Reconcile (ctx context.Context , req ctrl.Request ) (result ctrl.Result , reterr error ) {
73
74
log := ctrl .LoggerFrom (ctx )
74
75
75
76
// Fetch the OpenStackCluster instance
@@ -108,9 +109,8 @@ func (r *OpenStackClusterReconciler) Reconcile(ctx context.Context, req ctrl.Req
108
109
// Always patch the openStackCluster when exiting this function so we can persist any OpenStackCluster changes.
109
110
defer func () {
110
111
if err := patchHelper .Patch (ctx , openStackCluster ); err != nil {
111
- if reterr == nil {
112
- reterr = fmt .Errorf ("error patching OpenStackCluster %s/%s: %w" , openStackCluster .Namespace , openStackCluster .Name , err )
113
- }
112
+ result = ctrl.Result {}
113
+ reterr = kerrors .NewAggregate ([]error {reterr , fmt .Errorf ("error patching OpenStackCluster %s/%s: %w" , openStackCluster .Namespace , openStackCluster .Name , err )})
114
114
}
115
115
}()
116
116
0 commit comments