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 config-jvm template to avoid wrong new line #694

Merged
merged 2 commits into from
Oct 16, 2023

Conversation

aferri0
Copy link
Contributor

@aferri0 aferri0 commented Oct 16, 2023

Pull request description

When the S3 bucket properties are provided the config map generated by the config-jvm template adds new lines that will break the application startup.

Same behavior should be noticed when setting the exposeJmxMetrics attribute to true

data:
  additional_jvm_args: >-
    -Dconfluence.cluster.hazelcast.listenPort=5701
    -Dsynchrony.btf.disabled=true
    -Dsynchrony.by.default.enable.collab.editing.if.manually.managed=true
    -Dconfluence.clusterNodeName.useHostname=true
    -Datlassian.logging.cloud.enabled=false
    -XX:ActiveProcessorCount=2
    -Daws.webIdentityTokenFile=/var/run/secrets/eks.amazonaws.com/serviceaccount/token

    -Dconfluence.filestore.attachments.s3.bucket.name=MY_BUCKET_NAME
    -Dconfluence.filestore.attachments.s3.bucket.region=eu-west-1

This PR should fix this behavior resulting in no extra line breaks added to the rendered manifest:

data:
  additional_jvm_args: >-
    -Dconfluence.cluster.hazelcast.listenPort=5701
    -Dsynchrony.btf.disabled=true
    -Dsynchrony.by.default.enable.collab.editing.if.manually.managed=true
    -Dconfluence.clusterNodeName.useHostname=true
    -Datlassian.logging.cloud.enabled=false
    -XX:ActiveProcessorCount=2
    -Daws.webIdentityTokenFile=/var/run/secrets/eks.amazonaws.com/serviceaccount/token
    -Dconfluence.filestore.attachments.s3.bucket.name=MY_BUCKET_NAME
    -Dconfluence.filestore.attachments.s3.bucket.region=eu-west-1

Checklist

  • I have added unit tests
  • I have applied the change to all applicable products
  • The E2E test has passed (use e2e label)

@atlassian-cla-bot
Copy link

atlassian-cla-bot bot commented Oct 16, 2023

Hooray! All contributors have signed the CLA.

@bianchi2 bianchi2 added the kind label Oct 16, 2023
@bianchi2
Copy link
Collaborator

@aferri0 thanks for the fix! It works if jmxMetrics alone is exposed but doesn't when S3 configs are defined. Must have been broken when jxm stuff was added which happened after S3.

@bianchi2 bianchi2 merged commit f225983 into atlassian:main Oct 16, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants