Skip to content

RSDK-14181: Make managed-security the default for os_auto_upgrade_type - #267

Merged
Josh Matthews (jmatth) merged 5 commits into
mainfrom
managed-security-default
Jul 27, 2026
Merged

RSDK-14181: Make managed-security the default for os_auto_upgrade_type#267
Josh Matthews (jmatth) merged 5 commits into
mainfrom
managed-security-default

Conversation

@jmatth

Copy link
Copy Markdown
Member

What

Changes the default value for os_manageds_upgrade_type to managed-security. This replaces the previous default behavior, which was to do nothing.

Why

We are migrating agent managed machines to use managed-security by default. Updating the way agent treats an empty value in the config is consistent with how other default config values are handled. This PR will need to wait to be merged + deployed until we have finished informing users of the upcoming change and allowing them time to opt out.

@jmatth Josh Matthews (jmatth) changed the title Make managed-security the default for os_auto_upgrade_type RSDK-14181: Make managed-security the default for os_auto_upgrade_type Jul 7, 2026
Comment thread utils/config_test.go
"logging_journald_runtime_max_use_megabytes": 512,
"logging_journald_storage": "persistent",
"os_auto_upgrade_type": "",
"os_auto_upgrade_type": "managed-security",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be better to leave this as "" and check if it defaults to managed?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, but it would need to go through validateConfig where that's actually enforced. I'm actually not sure why this test doesn't already do that. I'll try adding it and see if anything breaks

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, doing that breaks the test and requires other changes to make it work. I think the way this test is written is just generally really confusing. According to the comment it's just testing that the JSON unmarshaling works, but then it's using a modified copy of the default config to compare against? I'm guessing the default config is used to avoid all the code it would take to construct the expected state manually. I think this should be left as-is since it's just for the JSON behavior, and I'll add a separate test to make sure tha validate method overwrites an empty string with the default

Comment thread utils/config.go
if *v < minTimeout {
//nolint:lll
*v = DefaultConfiguration.NetworkConfiguration.OfflineBeforeStartingHotspotMinutes
errOut = errors.Join(errOut, errors.New(k+": timeout value cannot be less than 1 minute"))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps add "set to default x" here

@viam-overwatch

Copy link
Copy Markdown

Hey Josh Matthews (@jmatth) — this PR has been approved and CI has been green for 3+ business days. Ready to merge?

Auto-comment from overwatch. Will not re-nudge for 7 days.

@jmatth
Josh Matthews (jmatth) merged commit a271199 into main Jul 27, 2026
6 checks passed
@jmatth
Josh Matthews (jmatth) deleted the managed-security-default branch July 27, 2026 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants