PE 2019.8.12 and newer: r10k.yaml is updated even when code-manager is used

[bastelfreak]

Describe the Bug

I added the following two parameters to my new PE installation:

"puppet_enterprise::profile::master::code_manager_auto_configure": true,
"puppet_enterprise::profile::master::r10k_remote": "https://github.com/bastelfreak/testcontrolrepo.git",

The following puppet run will update /opt/puppetlabs/server/data/code-manager/r10k.yaml and /etc/puppetlabs/r10k/r10k.yaml. But /etc/puppetlabs/r10k/r10k.yaml isn't, as far as I know, used by code-manager?

Expected Behavior

Don't update /etc/puppetlabs/r10k/r10k.yaml when it isn't needed.

Steps to Reproduce

• Add "puppet_enterprise::profile::master::code_manager_auto_configure": true to the PE Master node group or hiera
• Add "puppet_enterprise::profile::master::r10k_remote": "https://github.com/bastelfreak/testcontrolrepo.git", to the PE Master node group or hiera
• run puppet agent -t

Environment

• PE 2019.8.12
• PE 2021.7.8

Additional Context

• I would have submitted a patch for puppet_enterprise/manifests/profile/master.pp but the repo is private and nobody commented on Make the PE specific puppet modules public #10
• This is important because I'm doing some mass PE upgrades. This can fail for various reasons. Unnecessary diffs make it hard to debug failed PE upgrades. During the upgrades I'm replacing puppet_enterprise::profile::master::r10k_remote with puppet_enterprise::profile::master::sources

[bastelfreak]

support ticket #01247428