From a705c6066fb965c131455061d26b8f025830bf63 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 Nov 2019 10:12:44 +1100 Subject: [PATCH] Delete secret scope. --- controllers/secretscope_controller_databricks.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controllers/secretscope_controller_databricks.go b/controllers/secretscope_controller_databricks.go index 3f0ef21..60a4192 100644 --- a/controllers/secretscope_controller_databricks.go +++ b/controllers/secretscope_controller_databricks.go @@ -189,12 +189,16 @@ func (r *SecretScopeReconciler) verifyWorkspace(instance *databricksv1alpha1.Sec // checkSecrets checks if referenced secret is present in k8s or not. func (r *SecretScopeReconciler) checkSecrets(instance *databricksv1alpha1.SecretScope) error { + scope := instance.ObjectMeta.Name namespace := instance.Namespace // if secret in cluster is reference, see if secret exists. for _, secret := range instance.Spec.SecretScopeSecrets { if secret.ValueFrom != nil { if _, err := r.getSecretValueFrom(namespace, secret); err != nil { + // delete scope here because next time the config is applied, it will fail + // because the secret scope already exists from the previous run. + _ = r.APIClient.Secrets().DeleteSecretScope(scope) return err } }