mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 13:37:30 +00:00
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #42184 # Checklist for submitter If some of the following don't apply, delete the relevant line. - [ ] 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. - [ ] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements), JS inline code is prevented especially for url redirects, and untrusted data interpolated into shell scripts/commands is validated against shell metacharacters. - [ ] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## Testing - [ ] Added/updated automated tests - [ ] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [ ] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [ ] Confirmed that the fix is not expected to adversely impact load test results - [ ] Alerted the release DRI if additional load testing is needed ## Database migrations - [ ] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [ ] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`). ## New Fleet configuration settings - [ ] Setting(s) is/are explicitly excluded from GitOps If you didn't check the box above, follow this checklist for GitOps-enabled settings: - [ ] Verified that the setting is exported via `fleetctl generate-gitops` - [ ] 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) - [ ] 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) - [ ] Verified that any relevant UI is disabled when GitOps mode is enabled ## fleetd/orbit/Fleet Desktop - [ ] Verified compatibility with the latest released version of Fleet (see [Must rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md)) - [ ] If the change applies to only one platform, confirmed that `runtime.GOOS` is used as needed to isolate changes - [ ] Verified that fleetd runs on macOS, Linux and Windows - [ ] Verified auto-update works from the released version of component to the new version (see [tools/tuf/test](../tools/tuf/test/README.md)) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes * **New Features** * Added support for GitOps exceptions per entity type (labels, software, secrets), allowing specific areas to bypass GitOps mode restrictions when configured. * **Bug Fixes** * Improved GitOps mode behavior to properly respect per-entity-type exception settings across software, labels, and secrets management. * **Tests** * Extended test coverage for GitOps exception handling scenarios. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
55 lines
1.5 KiB
TypeScript
55 lines
1.5 KiB
TypeScript
import TooltipWrapper, {
|
|
ITooltipWrapper,
|
|
} from "components/TooltipWrapper/TooltipWrapper";
|
|
import useGitOpsMode from "hooks/useGitOpsMode";
|
|
import { IGitOpsExceptions } from "interfaces/config";
|
|
import React from "react";
|
|
import { getGitOpsModeTipContent } from "utilities/helpers";
|
|
|
|
interface IGitOpsModeTooltipWrapper {
|
|
renderChildren: (disableChildren?: boolean) => React.ReactNode;
|
|
position?: ITooltipWrapper["position"];
|
|
tipOffset?: ITooltipWrapper["tipOffset"];
|
|
fixedPositionStrategy?: ITooltipWrapper["fixedPositionStrategy"];
|
|
// When specified, the wrapper checks the exception for this entity type.
|
|
// If the entity is excepted, children remain enabled even in GitOps mode.
|
|
entityType?: keyof IGitOpsExceptions;
|
|
}
|
|
|
|
const baseClass = "gitops-mode-tooltip-wrapper";
|
|
|
|
const GitOpsModeTooltipWrapper = ({
|
|
position = "top",
|
|
tipOffset,
|
|
renderChildren,
|
|
fixedPositionStrategy,
|
|
entityType,
|
|
}: IGitOpsModeTooltipWrapper) => {
|
|
const { gitOpsModeEnabled, repoURL } = useGitOpsMode(entityType);
|
|
|
|
if (!gitOpsModeEnabled) {
|
|
return <>{renderChildren()}</>;
|
|
}
|
|
|
|
const tipContent = (
|
|
<div className={`${baseClass}__tooltip-content`}>
|
|
{repoURL && getGitOpsModeTipContent(repoURL)}
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<TooltipWrapper
|
|
className={baseClass}
|
|
position={position}
|
|
tipOffset={tipOffset}
|
|
tipContent={tipContent}
|
|
underline={false}
|
|
showArrow
|
|
fixedPositionStrategy={fixedPositionStrategy}
|
|
>
|
|
{renderChildren(true)}
|
|
</TooltipWrapper>
|
|
);
|
|
};
|
|
|
|
export default GitOpsModeTooltipWrapper;
|