Upgrade to Salt 3006 #153
Merged
Upgrade to Salt 3006 #153
Conversation
This file contains 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
This commit includes adjustments that were needed after upgrading Salt to 3006.6. Most prominently, the `six` dependency is no longer bundled in `salt.ext`. Since we are not using Python 2 anymore, I have run `pyupgrade` on `netbox.py` and `ddns.py`, as upstream did as well: - saltstack/salt#63874 - saltstack/salt@d9b5065#diff-3e81c988bb0fa260da8fdbee3b44dd7b1f9ccebf488117b5f68c2f728bd9d287
GoliathLabs
approved these changes
Feb 15, 2024
awlx
approved these changes
Feb 16, 2024
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.
This commit includes adjustments that were needed after upgrading Salt to 3006.6.
Most changes have been caused by the move to the "Onedir packaging" (https://docs.saltproject.io/salt/install-guide/en/latest/topics/upgrade-to-onedir.html)
Most prominently, the
sixdependency is no longer bundled insalt.ext. Since we are not using Python 2 anymore, I have runpyupgradeonnetbox.pyandddns.py, as upstream did as well:SixRedirectImporterfrom Salt saltstack/salt#63874Additionally, the Salt APT repository paths have changed, and the 3006 release is only available in the new ones.
Thirdly, with the move to Onedir, Salt brings its own Python environment. This affects us in two areas:
pip.installedare only installed to this environment and not visible to other Python applications on the systemThis means that I had to change packages needed by Salt (e.g. to render templates) from
pkg.installedtopip.installed, and for packages needed by applications I added- pip_bin: /usr/bin/pip3as recommended in the upgrade guide.