1Password/onepassword-operator
1
0
Fork 0
mirror of https://github.com/1Password/onepassword-operator.git synced 2025-10-23 16:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated code for deleting k8s secret and handle an error

Browse Source
This commit is contained in:
Eddy Filip
2023-01-04 14:05:33 +02:00
parent 03fa9adf6b
commit cd1c978d18
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/deployment_controller.go
View File

@@ -110,7 +110,9 @@ func (r *DeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if utils.ContainsString(deployment.ObjectMeta.Finalizers, finalizer) { if utils.ContainsString(deployment.ObjectMeta.Finalizers, finalizer) {
secretName := annotations[op.NameAnnotation] secretName := annotations[op.NameAnnotation]
r.cleanupKubernetesSecretForDeployment(secretName, deployment) if err = r.cleanupKubernetesSecretForDeployment(secretName, deployment); err != nil {
return ctrl.Result{}, err
}
// Remove the finalizer from the deployment so deletion of deployment can be completed // Remove the finalizer from the deployment so deletion of deployment can be completed
if err := r.removeOnePasswordFinalizerFromDeployment(deployment); err != nil { if err := r.removeOnePasswordFinalizerFromDeployment(deployment); err != nil {

1
controllers/onepassworditem_controller.go
View File

@@ -143,7 +143,6 @@ func (r *OnePasswordItemReconciler) cleanupKubernetesSecret(onePasswordItem *one
kubernetesSecret.ObjectMeta.Name = onePasswordItem.Name kubernetesSecret.ObjectMeta.Name = onePasswordItem.Name
kubernetesSecret.ObjectMeta.Namespace = onePasswordItem.Namespace kubernetesSecret.ObjectMeta.Namespace = onePasswordItem.Namespace
r.Delete(context.Background(), kubernetesSecret)
if err := r.Delete(context.Background(), kubernetesSecret); err != nil { if err := r.Delete(context.Background(), kubernetesSecret); err != nil {
if !errors.IsNotFound(err) { if !errors.IsNotFound(err) {
return err return err