feat: add rolling upgrade support for nifi 2.x #771
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maltesander
requested changes
Apr 9, 2025
Member
maltesander
left a comment
maltesander
left a comment
There was a problem hiding this comment.
Tests work fine, flows keep working (and running) from 1.27.0 to 2.0.0 to 2.2.0 and displays accordingly
There is one problem when i tried with the custom 2.0.0 image to the standard 2.2.0. When using a non custom image afterwards and no serverside apply the propery is still set. This then showed the nifi version in the UI to be 2.0.0 (but using 2.2.0 image).
This should be fixed in 02-install-nifi.yaml.j2 like:
spec:
image:
{% if test_scenario['values']['nifi_old'].find(",") > 0 %}
custom: "{{ test_scenario['values']['nifi_old'].split(',')[1] }}"
productVersion: "{{ test_scenario['values']['nifi_old'].split(',')[0] }}"
{% else %}
productVersion: "{{ test_scenario['values']['nifi_old'] }}"
custom: null
{% endif %}
and in 05-upgrade-nifi.yaml.j2 like
{% if test_scenario['values']['nifi_new'].find(",") > 0 %}
custom: "{{ test_scenario['values']['nifi_new'].split(',')[1] }}"
productVersion: "{{ test_scenario['values']['nifi_new'].split(',')[0] }}"
{% else %}
productVersion: "{{ test_scenario['values']['nifi_new'] }}"
custom: null # <-----thats required
{% endif %}
Member
Author
Good find, thanks! Added the fix in all the integration tests 8b20f2a Also reran an affected test: |
Member
Author
|
Integration tests rerun after all the new changes: |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Apr 10, 2025
* feat: add rolling upgrade support for nifi 2.x * cargo fmt * cargo fmt * cargo update and make regenerate-nix * add changelog entry * add documentation * cargo update and make regenerate-nix * fix upgrade intergration tests with custom images * cargo update and make regenerate-nix * fix integration tests when using custom images * rename VersionChangeState enum and some variants * rename enum variant * move upgrade code in separate module * cargo fmt * adapt variable names --------- Co-authored-by: Malte Sander <malte.sander.it@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Implementation of #736
This PR configures the rolling upgrade for clusters upgrading from version 2.x to 2.y. It also expands the upgrade integration test.
The
upgrade_nifi_old-2.0.0_nifi_new-2.2.0_zookeeper-latest-3.9.3_openshift-falseintegration test was run with a custom built nifi image2.0.0-stackable0.0.0-devsince we currently don't have a release with two separate nifi 2.x versions. If this changes, the tests will need some adjustments, for example intest-definition.yamlfor thenifi_olddimension. This is currently left out to not break current test runs.Openshift Tests:
Definition of Done Checklist