Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Added custom label and annotations to the pods of the server, repo, application set controller, and application controller #1532

Open
wants to merge 34 commits into
base: master
Choose a base branch
from

Conversation

enriqueav99
Copy link

What type of PR is this?

/kind enhancement

What does this PR do / why we need it:

Add the feature to add custom labels and annotations to the pods of the server, repo, application set controller, and application controller.

Have you updated the necessary documentation?

  • Documentation update is required by this PR.
  • Documentation has been updated.

Which issue(s) this PR fixes:

Fixes #1530 #637

How to test changes / Special notes to the reviewer:
Apply the following yaml

apiVersion: argoproj.io/v1beta1
kind: ArgoCD
metadata:
  name: argocd-sample
spec:
  server:
    customPodLabels:
      custom: label
      custom2: server
    customPodAnnotations:
      custom: annotation
      custom2: server
  repo:
    customPodLabels:
      custom: label
      custom2: repo
    customPodAnnotations:
      custom: annotation
      custom2: repo
  controller:
    customPodLabels:
      custom: label
      custom2: controller
    customPodAnnotations:
      custom: annotation
      custom2: controller
  applicationSet:
    customPodLabels:
      custom: label
      custom2: applicationSet
    customPodAnnotations:
      custom: annotation
      custom2: applicationSet

Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
@enriqueav99 enriqueav99 changed the title Added custom label and annotations Added custom label and annotations to the pods of the server, repo, application set controller, and application controller Aug 30, 2024
@enriqueav99
Copy link
Author

I deleted the test I made because I found it unnecessary and it wasn't working well in the CI. However, it passes when I run it locally (A classic)

@enriqueav99
Copy link
Author

I don't understand why the kuttl/harness/1-036_validate_role_rolebinding_for_source_namespace test sometimes passes and sometimes doesn't, even though I haven't changed any code. For example, in the last commit, I deleted a test I created, and it didn't pass, but in the previous two commits, it did pass.

@svghadi
Copy link
Collaborator

svghadi commented Sep 2, 2024

Hi @enriqueav99,

kuttl/harness/1-036_validate_role_rolebinding_for_source_namespace

is a known flaky test. You can ignore it.

@enriqueav99 enriqueav99 changed the title Added custom label and annotations to the pods of the server, repo, application set controller, and application controller feat: Added custom label and annotations to the pods of the server, repo, application set controller, and application controller Sep 2, 2024
@enriqueav99
Copy link
Author

enriqueav99 commented Sep 2, 2024

Hi @enriqueav99,

kuttl/harness/1-036_validate_role_rolebinding_for_source_namespace

is a known flaky test. You can ignore it.

Thaks for your reply! If it is a knwon "issue" I think taht the PR is ready to be reviewed

Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
enriqueav99 and others added 7 commits September 4, 2024 16:36
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
@enriqueav99
Copy link
Author

Hi! Could someone please review this? I think it's something simple and it would be really helpful for me at work 😄

@svghadi
Copy link
Collaborator

svghadi commented Sep 7, 2024

Hi @enriqueav99, thanks for the PR. I will try to get to it in next few days.

@svghadi
Copy link
Collaborator

svghadi commented Sep 16, 2024

Hi @enriqueav99 , can we the naming convention from

  • customPodLabels to labels
  • customPodAnnotations to annotations

Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
@enriqueav99
Copy link
Author

Hi @enriqueav99 , can we the naming convention from

  • customPodLabels to labels
  • customPodAnnotations to annotations

Hi! I changed the name of them! Thanks for yor time, any other feedback or review Will be well recived :D

Copy link
Collaborator

@svghadi svghadi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @enriqueav99.
Ran some tests, overall looks good. Left some suggestions.

Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
@enriqueav99
Copy link
Author

Thanks for the review @svghadi! Please, if another change is needed, let me know 😄

Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for custom labels and annotations to Server, repo, application set and application controller
2 participants