Story (Required)

Backport the feature/bug to operator-redesign branch in argocd-operator. The change needs to be adjusted for new codebase.

Feature/bug JIRA: 

PRs to backport: https://github.com/argoproj-labs/argocd-operator/pull/1364 , https://github.com/argoproj-labs/argocd-operator/pull/1383 

Please refer this doc for details about new codebase and coding-standards-and-best-practices.md for best practices .

Acceptance Criteria (Mandatory)

• The implementation should'n change the functionality's behaviour in redesigned code-base.
• The implementation meets the recommended coding-standards and best practices.

Done Checklist

• Code is completed, reviewed, documented and checked in
• Unit and integration test automation have been delivered and running cleanly in continuous integration/staging/canary environment
• Continuous Delivery pipeline(s) is able to proceed with new code included
• Customer facing documentation, API docs etc. are produced/updated, reviewed and published
• Acceptance criteria are met