Skip to content

Tweak GitOps software handling, allow setup experience bool on package details, update generate-gitops#32492

Merged
iansltx merged 3 commits intomainfrom
30095-gitops-changes
Sep 3, 2025
Merged

Tweak GitOps software handling, allow setup experience bool on package details, update generate-gitops#32492
iansltx merged 3 commits intomainfrom
30095-gitops-changes

Conversation

@iansltx
Copy link
Copy Markdown
Contributor

@iansltx iansltx commented Sep 1, 2025

For #30095.

#32482 is additional cleanup. Merging this to unblock orchestration Linux setup experience work. Code has already been reviewed prior to merging into the feature branch.

@iansltx iansltx requested a review from a team as a code owner September 1, 2025 20:50
@codecov
Copy link
Copy Markdown

codecov bot commented Sep 1, 2025

Codecov Report

❌ Patch coverage is 60.86957% with 45 lines in your changes missing coverage. Please review.
✅ Project coverage is 62.13%. Comparing base (a867d2b) to head (35ec21e).
⚠️ Report is 9 commits behind head on main.

Files with missing lines Patch % Lines
pkg/spec/gitops.go 62.50% 6 Missing and 6 partials ⚠️
cmd/fleetctl/fleetctl/generate_gitops.go 71.42% 7 Missing and 3 partials ⚠️
cmd/fleetctl/fleetctl/gitops.go 57.14% 8 Missing and 1 partial ⚠️
server/fleet/software_installer.go 25.00% 9 Missing ⚠️
server/service/client.go 66.66% 4 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main   #32492   +/-   ##
=======================================
  Coverage   62.13%   62.13%           
=======================================
  Files        1986     1986           
  Lines      195471   195525   +54     
  Branches     6468     6468           
=======================================
+ Hits       121448   121492   +44     
- Misses      64346    64351    +5     
- Partials     9677     9682    +5     
Flag Coverage Δ
backend 63.14% <60.86%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

ksykulev and others added 3 commits September 2, 2025 16:25
…31811)

Fixes #31164

- [x] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files)
for more information.

## Testing

- [x] Added/updated automated tests
- [x] QA'd all new/changed functionality manually

- [X] Verified that the setting is exported via `fleetctl
generate-gitops`
- [X] Verified the setting is documented in a separate PR to [the GitOps
documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485)
- [X] Verified that the setting is cleared on the server if it is not
supplied in a YAML file (or that it is documented as being optional)
…to team level in GitOps (#32245)

Fixes #31163.

This also enables setup experience inclusion for FMAs. Includes checks
and errors for invalid states.

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [x] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files)
for more information.

- [x] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)

## Testing

- [x] Added/updated automated tests

- [x] QA'd all new/changed functionality manually

## New Fleet configuration settings
- [x] Verified that the setting is exported via `fleetctl
generate-gitops`
- [x] Verified the setting is documented in a separate PR to [the GitOps
documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485)
- [x] Verified that the setting is cleared on the server if it is not
supplied in a YAML file (or that it is documented as being optional)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- New Features
- Team-level control of software settings in GitOps: setup experience
(install during setup), self-service, labels (include/exclude), and
categories for packages and App Store apps.
- Team-level settings are applied to individual packages automatically.
- Validation
- Clear errors when setup experience is defined in multiple places
(software/app vs. macOS setup).
- Documentation
  - Removed outdated note about GitOps-generated outputs.
- Tests
- Added test cases covering valid team-level configuration and
conflicting placement scenarios.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Anthony Maxwell <133805840+Illbjorn@users.noreply.github.com>
Comment thread server/fleet/software_installer.go
Copy link
Copy Markdown
Member

@lucasmrod lucasmrod left a comment

Choose a reason for hiding this comment

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

LGTM!

@iansltx iansltx merged commit 7450f0d into main Sep 3, 2025
40 of 44 checks passed
@iansltx iansltx deleted the 30095-gitops-changes branch September 3, 2025 18:32
sgress454 added a commit that referenced this pull request Mar 26, 2026
<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #30453

All the work for this was already done in
#32492. I verified that
`generate-gitops` outputs the expected categories, and that `gitops`
reads them back in correctly. This PR just removes the warning
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.

4 participants