Skip to content

Commit

Permalink
Fix issue with empty s3 profile config
Browse files Browse the repository at this point in the history
This commit fixes issue where s3 profile config is not updated in the Ramen config map.
This is due to a race condition existing between MCO and Ramen where Ramen starts after MCO during upgrade at which point s3profile is updated and  Ramen replaces this with newly created default config.

This fix will ensure that any changes to Ramen configmap is watched and triggers reconcile for all secrets in the current namespace which should ensure that s3profile is properly updated regardless of the upgrade sequence.

Signed-off-by: vbadrina <vbadrina@redhat.com>
  • Loading branch information
vbnrh committed Oct 4, 2023
1 parent 48dc2ed commit 56f73df
Showing 1 changed file with 34 additions and 0 deletions.
34 changes: 34 additions & 0 deletions controllers/mirrorpeersecret_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,18 @@ import (

"github.com/red-hat-storage/odf-multicluster-orchestrator/controllers/utils"

ramendrv1alpha1 "github.com/ramendr/ramen/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
"sigs.k8s.io/yaml"
)

// MirrorPeerSecretReconciler reconciles MirrorPeer CRs,
Expand Down Expand Up @@ -97,5 +102,34 @@ func mirrorPeerSecretReconcile(ctx context.Context, rc client.Client, req ctrl.R
func (r *MirrorPeerSecretReconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&corev1.Secret{}, builder.WithPredicates(utils.SourceOrDestinationPredicate)).
Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.secretConfigMapFunc)).
Complete(r)
}

func (r *MirrorPeerSecretReconciler) secretConfigMapFunc(obj client.Object) []reconcile.Request {
ConfigMapRamenConfigKeyName := "ramen_manager_config.yaml"
var cm *corev1.ConfigMap
cm, ok := obj.(*corev1.ConfigMap)
if !ok {
return []reconcile.Request{}
}

ramenConfig := &ramendrv1alpha1.RamenConfig{}
err := yaml.Unmarshal([]byte(cm.Data[ConfigMapRamenConfigKeyName]), ramenConfig)
if err != nil {
return []reconcile.Request{}
}

secrets := &corev1.SecretList{}
if err := r.Client.List(context.TODO(), secrets); err != nil {
return []reconcile.Request{}
}

requests := make([]reconcile.Request, len(secrets.Items))
for i, secret := range secrets.Items {
requests[i].Name = secret.GetName()
requests[i].Namespace = secret.GetNamespace()
}

return requests
}

0 comments on commit 56f73df

Please sign in to comment.