VladPolskiy/mariadb-operator
1
0
Fork 0
mirror of https://github.com/mariadb-operator/mariadb-operator.git synced 2025-08-15 21:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Secret reconciler to perform updates. MaxScale and Connection reconciler to use Secret reconciler

Browse Source
This commit is contained in:
Martin Montes
2024-06-01 13:26:45 +02:00
parent 1fa6ad078e
commit acf362b0e6
7 changed files with 71 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/controller/secret/controller.go
View File

@ -82,24 +82,14 @@ func (r *SecretReconciler) ReconcilePassword(ctx context.Context, req PasswordRe
type SecretRequest struct {
Owner metav1.Object
Metadata *mariadbv1alpha1.Metadata
Metadata []*mariadbv1alpha1.Metadata
Key types.NamespacedName
Data map[string][]byte
}
func (r *SecretReconciler) Reconcile(ctx context.Context, req *SecretRequest) error {
var existingSecret corev1.Secret
err := r.Get(ctx, req.Key, &existingSecret)
if err == nil {
return nil
}
if !apierrors.IsNotFound(err) {
return fmt.Errorf("error reconciling Secret: %v", err)
}
secretOpts := builder.SecretOpts{
Metadata: []*mariadbv1alpha1.Metadata{req.Metadata},
Metadata: req.Metadata,
Key: req.Key,
Data: req.Data,
}
@ -108,5 +98,15 @@ func (r *SecretReconciler) Reconcile(ctx context.Context, req *SecretRequest) er
return fmt.Errorf("error building Secret: %v", err)
}
return r.Create(ctx, secret)
var existingSecret corev1.Secret
if err := r.Get(ctx, req.Key, &existingSecret); err != nil {
if !apierrors.IsNotFound(err) {
return fmt.Errorf("error reconciling Secret: %v", err)
}
return r.Create(ctx, secret)
}
patch := client.MergeFrom(existingSecret.DeepCopy())
existingSecret.Data = secret.Data
return r.Patch(ctx, &existingSecret, patch)
}