Skip to content

Index simpleCryptoBackendSecretField #305

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
Nov 20, 2025
+41 −1
Merged

Index simpleCryptoBackendSecretField #305

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
6 changes: 5 additions & 1 deletion controllers/barbican_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -574,6 +575,7 @@ const (
var (
workerWatchFields = []string{
passwordSecretField,
simpleCryptoBackendSecretField,
caBundleSecretNameField,
pkcs11LoginSecretField,
pkcs11ClientDataSecretField,
Expand All @@ -583,6 +585,7 @@ var (
}
apiWatchFields = []string{
passwordSecretField,
simpleCryptoBackendSecretField,
caBundleSecretNameField,
tlsAPIInternalField,
tlsAPIPublicField,
Expand All @@ -594,6 +597,7 @@ var (
}
listenerWatchFields = []string{
passwordSecretField,
simpleCryptoBackendSecretField,
caBundleSecretNameField,
topologyField,
customServiceConfigSecretsField,
Expand Down
12 changes: 12 additions & 0 deletions controllers/barbicanapi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions controllers/barbicankeystonelistener_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions controllers/barbicanworker_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down