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

Merge pull request #146 from 1Password/fix/code-cleanup

Browse Source 
Code cleanup
This commit is contained in:
Eduard Filip
2023-01-05 13:30:31 +01:00
committed by GitHub
parent 03fa9adf6b a84b5337ea
commit ea8773bfee
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/deployment_controller.go
View File

@@ -95,12 +95,12 @@ func (r *DeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Request)
// This is so we can handle cleanup of associated secrets properly // This is so we can handle cleanup of associated secrets properly
if !utils.ContainsString(deployment.ObjectMeta.Finalizers, finalizer) { if !utils.ContainsString(deployment.ObjectMeta.Finalizers, finalizer) {
deployment.ObjectMeta.Finalizers = append(deployment.ObjectMeta.Finalizers, finalizer) deployment.ObjectMeta.Finalizers = append(deployment.ObjectMeta.Finalizers, finalizer)
if err := r.Update(context.Background(), deployment); err != nil { if err = r.Update(context.Background(), deployment); err != nil {
return reconcile.Result{}, err return reconcile.Result{}, err
} }
} }
// Handles creation or updating secrets for deployment if needed // Handles creation or updating secrets for deployment if needed
if err := r.handleApplyingDeployment(deployment, deployment.Namespace, annotations, req); err != nil { if err = r.handleApplyingDeployment(deployment, deployment.Namespace, annotations, req); err != nil {
return ctrl.Result{}, err return ctrl.Result{}, err
} }
return ctrl.Result{}, nil return ctrl.Result{}, nil
@@ -110,10 +110,12 @@ 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 {
return reconcile.Result{}, err return reconcile.Result{}, err
} }
} }
@@ -144,7 +146,7 @@ func (r *DeploymentReconciler) cleanupKubernetesSecretForDeployment(secretName s
// Only delete the associated kubernetes secret if it is not being used by other deployments // Only delete the associated kubernetes secret if it is not being used by other deployments
if !multipleDeploymentsUsingSecret { if !multipleDeploymentsUsingSecret {
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
} }

7
controllers/onepassworditem_controller.go
View File

@@ -95,13 +95,13 @@ func (r *OnePasswordItemReconciler) Reconcile(ctx context.Context, req ctrl.Requ
// This is so we can handle cleanup of associated secrets properly // This is so we can handle cleanup of associated secrets properly
if !utils.ContainsString(onepassworditem.ObjectMeta.Finalizers, finalizer) { if !utils.ContainsString(onepassworditem.ObjectMeta.Finalizers, finalizer) {
onepassworditem.ObjectMeta.Finalizers = append(onepassworditem.ObjectMeta.Finalizers, finalizer) onepassworditem.ObjectMeta.Finalizers = append(onepassworditem.ObjectMeta.Finalizers, finalizer)
if err := r.Update(context.Background(), onepassworditem); err != nil { if err = r.Update(context.Background(), onepassworditem); err != nil {
return ctrl.Result{}, err return ctrl.Result{}, err
} }
} }
// Handles creation or updating secrets for deployment if needed // Handles creation or updating secrets for deployment if needed
err := r.handleOnePasswordItem(onepassworditem, req) err = r.handleOnePasswordItem(onepassworditem, req)
if updateStatusErr := r.updateStatus(onepassworditem, err); updateStatusErr != nil { if updateStatusErr := r.updateStatus(onepassworditem, err); updateStatusErr != nil {
return ctrl.Result{}, fmt.Errorf("cannot update status: %s", updateStatusErr) return ctrl.Result{}, fmt.Errorf("cannot update status: %s", updateStatusErr)
} }
@@ -116,7 +116,7 @@ func (r *OnePasswordItemReconciler) Reconcile(ctx context.Context, req ctrl.Requ
} }
// Remove finalizer now that cleanup is complete // Remove finalizer now that cleanup is complete
if err := r.removeFinalizer(onepassworditem); err != nil { if err = r.removeFinalizer(onepassworditem); err != nil {
return ctrl.Result{}, err return ctrl.Result{}, err
} }
} }
@@ -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