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.

Sign up for GitHub

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

Jump to bottom

Add support to specify different annotation for the task and web deployments in AWX operator #1351

Merged
merged 1 commit into from
Apr 17, 2023
Merged

Add support to specify different annotation for the task and web deployments in AWX operator #1351

merged 1 commit into from
Apr 17, 2023

Conversation

djyasin
Copy link
Member

@djyasin djyasin commented Apr 11, 2023 •
edited
Loading

SUMMARY

Fixes #1331

ISSUE TYPE
  • Bug, Docs Fix or other nominal change
Test-Case Scenarios
  • 4 Test cases total
    • No annotations
      • Web and task should deploy successfully with no additional annotations
    • Just web_annotations
      • Only web deployment has custom annotations, matches what was set
        • Added example from defaults to spec, checked web deployment to ensure they were present, then checked other deployments to be sure they were not there.
    • Just task_annotations
      • Only task deployment has custom annotations, matches what was set
    • Common annotations for both deployments
      • Both deployments have common annotations
    • Override scenario, have web_annotations, task _annotations, and annotations
      • Ensure these remain distinct

@djyasin djyasin marked this pull request as ready for review April 13, 2023 19:02
@TheRealHaoLiu
Copy link
Member

please update x-descriptor for the ClusterServiceVersion resource

example

awx-operator/config/manifests/bases/awx-operator.clusterserviceversion.yaml

Lines 688 to 692 in 0c2f455

- displayName: Annotations
path: annotations
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden

TheRealHaoLiu
TheRealHaoLiu reviewed Apr 17, 2023
View reviewed changes
roles/installer/defaults/main.yml Outdated
@@ -184,6 +184,18 @@ web_affinity: {}
# my.annotation/2: value2
annotations: ''

# Add annotations to awx task pods. Specify as literal block. E.g.:
Copy link
Member

Choose a reason for hiding this comment

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

s/Add/Override/

@TheRealHaoLiu TheRealHaoLiu force-pushed the 1331_Add_support_to_specify_different_annotation_for_task_and_web_deployments branch 2 times, most recently from e2ea117 to 5faca19 Compare April 17, 2023 19:57
@djyasin @TheRealHaoLiu
Add ability to override annotations independently
e542158 
- add web_annotations to override annotations for web pods
- add task_annotations to override annotations for task pods
@TheRealHaoLiu TheRealHaoLiu force-pushed the 1331_Add_support_to_specify_different_annotation_for_task_and_web_deployments branch from 5faca19 to e542158 Compare April 17, 2023 20:07
jjwatt
jjwatt approved these changes Apr 17, 2023
View reviewed changes
Copy link
Contributor

@jjwatt jjwatt left a comment

Choose a reason for hiding this comment

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

Paired with @djyasin @TheRealHaoLiu @gamuniz coding, debugging and testing. LGTM 🤌

@djyasin djyasin merged commit e1e97a1 into ansible:devel Apr 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheRealHaoLiu TheRealHaoLiu TheRealHaoLiu left review comments

@rooftopcellist rooftopcellist rooftopcellist left review comments

@gamuniz gamuniz gamuniz approved these changes

@jjwatt jjwatt jjwatt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add support to specify different annotation for the task and web deployments in AWX operator 2.x.x
5 participants
@djyasin @TheRealHaoLiu @jjwatt @rooftopcellist @gamuniz