Skip to content

Experimental Manual Rotation Of Vault Dynamic Secret Through VSO #1032

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Experimental Manual Rotation Of Vault Dynamic Secret Through VSO #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
903a8a5
Pushed changes so far
jaireddjawed Mar 14, 2025
6fe88e8
Merge branch 'main' into manual-shadow-secret-sync-experimental
jaireddjawed Mar 14, 2025
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
1 change: 1 addition & 0 deletions consts/reasons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ const (
ReasonVaultClientConfigChanged = "VaultClientConfigChanged"
ReasonEventWatcherError = "EventWatcherError"
ReasonEventWatcherStarted = "EventWatcherStarted"
ReasonManualTrigger = "ManualTrigger"
)
14 changes: 14 additions & 0 deletions controllers/vaultdynamicsecret_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ func (r *VaultDynamicSecretReconciler) Reconcile(ctx context.Context, req ctrl.R
return ctrl.Result{}, r.handleDeletion(ctx, o)
}

forceSyncUpdate := false
if o.Annotations["vault-secrets-operator/force-sync"] == "true" {
logger.Info("Force sync annotation found, removing it")
forceSyncUpdate = true
}

r.referenceCache.Set(SecretTransformation, req.NamespacedName,
helpers.GetTransformationRefObjKeys(
o.Spec.Destination.Transformation, o.Namespace)...)
Expand Down Expand Up @@ -176,6 +182,8 @@ func (r *VaultDynamicSecretReconciler) Reconcile(ctx context.Context, req ctrl.R
// happen when the client has re-authenticated to Vault since the last sync.
case lastClientID != "" && lastClientID != o.Status.VaultClientMeta.ID:
syncReason = consts.ReasonVaultTokenRotated
case forceSyncUpdate:
syncReason = consts.ReasonManualTrigger
}

doSync := syncReason != ""
Expand Down Expand Up @@ -272,6 +280,7 @@ func (r *VaultDynamicSecretReconciler) Reconcile(ctx context.Context, req ctrl.R
return ctrl.Result{RequeueAfter: computeHorizonWithJitter(requeueDurationOnError)}, nil
}

logger.Info("syncing the dynamic secret")
// sync the secret
secretLease, staticCredsUpdated, err := r.syncSecret(ctx, vClient, o, transOption)
if err != nil {
Expand All @@ -291,6 +300,9 @@ func (r *VaultDynamicSecretReconciler) Reconcile(ctx context.Context, req ctrl.R
r.BackOffRegistry.Delete(req.NamespacedName)
}

// remove the force-sync annotation so that the next force sync can be triggered
delete(o.Annotations, "vault-secrets-operator/force-sync")

doRolloutRestart := (doSync && o.Status.LastGeneration > 1) || staticCredsUpdated
o.Status.SecretLease = *secretLease
o.Status.LastRenewalTime = nowFunc().Unix()
Expand Down Expand Up @@ -407,6 +419,7 @@ func (r *VaultDynamicSecretReconciler) syncSecret(ctx context.Context, c vault.C

var data map[string][]byte
secretLease := r.getVaultSecretLease(resp.Secret())
logger.Info("Vault response for secret lease", "renewableLease", r.isRenewableLease(secretLease, o, true), "AllowStaticCreds", o.Spec.AllowStaticCreds)
if !r.isRenewableLease(secretLease, o, true) && o.Spec.AllowStaticCreds {
staticCredsMeta, rotatedResponse, err := r.awaitVaultSecretRotation(ctx, o, c, resp)
if err != nil {
Expand Down Expand Up @@ -440,6 +453,7 @@ func (r *VaultDynamicSecretReconciler) syncSecret(ctx context.Context, c vault.C
logger.V(consts.LogLevelDebug).Info("Static creds", "status", o.Status)
} else {
data, err = resp.SecretK8sData(opt)
logger.Info("secretk8sData", "data", data)
if err != nil {
return nil, false, err
}
Expand Down