From 3c89cb6373a60d5154c2cff91ebc53bd747b33c1 Mon Sep 17 00:00:00 2001 From: Veronika Fisarova Date: Tue, 11 Nov 2025 16:16:24 +0100 Subject: [PATCH] Index simpleCryptoBackendSecretField Signed-off-by: Veronika Fisarova --- controllers/barbican_controller.go | 6 +++++- controllers/barbicanapi_controller.go | 12 ++++++++++++ controllers/barbicankeystonelistener_controller.go | 12 ++++++++++++ controllers/barbicanworker_controller.go | 12 ++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/controllers/barbican_controller.go b/controllers/barbican_controller.go index 9a63639..ab89d4d 100644 --- a/controllers/barbican_controller.go +++ b/controllers/barbican_controller.go @@ -561,7 +561,8 @@ func (r *BarbicanReconciler) reconcileDelete(ctx context.Context, instance *barb // fields to index to reconcile when change const ( passwordSecretField = ".spec.secret" - caBundleSecretNameField = ".spec.tls.caBundleSecretName" // #nosec G101 + simpleCryptoBackendSecretField = ".spec.simpleCryptoBackendSecret" // #nosec G101 + caBundleSecretNameField = ".spec.tls.caBundleSecretName" // #nosec G101 tlsAPIInternalField = ".spec.tls.api.internal.secretName" tlsAPIPublicField = ".spec.tls.api.public.secretName" pkcs11LoginSecretField = ".spec.pkcs11.loginSecret" // #nosec G101 @@ -574,6 +575,7 @@ const ( var ( workerWatchFields = []string{ passwordSecretField, + simpleCryptoBackendSecretField, caBundleSecretNameField, pkcs11LoginSecretField, pkcs11ClientDataSecretField, @@ -583,6 +585,7 @@ var ( } apiWatchFields = []string{ passwordSecretField, + simpleCryptoBackendSecretField, caBundleSecretNameField, tlsAPIInternalField, tlsAPIPublicField, @@ -594,6 +597,7 @@ var ( } listenerWatchFields = []string{ passwordSecretField, + simpleCryptoBackendSecretField, caBundleSecretNameField, topologyField, customServiceConfigSecretsField, diff --git a/controllers/barbicanapi_controller.go b/controllers/barbicanapi_controller.go index 9e5f5ed..27bb91e 100644 --- a/controllers/barbicanapi_controller.go +++ b/controllers/barbicanapi_controller.go @@ -941,6 +941,18 @@ func (r *BarbicanAPIReconciler) SetupWithManager(mgr ctrl.Manager) error { return err } + // index simpleCryptoBackendSecretField + if err := mgr.GetFieldIndexer().IndexField(context.Background(), &barbicanv1beta1.BarbicanAPI{}, simpleCryptoBackendSecretField, func(rawObj client.Object) []string { + // Extract the secret name from the spec, if one is provided + cr := rawObj.(*barbicanv1beta1.BarbicanAPI) + if cr.Spec.SimpleCryptoBackendSecret == "" { + return nil + } + return []string{cr.Spec.SimpleCryptoBackendSecret} + }); err != nil { + return err + } + // index caBundleSecretNameField if err := mgr.GetFieldIndexer().IndexField(context.Background(), &barbicanv1beta1.BarbicanAPI{}, caBundleSecretNameField, func(rawObj client.Object) []string { // Extract the secret name from the spec, if one is provided diff --git a/controllers/barbicankeystonelistener_controller.go b/controllers/barbicankeystonelistener_controller.go index 1c377e8..259755e 100644 --- a/controllers/barbicankeystonelistener_controller.go +++ b/controllers/barbicankeystonelistener_controller.go @@ -700,6 +700,18 @@ func (r *BarbicanKeystoneListenerReconciler) SetupWithManager(mgr ctrl.Manager) return err } + // index simpleCryptoBackendSecretField + if err := mgr.GetFieldIndexer().IndexField(context.Background(), &barbicanv1beta1.BarbicanKeystoneListener{}, simpleCryptoBackendSecretField, func(rawObj client.Object) []string { + // Extract the secret name from the spec, if one is provided + cr := rawObj.(*barbicanv1beta1.BarbicanKeystoneListener) + if cr.Spec.SimpleCryptoBackendSecret == "" { + return nil + } + return []string{cr.Spec.SimpleCryptoBackendSecret} + }); err != nil { + return err + } + // index caBundleSecretNameField if err := mgr.GetFieldIndexer().IndexField(context.Background(), &barbicanv1beta1.BarbicanKeystoneListener{}, caBundleSecretNameField, func(rawObj client.Object) []string { // Extract the secret name from the spec, if one is provided diff --git a/controllers/barbicanworker_controller.go b/controllers/barbicanworker_controller.go index bd01630..85f5b45 100644 --- a/controllers/barbicanworker_controller.go +++ b/controllers/barbicanworker_controller.go @@ -697,6 +697,18 @@ func (r *BarbicanWorkerReconciler) SetupWithManager(mgr ctrl.Manager) error { return err } + // index simpleCryptoBackendSecretField + if err := mgr.GetFieldIndexer().IndexField(context.Background(), &barbicanv1beta1.BarbicanWorker{}, simpleCryptoBackendSecretField, func(rawObj client.Object) []string { + // Extract the secret name from the spec, if one is provided + cr := rawObj.(*barbicanv1beta1.BarbicanWorker) + if cr.Spec.SimpleCryptoBackendSecret == "" { + return nil + } + return []string{cr.Spec.SimpleCryptoBackendSecret} + }); err != nil { + return err + } + // index caBundleSecretNameField if err := mgr.GetFieldIndexer().IndexField(context.Background(), &barbicanv1beta1.BarbicanWorker{}, caBundleSecretNameField, func(rawObj client.Object) []string { // Extract the secret name from the spec, if one is provided