mirrors/external-secrets
1
0
Fork 0
mirror of https://github.com/external-secrets/external-secrets.git synced 2024-12-14 11:57:59 +00:00
Code Activity

Gc/fix clusterexternalsecret metrics (#4170)

Browse source 
* fix: not ready metrics for some edge case conditions on ces

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

* fix: failure conditions with no metrics

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

---------

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>
Co-authored-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
This commit is contained in:
Gustavo Fernandes de Carvalho 2024-12-02 10:44:58 -03:00 committed by GitHub
parent c00c491a0e
commit 71e44c929f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/controllers/clusterexternalsecret/clusterexternalsecret_controller.go
View file

@ -102,18 +102,33 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
} }
if prevName := clusterExternalSecret.Status.ExternalSecretName; prevName != esName { if prevName := clusterExternalSecret.Status.ExternalSecretName; prevName != esName {
// ExternalSecretName has changed, so remove the old ones // ExternalSecretName has changed, so remove the old ones
failedNamespaces := map[string]error{}
for _, ns := range clusterExternalSecret.Status.ProvisionedNamespaces { for _, ns := range clusterExternalSecret.Status.ProvisionedNamespaces {
if err := r.deleteExternalSecret(ctx, prevName, clusterExternalSecret.Name, ns); err != nil { if err := r.deleteExternalSecret(ctx, prevName, clusterExternalSecret.Name, ns); err != nil {
log.Error(err, "could not delete ExternalSecret") log.Error(err, "could not delete ExternalSecret")
return ctrl.Result{}, err failedNamespaces[ns] = err
} }
} }
if len(failedNamespaces) > 0 {
condition := NewClusterExternalSecretCondition(failedNamespaces)
SetClusterExternalSecretCondition(&clusterExternalSecret, *condition)
clusterExternalSecret.Status.FailedNamespaces = toNamespaceFailures(failedNamespaces)
return ctrl.Result{}, err
}
} }
clusterExternalSecret.Status.ExternalSecretName = esName clusterExternalSecret.Status.ExternalSecretName = esName
namespaces, err := r.getTargetNamespaces(ctx, &clusterExternalSecret) namespaces, err := r.getTargetNamespaces(ctx, &clusterExternalSecret)
if err != nil { if err != nil {
log.Error(err, "failed to get target Namespaces") log.Error(err, "failed to get target Namespaces")
failedNamespaces := map[string]error{
"unknown": err,
}
condition := NewClusterExternalSecretCondition(failedNamespaces)
SetClusterExternalSecretCondition(&clusterExternalSecret, *condition)
clusterExternalSecret.Status.FailedNamespaces = toNamespaceFailures(failedNamespaces)
return ctrl.Result{}, err return ctrl.Result{}, err
} }