(#469) Upgrade: Assign correct environment to node groups #635
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
4 tasks
Collaborator
|
Thanks Tim, I'll do some final testing today. On the CI issues - if you rebase from main there should be a fix for the failures on the Failed Postgres and Migration workflows on the git checkout. I have an IT ticket open to resolve the failing CI Acceptance tests too. |
This makes the environment for node groups configureable. The default is 'production'. This is also the default in the node_group resource type: https://github.com/puppetlabs/puppetlabs-node_manager/blob/main/lib/puppet/type/node_group.rb#L124 We could also default to `undef` in PEADM and rely on the node_manage module, but explicitly setting `production` seems to be safer. This is related to puppetlabs#469 and makes the environment configureable during upgrades. Co-authored-by: David Mallon <[email protected]>
This checks if a user configured a environment in pe.conf. If that's the case, it will be used for the PEADM-specific node groups. Otherwise we fall back to production. This fixes a timing issue discovered in puppetlabs#469. In situations where the PE infra isn't running in production, we cannot assume that a production environment exists. And a node group can only reference classes from the environment the node group belongs to.
bastelfreak
force-pushed
the
issue-469-4
branch
from
797d41a to
a84bfe9
Compare
Collaborator
Author
|
@davidmalloncares thanks, just did the rebase! |
3 tasks
Collaborator
|
I got a workaround to get (most of) the failing Acceptance tests passing - the CentOS 9 one is failing due to a known issue so we will have to merge past that. Unfortunately the rest of the tests need to re-run and go Green so we can keep kicking them until they pass again and merge this in |
davidmalloncares
approved these changes
Nov 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Commit 1:
This makes the environment for node groups configureable. The default is
'production'. This is also the default in the node_group resource type:
https://github.com/puppetlabs/puppetlabs-node_manager/blob/main/lib/puppet/type/node_group.rb#L124
We could also default to
undefin PEADM and rely on the node_manage module, but explicitly settingproductionseems to be safer.This is related to #469 and makes the environment configureable during upgrades.
Co-authored-by: David Mallon [email protected]
Commit 2:
This checks if a user configured a environment in pe.conf. If that's the case, it will be used for the PEADM-specific node groups. Otherwise we fall back to production.
This fixes a timing issue discovered in #469. In situations where the PE
infra isn't running in production, we cannot assume that a production environment exists. And a node group can only reference classes from the environment the node group belongs to.