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

fix: revert removal trim symbol before endif #1715

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

kurokobo
Copy link
Contributor

SUMMARY

Closes #1713

By #1377, trim symbol (-) before endif was added. If we have defined ingress_annotations in one of the following way, this change will cause the spec for Ingress resource to break and the deployment to fail.

  1. Defining ingress_annotations at the end of YAML file without trailing new line:

    ---
    spec:
      ...
      ingress_type: ingress
      ingress_hosts:
        - hostname: awx-demo.example.com
      ingress_annotations: |
        environment: testing⛔
  2. Defining ingress_annotations as single line strings:

    ---
    spec:
      ...
      ingress_type: ingress
      ingress_hosts:
        - hostname: awx-demo.example.com
      ingress_annotations: 'environment: testing'

This PR restores the trim symbols that were removed in #1377.

ISSUE TYPE
  • Bug, Docs Fix or other nominal change
ADDITIONAL INFORMATION

See #1713 (comment) for details.

@kurokobo
Copy link
Contributor Author

@fosterseth
Copy link
Member

thanks for digging into this and opening up the PR @kurokobo

@fosterseth fosterseth enabled auto-merge (squash) February 15, 2024 16:53
@fosterseth fosterseth merged commit a9cee5f into ansible:devel Feb 15, 2024
6 checks passed
@kurokobo kurokobo deleted the ingress_annotations branch February 15, 2024 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adding ingress_annotations to awx spec causes deployment failure on Operator 2.11.0+
2 participants