-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[logstash] Add fullnameOverride setting #457
[logstash] Add fullnameOverride setting #457
Conversation
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
This is for overriding the name of the logstash service and just generally better naming options than "logstash-logstash" and "logstash-main-main" allowed by setting nameOverride value today. With fullnameOverride the logstash service object can be given any name Please run the build in Jenkins as I did not run tests locally. |
jenkins test this please |
Hiya! Can this be merged now? |
0dc0919
to
47281c3
Compare
I managed to run the tests locally and created PR #463 to fix incompatible attrs dependency error for make pytest. I updated tests to remove checks that are not applicable for default logstash deployment and it's passing locally now. Please re-run the jenkins tests |
jenkins test this please |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⛴
logstash/tests/logstash_test.py
Outdated
} in volumes | ||
assert custom_name in r['statefulset'] | ||
assert r['statefulset'][custom_name]['spec']['template']['spec']['containers'][0]['name'] == 'logstash' | ||
volumes = r['statefulset'][custom_name]['spec']['template']['spec']['volumes'] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The last line volumes = ...
doesn't seem to be used
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where I copied it from it was used for this check
assert {
'name': 'data',
'hostPath': {
'path': '/var/lib/' + custom_name + '-default-data',
'type': 'DirectoryOrCreate'
}
} in volumes
I don't think we care about custom_name being in volume mount path... So I'm going to delete this.
I do care that logstash.fullname has correct value and is used as the name of the deployment, service, etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I rebased my branch on upstream/master, amended this change into the Update tests commit and force-pushed
Added fullnameOverride to logstash by copy pasting from kibana/filebeat/metricbeat charts
47281c3
to
147d4d4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⛴
jenkins test this please |
Thanks! I assume this will be released in the next elastic-stack release? Current release is 7.5.2 so 7.5.3 and later will include this fix? |
Yes, this will be released in the next one which should be 7.5.3 or 7.6.0. |
Added fullnameOverride to logstash by copy pasting from kibana/filebeat/metricbeat charts.
${CHART}/tests/*.py
${CHART}/examples/*/test/goss.yaml