fix: remove managed-by label from terminating namespaces #854
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
jannfis
reviewed
Feb 10, 2023
| @@ -103,8 +103,13 @@ func (r *ReconcileArgoCD) reconcileRole(name string, policyRules []v1.PolicyRule | |||
|
|
|||
| // create policy rules for each namespace | |||
| for _, namespace := range r.ManagedNamespaces.Items { | |||
| // Skip terminating namespaces. | |||
| // If encountering a terminating namespace remove managed-by label from it and skip reconciliation - This should trigger | |||
There was a problem hiding this comment.
It should trigger or it will trigger?
Can we back this up by a test?
There was a problem hiding this comment.
@jannfis
it will trigger
Added a test case, PTAL
(Only checking for synced state of app because the app likely runs privileged containers which will fail to come up on OCP and will stay in progressing/degraded state. Sync state anyway should confirm that the resources were at least deployed in the target namespace, which should be enough to address the original bug)
Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
ciiay
pushed a commit
to ciiay/argocd-operator
that referenced
this pull request
Mar 20, 2023
…bs#854) * remove managed-by label from terminating ns Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com> * add e2e test Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com> --------- Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com> Signed-off-by: Yi Cai <yicai@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Jaideep Rao jaideep.r97@gmail.com
What type of PR is this?
/kind bug
What does this PR do / why we need it:
This PR removes the "managed-by" label from a previously managed now terminating namespace, which triggers the removal of this namespace from the argo-cd instance's cluster secret thus unblocking it from deploying resources to other managed namespaces
This seems like a cleaner approach than directly deleting the namespace from the cluster secret as we already have existing code paths to achieve this that could be triggered by removing the label from the terminating namespace - and while it is generally not a good idea to delete labels from namespaces (if not added by the operator) however, it maybe okay in this case since the namespace is scheduled for deletion anyway
Have you updated the necessary documentation?
Which issue(s) this PR fixes:
Fixes #853?
How to test changes / Special notes to the reviewer:
repeat steps documented in linked issue and confirm that app resources are in fact deployed to "John" namespace