Skip to content

Make sure we reconcile heat-engine secrets #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 22, 2025
Merged

Make sure we reconcile heat-engine secrets #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions controllers/heatapi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func (r *HeatAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
return err
}

configMapFn := func(_ context.Context, o client.Object) []reconcile.Request {
secretFn := func(_ context.Context, o client.Object) []reconcile.Request {
result := []reconcile.Request{}

apis := &heatv1beta1.HeatAPIList{}
Expand All @@ -278,7 +278,7 @@ func (r *HeatAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
Namespace: o.GetNamespace(),
Name: cr.Name,
}
r.Log.Info(fmt.Sprintf("ConfigMap object %s and CR %s marked with label: %s", o.GetName(), cr.Name, l))
r.Log.Info(fmt.Sprintf("secret object %s and CR %s marked with label: %s", o.GetName(), cr.Name, l))
result = append(result, reconcile.Request{NamespacedName: name})
}
}
Expand All @@ -296,8 +296,8 @@ func (r *HeatAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&appsv1.Deployment{}).
Owns(&corev1.Service{}).
// watch the config CMs we don't own
Watches(&corev1.ConfigMap{},
handler.EnqueueRequestsFromMapFunc(configMapFn)).
Watches(&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(secretFn)).
Watches(
&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
Expand Down
9 changes: 4 additions & 5 deletions controllers/heatcfnapi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (r *HeatCfnAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
return err
}

configMapFn := func(_ context.Context, o client.Object) []reconcile.Request {
secretFn := func(_ context.Context, o client.Object) []reconcile.Request {
result := []reconcile.Request{}

apis := &heatv1beta1.HeatCfnAPIList{}
Expand All @@ -280,7 +280,7 @@ func (r *HeatCfnAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
Namespace: o.GetNamespace(),
Name: cr.Name,
}
r.Log.Info(fmt.Sprintf("ConfigMap object %s and CR %s marked with label: %s", o.GetName(), cr.Name, l))
r.Log.Info(fmt.Sprintf("secret object %s and CR %s marked with label: %s", o.GetName(), cr.Name, l))
result = append(result, reconcile.Request{NamespacedName: name})
}
}
Expand All @@ -297,9 +297,8 @@ func (r *HeatCfnAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&keystonev1.KeystoneEndpoint{}).
Owns(&appsv1.Deployment{}).
Owns(&corev1.Service{}).
// watch the config CMs we don't own
Watches(&corev1.ConfigMap{},
handler.EnqueueRequestsFromMapFunc(configMapFn)).
Watches(&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(secretFn)).
Watches(
&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
Expand Down
8 changes: 4 additions & 4 deletions controllers/heatengine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func (r *HeatEngineReconciler) SetupWithManager(mgr ctrl.Manager) error {
return err
}

configMapFn := func(_ context.Context, o client.Object) []reconcile.Request {
secretFn := func(_ context.Context, o client.Object) []reconcile.Request {
result := []reconcile.Request{}

engines := &heatv1beta1.HeatEngineList{}
Expand All @@ -231,7 +231,7 @@ func (r *HeatEngineReconciler) SetupWithManager(mgr ctrl.Manager) error {
Namespace: o.GetNamespace(),
Name: cr.Name,
}
r.Log.Info(fmt.Sprintf("ConfigMap object %s and CR %s marked with label: %s", o.GetName(), cr.Name, l))
r.Log.Info(fmt.Sprintf("secret object %s and CR %s marked with label: %s", o.GetName(), cr.Name, l))
result = append(result, reconcile.Request{NamespacedName: name})
}
}
Expand All @@ -244,8 +244,8 @@ func (r *HeatEngineReconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&heatv1beta1.HeatEngine{}).
Owns(&appsv1.Deployment{}).
Watches(&corev1.ConfigMap{},
handler.EnqueueRequestsFromMapFunc(configMapFn)).
Watches(&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(secretFn)).
Watches(
&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
Expand Down