Skip to content

Update gitops exceptions message for 4.84 #43471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sgress454 merged 3 commits into from
Apr 13, 2026
Merged

Update gitops exceptions message for 4.84 #43471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37a8eab
update message
sgress454 Apr 13, 2026
d5924ec
update message
sgress454 Apr 13, 2026
123442d
update error and tests
sgress454 Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/fleetctl/fleetctl/gitops_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ agent_options:
require.NoError(t, err)
_, err = RunAppNoChecks([]string{"gitops", "-f", tmpFile.Name()})
require.Error(t, err)
assert.Contains(t, err.Error(), `"labels" is excepted from GitOps management`)
assert.Contains(t, err.Error(), "remove `labels:` from your GitOps file")

// Secrets excepted + present → error
tmpFile2, err := os.CreateTemp(t.TempDir(), "*.yml")
Expand All @@ -598,7 +598,7 @@ agent_options:
require.NoError(t, err)
_, err = RunAppNoChecks([]string{"gitops", "-f", tmpFile2.Name()})
require.Error(t, err)
assert.Contains(t, err.Error(), `"secrets" is excepted from GitOps management`)
assert.Contains(t, err.Error(), "remove `secrets:` from your GitOps file")

// Secrets excepted + present → error
tmpFile3, err := os.CreateTemp(t.TempDir(), "*.yml")
Expand All @@ -613,7 +613,7 @@ software:
require.NoError(t, err)
_, err = RunAppNoChecks([]string{"gitops", "-f", tmpFile3.Name()})
require.Error(t, err)
assert.Contains(t, err.Error(), `"software" is excepted from GitOps management`)
assert.Contains(t, err.Error(), "remove `software:` from your GitOps file")

// Test: exceptions enforced even when GitOps mode is OFF (decoupled from UI mode)
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
Expand All @@ -626,7 +626,7 @@ software:
}
_, err = RunAppNoChecks([]string{"gitops", "-f", tmpFile.Name()})
require.Error(t, err)
assert.Contains(t, err.Error(), `"labels" is excepted from GitOps management`)
assert.Contains(t, err.Error(), "remove `labels:` from your GitOps file")
}

// TestGitOpsExceptionsPreserveOmittedKeys verifies that when exceptions are ON,
Expand Down
10 changes: 4 additions & 6 deletions server/service/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,17 +1905,15 @@ func (c *Client) DoGitOps(
var exceptions fleet.GitOpsExceptions
if appConfig != nil {
exceptions = appConfig.GitOpsConfig.Exceptions
serverUrl := appConfig.ServerSettings.ServerURL
if exceptions.Labels && incoming.LabelsPresent {
return nil, errors.New(
`"labels" is excepted from GitOps management. Remove the "labels:" key from your GitOps file or disable the exception in Fleet settings.`)
return nil, fmt.Errorf("Starting in 4.84, labels management in GitOps is turned off by default. Either remove `labels:` from your GitOps file or disable the exception in the UI: %s/settings/integrations/change-management", serverUrl)
}
if exceptions.Secrets && incoming.SecretsPresent {
return nil, errors.New(
`"secrets" is excepted from GitOps management. Remove the "secrets:" key from your GitOps file or disable the exception in Fleet settings.`)
return nil, fmt.Errorf("Starting in 4.84, secrets management in GitOps is turned off by default. Either remove `secrets:` from your GitOps file or disable the exception in the UI: %s/settings/integrations/change-management", serverUrl)
}
if exceptions.Software && incoming.SoftwarePresent && incoming.TeamName != nil {
return nil, errors.New(
`"software" is excepted from GitOps management. Remove the "software:" key from your GitOps file or disable the exception in Fleet settings.`)
return nil, fmt.Errorf("Software is excepted from GitOps management. Either remove `software:` from your GitOps file or disable the exception in the UI: %s/settings/integrations/change-management", serverUrl)
}
}

Expand Down
Loading