Skip to content

Commit ddc3472

Browse files
committed
Merge branch 'main' into zeto-lock
2 parents 27bdabe + f163c0c commit ddc3472

21 files changed

+4266
-236
lines changed

operator/cmd/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ func main() {
136136
setupLog.Error(err, "unable to create controller", "controller", "Paladin")
137137
os.Exit(1)
138138
}
139-
if err = (&controller.SmartContractDeploymentReconciler{
140-
Client: mgr.GetClient(),
141-
Scheme: mgr.GetScheme(),
142-
}).SetupWithManager(mgr); err != nil {
139+
if err = (controller.NewSmartContractDeploymentReconciler(
140+
mgr.GetClient(),
141+
mgr.GetScheme(),
142+
)).SetupWithManager(mgr); err != nil {
143143
setupLog.Error(err, "unable to create controller", "controller", "SmartContractDeployment")
144144
os.Exit(1)
145145
}

operator/internal/controller/besu_controller.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ func (r *BesuReconciler) SetupWithManager(mgr ctrl.Manager) error {
171171

172172
return ctrl.NewControllerManagedBy(mgr).
173173
For(&corev1alpha1.Besu{}).
174+
Owns(&appsv1.StatefulSet{}).
175+
Owns(&corev1.Service{}).
176+
Owns(&corev1.ConfigMap{}).
177+
Owns(&corev1.Secret{}).
178+
Owns(&policyv1.PodDisruptionBudget{}).
174179
Complete(r)
175180
}
176181

@@ -531,7 +536,8 @@ func (r *BesuReconciler) createPDB(ctx context.Context, node *corev1alpha1.Besu,
531536
} else if err != nil {
532537
return nil, err
533538
}
534-
return &foundPDB, nil
539+
540+
return pdb, nil
535541
}
536542

537543
func (r *BesuReconciler) generateStatefulSetTemplate(node *corev1alpha1.Besu, name, configSum string) *appsv1.StatefulSet {

0 commit comments

Comments
 (0)